djpbessems/ContainerImage.Pinniped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

impersonator_config_test.go: use require.Len() when applicable

Browse Source 
Also fix a lint error in concierge_impersonation_proxy_test.go

Signed-off-by: Ryan Richard <richardry@vmware.com>
This commit is contained in:
Margo Crawford 2021-02-17 17:29:56 -08:00 committed by Ryan Richard
parent 0ad91c43f7
commit 22a3e73bac
2 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
internal/controller/impersonatorconfig/impersonator_config_test.go
View File

@ -466,7 +466,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
startInformersAndController() startInformersAndController()
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
requireTLSServerWasNeverStarted() requireTLSServerWasNeverStarted()
r.Equal(1, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 1)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
}) })
}) })
@ -482,7 +482,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
startInformersAndController() startInformersAndController()
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
requireTLSServerWasNeverStarted() requireTLSServerWasNeverStarted()
r.Equal(2, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 2)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
requireLoadBalancerDeleted(kubeAPIClient.Actions()[1]) requireLoadBalancerDeleted(kubeAPIClient.Actions()[1])
}) })
@ -500,7 +500,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
}) })
it("starts the load balancer automatically", func() { it("starts the load balancer automatically", func() {
r.Equal(2, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 2)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1]) requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1])
}) })
@ -520,7 +520,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
}) })
it("does not start the load balancer automatically", func() { it("does not start the load balancer automatically", func() {
r.Equal(1, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 1)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
}) })
}) })
@ -534,7 +534,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
it("only starts the impersonator once and only lists the cluster's nodes once", func() { it("only starts the impersonator once and only lists the cluster's nodes once", func() {
startInformersAndController() startInformersAndController()
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(2, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 2)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1]) requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1])
@ -545,7 +545,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(1, startTLSListenerFuncWasCalled) // wasn't started a second time r.Equal(1, startTLSListenerFuncWasCalled) // wasn't started a second time
requireTLSServerIsRunning() // still running requireTLSServerIsRunning() // still running
r.Equal(2, len(kubeAPIClient.Actions())) // no new API calls r.Len(kubeAPIClient.Actions(), 2) // no new API calls
}) })
}) })
@ -602,7 +602,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
requireTLSServerWasNeverStarted() requireTLSServerWasNeverStarted()
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
r.Equal(1, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 1)
}) })
}) })
@ -616,7 +616,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
requireTLSServerIsRunning() requireTLSServerIsRunning()
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
r.Equal(1, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 1)
}) })
}) })
}) })
@ -632,12 +632,11 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
requireTLSServerWasNeverStarted() requireTLSServerWasNeverStarted()
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
r.Equal(1, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 1)
}) })
}) })
when("the configuration is enabled mode", func() { when("the configuration is enabled mode", func() {
when("there are control plane nodes", func() { when("there are control plane nodes", func() {
it.Before(func() { it.Before(func() {
addImpersonatorConfigMapToTracker(configMapResourceName, "mode: enabled") addImpersonatorConfigMapToTracker(configMapResourceName, "mode: enabled")
@ -659,7 +658,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
it("does not start the load balancer", func() { it("does not start the load balancer", func() {
startInformersAndController() startInformersAndController()
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(1, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 1)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
}) })
}) })
@ -687,7 +686,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
it("does not start the load balancer", func() { it("does not start the load balancer", func() {
startInformersAndController() startInformersAndController()
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(1, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 1)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
}) })
}) })
@ -715,7 +714,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
it("stops the load balancer", func() { it("stops the load balancer", func() {
startInformersAndController() startInformersAndController()
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(2, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 2)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
requireLoadBalancerDeleted(kubeAPIClient.Actions()[1]) requireLoadBalancerDeleted(kubeAPIClient.Actions()[1])
}) })
@ -742,7 +741,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
it("starts the load balancer", func() { it("starts the load balancer", func() {
startInformersAndController() startInformersAndController()
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(2, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 2)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1]) requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1])
}) })
@ -760,7 +759,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
requireTLSServerIsRunning() requireTLSServerIsRunning()
r.Equal(2, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 2)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1]) requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1])
@ -773,7 +772,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
requireTLSServerIsNoLongerRunning() requireTLSServerIsNoLongerRunning()
r.Equal(3, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 3)
requireLoadBalancerDeleted(kubeAPIClient.Actions()[2]) requireLoadBalancerDeleted(kubeAPIClient.Actions()[2])
deleteLoadBalancerServiceFromTracker(generatedLoadBalancerServiceName, kubeInformerClient) deleteLoadBalancerServiceFromTracker(generatedLoadBalancerServiceName, kubeInformerClient)
@ -784,7 +783,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
requireTLSServerIsRunning() requireTLSServerIsRunning()
r.Equal(4, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 4)
requireLoadBalancerWasCreated(kubeAPIClient.Actions()[3]) requireLoadBalancerWasCreated(kubeAPIClient.Actions()[3])
}) })
@ -821,14 +820,14 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(1, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 1)
requireNodesListed(kubeAPIClient.Actions()[0]) requireNodesListed(kubeAPIClient.Actions()[0])
updateImpersonatorConfigMapInTracker(configMapResourceName, "mode: enabled", "1") updateImpersonatorConfigMapInTracker(configMapResourceName, "mode: enabled", "1")
waitForInformerCacheToSeeResourceVersion(kubeInformers.Core().V1().ConfigMaps().Informer(), "1") waitForInformerCacheToSeeResourceVersion(kubeInformers.Core().V1().ConfigMaps().Informer(), "1")
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(2, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 2)
requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1]) requireLoadBalancerWasCreated(kubeAPIClient.Actions()[1])
// update manually because the kubeAPIClient isn't connected to the informer in the tests // update manually because the kubeAPIClient isn't connected to the informer in the tests
@ -842,7 +841,7 @@ func TestImpersonatorConfigControllerSync(t *testing.T) {
waitForInformerCacheToSeeResourceVersion(kubeInformers.Core().V1().ConfigMaps().Informer(), "2") waitForInformerCacheToSeeResourceVersion(kubeInformers.Core().V1().ConfigMaps().Informer(), "2")
r.NoError(controllerlib.TestSync(t, subject, *syncContext)) r.NoError(controllerlib.TestSync(t, subject, *syncContext))
r.Equal(3, len(kubeAPIClient.Actions())) r.Len(kubeAPIClient.Actions(), 3)
requireLoadBalancerDeleted(kubeAPIClient.Actions()[2]) requireLoadBalancerDeleted(kubeAPIClient.Actions()[2])
}) })
}) })

