From 891d2bec18b6344051a498edd2208596f040f2ef Mon Sep 17 00:00:00 2001 From: Morgan Martinet Date: Tue, 10 Aug 2021 16:23:38 -0400 Subject: [PATCH] fix failing unit tests in kubernetes-backend Signed-off-by: Morgan Martinet --- .../src/cluster-locator/ConfigClusterLocator.test.ts | 6 ++++++ .../kubernetes-backend/src/cluster-locator/index.test.ts | 2 ++ .../src/service/KubernetesFanOutHandler.test.ts | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.test.ts b/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.test.ts index dac96e4cef..cd31db807e 100644 --- a/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.test.ts +++ b/plugins/kubernetes-backend/src/cluster-locator/ConfigClusterLocator.test.ts @@ -49,6 +49,7 @@ describe('ConfigClusterLocator', () => { expect(result).toStrictEqual([ { name: 'cluster1', + dashboardUrl: undefined, serviceAccountToken: undefined, url: 'http://localhost:8080', authProvider: 'serviceAccount', @@ -66,6 +67,7 @@ describe('ConfigClusterLocator', () => { url: 'http://localhost:8080', authProvider: 'serviceAccount', skipTLSVerify: false, + dashboardUrl: 'https://k8s.foo.com', }, { name: 'cluster2', @@ -83,6 +85,7 @@ describe('ConfigClusterLocator', () => { expect(result).toStrictEqual([ { name: 'cluster1', + dashboardUrl: 'https://k8s.foo.com', serviceAccountToken: 'token', url: 'http://localhost:8080', authProvider: 'serviceAccount', @@ -90,6 +93,7 @@ describe('ConfigClusterLocator', () => { }, { name: 'cluster2', + dashboardUrl: undefined, serviceAccountToken: undefined, url: 'http://localhost:8081', authProvider: 'google', @@ -133,6 +137,7 @@ describe('ConfigClusterLocator', () => { expect(result).toStrictEqual([ { assumeRole: undefined, + dashboardUrl: undefined, name: 'cluster1', serviceAccountToken: 'token', externalId: undefined, @@ -142,6 +147,7 @@ describe('ConfigClusterLocator', () => { }, { assumeRole: 'SomeRole', + dashboardUrl: undefined, name: 'cluster2', externalId: undefined, serviceAccountToken: undefined, diff --git a/plugins/kubernetes-backend/src/cluster-locator/index.test.ts b/plugins/kubernetes-backend/src/cluster-locator/index.test.ts index 95be99a8a5..9b01a4b0f3 100644 --- a/plugins/kubernetes-backend/src/cluster-locator/index.test.ts +++ b/plugins/kubernetes-backend/src/cluster-locator/index.test.ts @@ -50,6 +50,7 @@ describe('getCombinedClusterDetails', () => { expect(result).toStrictEqual([ { name: 'cluster1', + dashboardUrl: undefined, serviceAccountToken: 'token', url: 'http://localhost:8080', authProvider: 'serviceAccount', @@ -57,6 +58,7 @@ describe('getCombinedClusterDetails', () => { }, { name: 'cluster2', + dashboardUrl: undefined, serviceAccountToken: undefined, url: 'http://localhost:8081', authProvider: 'google', diff --git a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts index a867efaaee..28e8f45603 100644 --- a/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts +++ b/plugins/kubernetes-backend/src/service/KubernetesFanOutHandler.test.ts @@ -165,6 +165,7 @@ describe('handleGetKubernetesObjectsForService', () => { items: [ { cluster: { + dashboardUrl: undefined, name: 'test-cluster', }, errors: [], @@ -211,6 +212,7 @@ describe('handleGetKubernetesObjectsForService', () => { { name: 'test-cluster', authProvider: 'serviceAccount', + dashboardUrl: 'https://k8s.foo.coom', }, { name: 'other-cluster', @@ -260,6 +262,7 @@ describe('handleGetKubernetesObjectsForService', () => { items: [ { cluster: { + dashboardUrl: 'https://k8s.foo.coom', name: 'test-cluster', }, errors: [], @@ -298,6 +301,7 @@ describe('handleGetKubernetesObjectsForService', () => { }, { cluster: { + dashboardUrl: undefined, name: 'other-cluster', }, errors: [], @@ -396,6 +400,7 @@ describe('handleGetKubernetesObjectsForService', () => { items: [ { cluster: { + dashboardUrl: undefined, name: 'test-cluster', }, errors: [], @@ -434,6 +439,7 @@ describe('handleGetKubernetesObjectsForService', () => { }, { cluster: { + dashboardUrl: undefined, name: 'other-cluster', }, errors: [], @@ -536,6 +542,7 @@ describe('handleGetKubernetesObjectsForService', () => { items: [ { cluster: { + dashboardUrl: undefined, name: 'test-cluster', }, errors: [], @@ -574,6 +581,7 @@ describe('handleGetKubernetesObjectsForService', () => { }, { cluster: { + dashboardUrl: undefined, name: 'other-cluster', }, errors: [], @@ -612,6 +620,7 @@ describe('handleGetKubernetesObjectsForService', () => { }, { cluster: { + dashboardUrl: undefined, name: 'error-cluster', }, errors: ['some random cluster error'],