tests improvement

Signed-off-by: qicz <qiczzhu@gmail.com>
envoyproxy · Feb 10, 2023 · 7b2396d · 7b2396d
1 parent 760f051
commit 7b2396d
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 7 deletions.
diff --git a/internal/infrastructure/kubernetes/proxy_configmap_test.go b/internal/infrastructure/kubernetes/proxy_configmap_test.go
@@ -179,7 +179,14 @@ func TestDeleteConfigProxyMap(t *testing.T) {
 			t.Parallel()
 			cli := fakeclient.NewClientBuilder().WithScheme(envoygateway.GetScheme()).WithObjects(tc.current).Build()
 			kube := NewInfra(cli, cfg)
-			err := kube.deleteProxyConfigMap(context.Background(), infra)
+
+			infra.Proxy.GetProxyMetadata().Labels[gatewayapi.OwningGatewayNamespaceLabel] = "default"
+			infra.Proxy.GetProxyMetadata().Labels[gatewayapi.OwningGatewayNameLabel] = infra.Proxy.Name
+
+			err := kube.createOrUpdateProxyConfigMap(context.Background(), infra)
+			require.NoError(t, err)
+
+			err = kube.deleteProxyConfigMap(context.Background(), infra)
 			require.NoError(t, err)
 		})
 	}

diff --git a/internal/infrastructure/kubernetes/proxy_deployment_test.go b/internal/infrastructure/kubernetes/proxy_deployment_test.go
@@ -268,7 +268,14 @@ func TestDeleteProxyDeployment(t *testing.T) {
 				Namespace: "test",
 			}
 			infra := ir.NewInfra()
-			err := kube.deleteProxyDeployment(context.Background(), infra)
+
+			infra.Proxy.GetProxyMetadata().Labels[gatewayapi.OwningGatewayNamespaceLabel] = "default"
+			infra.Proxy.GetProxyMetadata().Labels[gatewayapi.OwningGatewayNameLabel] = infra.Proxy.Name
+
+			err := kube.createOrUpdateProxyDeployment(context.Background(), infra)
+			require.NoError(t, err)
+
+			err = kube.deleteProxyDeployment(context.Background(), infra)
 			require.NoError(t, err)
 		})
 	}

diff --git a/internal/infrastructure/kubernetes/proxy_service_test.go b/internal/infrastructure/kubernetes/proxy_service_test.go
@@ -127,7 +127,14 @@ func TestDeleteProxyService(t *testing.T) {
 				Namespace: "test",
 			}
 			infra := ir.NewInfra()
-			err := kube.deleteProxyService(context.Background(), infra)
+
+			infra.Proxy.GetProxyMetadata().Labels[gatewayapi.OwningGatewayNamespaceLabel] = "default"
+			infra.Proxy.GetProxyMetadata().Labels[gatewayapi.OwningGatewayNameLabel] = infra.Proxy.Name
+
+			err := kube.createOrUpdateProxyService(context.Background(), infra)
+			require.NoError(t, err)
+
+			err = kube.deleteProxyService(context.Background(), infra)
 			require.NoError(t, err)
 		})
 	}

diff --git a/internal/infrastructure/kubernetes/proxy_serviceaccount_test.go b/internal/infrastructure/kubernetes/proxy_serviceaccount_test.go
@@ -227,11 +227,13 @@ func TestDeleteProxyServiceAccount(t *testing.T) {
 				Namespace: "test",
 			}
 			infra := ir.NewInfra()
+
 			infra.Proxy.GetProxyMetadata().Labels[gatewayapi.OwningGatewayNamespaceLabel] = "default"
 			infra.Proxy.GetProxyMetadata().Labels[gatewayapi.OwningGatewayNameLabel] = infra.Proxy.Name
 
 			err := kube.createOrUpdateProxyServiceAccount(context.Background(), infra)
 			require.NoError(t, err)
+
 			err = kube.deleteProxyServiceAccount(context.Background(), infra)
 			require.NoError(t, err)
 		})

diff --git a/internal/infrastructure/kubernetes/ratelimit_configmap_test.go b/internal/infrastructure/kubernetes/ratelimit_configmap_test.go
@@ -189,7 +189,11 @@ func TestDeleteRateLimitConfigMap(t *testing.T) {
 			t.Parallel()
 			cli := fakeclient.NewClientBuilder().WithScheme(envoygateway.GetScheme()).WithObjects(tc.current).Build()
 			kube := NewInfra(cli, cfg)
-			err := kube.deleteRateLimitConfigMap(context.Background(), rateLimitInfra)
+
+			err := kube.createOrUpdateRateLimitConfigMap(context.Background(), rateLimitInfra)
+			require.NoError(t, err)
+
+			err = kube.deleteRateLimitConfigMap(context.Background(), rateLimitInfra)
 			require.NoError(t, err)
 		})
 	}

diff --git a/internal/infrastructure/kubernetes/ratelimit_deployment_test.go b/internal/infrastructure/kubernetes/ratelimit_deployment_test.go
@@ -124,7 +124,7 @@ func TestDeleteRateLimitDeployment(t *testing.T) {
 		expect bool
 	}{
 		{
-			name:   "delete deployment",
+			name:   "delete ratelimit deployment",
 			expect: false,
 		},
 	}
@@ -138,7 +138,12 @@ func TestDeleteRateLimitDeployment(t *testing.T) {
 				Namespace: "test",
 			}
 			rateLimitInfra := new(ir.RateLimitInfra)
-			err := kube.deleteRateLimitDeployment(context.Background(), rateLimitInfra)
+			rateLimitInfra.Backend = &ir.RateLimitDBBackend{Redis: &ir.RateLimitRedis{URL: ""}}
+
+			err := kube.createOrUpdateRateLimitDeployment(context.Background(), rateLimitInfra)
+			require.NoError(t, err)
+
+			err = kube.deleteRateLimitDeployment(context.Background(), rateLimitInfra)
 			require.NoError(t, err)
 		})
 	}

diff --git a/internal/infrastructure/kubernetes/ratelimit_service_test.go b/internal/infrastructure/kubernetes/ratelimit_service_test.go
@@ -53,7 +53,11 @@ func TestDeleteRateLimitService(t *testing.T) {
 				Namespace: "test",
 			}
 			rateLimitInfra := new(ir.RateLimitInfra)
-			err := kube.deleteRateLimitService(context.Background(), rateLimitInfra)
+
+			err := kube.createOrUpdateRateLimitService(context.Background(), rateLimitInfra)
+			require.NoError(t, err)
+
+			err = kube.deleteRateLimitService(context.Background(), rateLimitInfra)
 			require.NoError(t, err)
 		})
 	}

diff --git a/internal/infrastructure/kubernetes/ratelimit_serviceaccount_test.go b/internal/infrastructure/kubernetes/ratelimit_serviceaccount_test.go
@@ -130,8 +130,10 @@ func TestDeleteRateLimitServiceAccount(t *testing.T) {
 				Namespace: "test",
 			}
 			rateLimitInfra := new(ir.RateLimitInfra)
+
 			err := kube.createOrUpdateRateLimitService(context.Background(), rateLimitInfra)
 			require.NoError(t, err)
+
 			err = kube.deleteRateLimitServiceAccount(context.Background(), rateLimitInfra)
 			require.NoError(t, err)
 		})