2
test/integration/concierge_impersonation_proxy_test.go
View File

@ -61,7 +61,7 @@ func TestImpersonationProxy(t *testing.T) {
oldConfigMap, err := adminClient.CoreV1().ConfigMaps(env.ConciergeNamespace).Get(ctx, "pinniped-concierge-impersonation-proxy-config", metav1.GetOptions{}) oldConfigMap, err := adminClient.CoreV1().ConfigMaps(env.ConciergeNamespace).Get(ctx, "pinniped-concierge-impersonation-proxy-config", metav1.GetOptions{})
if oldConfigMap.Data != nil { if oldConfigMap.Data != nil {
adminClient.CoreV1().ConfigMaps(env.ConciergeNamespace).Delete(ctx, "pinniped-concierge-impersonation-proxy-config", metav1.DeleteOptions{}) require.NoError(t, adminClient.CoreV1().ConfigMaps(env.ConciergeNamespace).Delete(ctx, "pinniped-concierge-impersonation-proxy-config", metav1.DeleteOptions{}))
} }
serviceUnavailableError := fmt.Sprintf(`Get "%s/api/v1/namespaces": Service Unavailable`, proxyServiceURL) serviceUnavailableError := fmt.Sprintf(`Get "%s/api/v1/namespaces": Service Unavailable`, proxyServiceURL)