Validating labels of k8s resources in functional tests

radius-project · Sep 21, 2023 · d6eda26 · d6eda26
1 parent 1e8b6d9
commit d6eda26
Show file tree

Hide file tree

Showing 26 changed files with 224 additions and 209 deletions.
diff --git a/test/functional/daprrp/resources/dapr_pubsub_test.go b/test/functional/daprrp/resources/dapr_pubsub_test.go
@@ -56,14 +56,10 @@ func Test_DaprPubSubBroker_Manual(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "dpsb-manual-app-ctnr"),
-						validation.NewK8sPodForResource(name, "dpsb-manual-redis").
-							ValidateLabels(false),
-						validation.NewK8sServiceForResource(name, "dpsb-manual-redis").
-							ValidateLabels(false),
-
-						validation.NewDaprComponent(name, "dpsb-manual").
-							ValidateLabels(false),
+						validation.NewK8sPodForResource("dpsb-manual-app-ctnr", name, true),
+						validation.NewK8sPodForResource("dpsb-manual-redis", name, false),
+						validation.NewK8sServiceForResource("dpsb-manual-redis", name, false),
+						validation.NewK8sDaprComponent("dpsb-manual", name, false),
 					},
 				},
 			},
@@ -113,11 +109,8 @@ func Test_DaprPubSubBroker_Recipe(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "dpsb-recipe-ctnr").
-							ValidateLabels(false),
-
-						validation.NewDaprComponent(name, "dpsb-recipe").
-							ValidateLabels(false),
+						validation.NewK8sPodForResource("dpsb-recipe-ctnr", name, false),
+						validation.NewK8sDaprComponent("dpsb-recipe", name, false),
 					},
 				},
 			},

diff --git a/test/functional/daprrp/resources/dapr_secretstore_test.go b/test/functional/daprrp/resources/dapr_secretstore_test.go
@@ -55,11 +55,8 @@ func Test_DaprSecretStore_Manual(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "gnrc-scs-ctnr"),
-
-						// Not sure why we skip validating the labels
-						validation.NewDaprComponent(name, "gnrc-scs-manual").
-							ValidateLabels(false),
+						validation.NewK8sPodForResource("gnrc-scs-ctnr", name, true),
+						validation.NewK8sDaprComponent("gnrc-scs-manual", name, false),
 					},
 				},
 			},
@@ -104,11 +101,8 @@ func Test_DaprSecretStore_Recipe(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "gnrc-scs-ctnr-recipe").
-							ValidateLabels(false),
-
-						validation.NewDaprComponent(name, "gnrc-scs-recipe").
-							ValidateLabels(false),
+						validation.NewK8sPodForResource("gnrc-scs-ctnr-recipe", name, true),
+						validation.NewK8sDaprComponent("gnrc-scs-recipe", name, false),
 					},
 				},
 			},

diff --git a/test/functional/daprrp/resources/dapr_serviceinvocation_test.go b/test/functional/daprrp/resources/dapr_serviceinvocation_test.go
@@ -54,8 +54,8 @@ func Test_DaprServiceInvocation(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "dapr-frontend"),
-						validation.NewK8sPodForResource(name, "dapr-backend"),
+						validation.NewK8sPodForResource("dapr-frontend", name, true),
+						validation.NewK8sPodForResource("dapr-backend", name, true),
 					},
 				},
 			},

diff --git a/test/functional/daprrp/resources/dapr_statestore_test.go b/test/functional/daprrp/resources/dapr_statestore_test.go
@@ -56,16 +56,12 @@ func Test_DaprStateStore_Manual(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "dapr-sts-manual-ctnr"),
+						validation.NewK8sPodForResource("dapr-sts-manual-ctnr", name, true),
 
 						// Deployed as supporting resources using Kubernetes Bicep extensibility.
-						validation.NewK8sPodForResource(name, "dapr-sts-manual-redis").
-							ValidateLabels(false),
-						validation.NewK8sServiceForResource(name, "dapr-sts-manual-redis").
-							ValidateLabels(false),
-
-						validation.NewDaprComponent(name, "dapr-sts-manual").
-							ValidateLabels(false),
+						validation.NewK8sPodForResource("dapr-sts-manual-redis", name, false),
+						validation.NewK8sServiceForResource("dapr-sts-manual-redis", name, false),
+						validation.NewK8sDaprComponent("dapr-sts-manual", name, false),
 					},
 				},
 			},
@@ -115,11 +111,8 @@ func Test_DaprStateStore_Recipe(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "dapr-sts-recipe-ctnr").
-							ValidateLabels(false),
-
-						validation.NewDaprComponent(name, "dapr-sts-recipe").
-							ValidateLabels(false),
+						validation.NewK8sPodForResource("dapr-sts-recipe-ctnr", name, true),
+						validation.NewK8sDaprComponent("dapr-sts-recipe", name, false),
 					},
 				},
 			},

diff --git a/test/functional/datastoresrp/resources/microsoftsql_test.go b/test/functional/datastoresrp/resources/microsoftsql_test.go
@@ -68,7 +68,7 @@ func Test_MicrosoftSQL_Manual(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mssql-app-ctnr"),
+						validation.NewK8sPodForResource("mssql-app-ctnr", name, true),
 					},
 				},
 			},

diff --git a/test/functional/datastoresrp/resources/mongodb_test.go b/test/functional/datastoresrp/resources/mongodb_test.go
@@ -66,9 +66,9 @@ func Test_MongoDB_Manual(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mdb-us-app-ctnr").ValidateLabels(false),
-						validation.NewK8sPodForResource(name, "mdb-us-ctnr").ValidateLabels(false),
-						validation.NewK8sServiceForResource(name, "mdb-us-rte").ValidateLabels(false),
+						validation.NewK8sPodForResource("mdb-us-app-ctnr", name, true),
+						validation.NewK8sPodForResource("mdb-us-ctnr", name, true),
+						validation.NewK8sServiceForResource("mdb-us-rte", name, true),
 					},
 				},
 			},
@@ -114,7 +114,7 @@ func Test_MongoDB_Recipe(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mongodb-app-ctnr").ValidateLabels(false),
+						validation.NewK8sPodForResource("mongodb-app-ctnr", name, true),
 					},
 				},
 			},
@@ -170,7 +170,7 @@ func Test_MongoDB_RecipeParameters(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mdb-param-ctnr").ValidateLabels(false),
+						validation.NewK8sPodForResource("mdb-param-ctnr", name, true),
 					},
 				},
 			},
@@ -225,7 +225,7 @@ func Test_MongoDB_Recipe_ContextParameter(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mdb-ctx-ctnr").ValidateLabels(false),
+						validation.NewK8sPodForResource("mdb-ctx-ctnr", name, true),
 					},
 				},
 			},

diff --git a/test/functional/datastoresrp/resources/redis_test.go b/test/functional/datastoresrp/resources/redis_test.go
@@ -64,9 +64,9 @@ func Test_Redis_Manual(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "rds-app-ctnr"),
-						validation.NewK8sPodForResource(name, "rds-ctnr"),
-						validation.NewK8sServiceForResource(name, "rds-rte"),
+						validation.NewK8sPodForResource("rds-app-ctnr", name, true),
+						validation.NewK8sPodForResource("rds-ctnr", name, true),
+						validation.NewK8sServiceForResource("rds-rte", name, true),
 					},
 				},
 			},

diff --git a/test/functional/datastoresrp/resources/sql_test.go b/test/functional/datastoresrp/resources/sql_test.go
@@ -69,9 +69,9 @@ func Test_SQLDatabase_Manual(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "sql-app-ctnr"),
-						validation.NewK8sPodForResource(name, "sql-ctnr"),
-						validation.NewK8sServiceForResource(name, "sql-rte"),
+						validation.NewK8sPodForResource("sql-app-ctnr", name, true),
+						validation.NewK8sPodForResource("sql-ctnr", name, true),
+						validation.NewK8sServiceForResource("sql-rte", name, true),
 					},
 				},
 			},
@@ -112,8 +112,8 @@ func Test_SQLDatabase_Recipe(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "sql-recipe-app-ctnr").ValidateLabels(false),
-						validation.NewK8sPodForResource(name, "sql-recipe-resource").ValidateLabels(false),
+						validation.NewK8sPodForResource("sql-recipe-app-ctnr", name, true),
+						validation.NewK8sPodForResource("sql-recipe-resource", name, true),
 					},
 				},
 			},

diff --git a/test/functional/messagingrp/resources/rabbitmq_test.go b/test/functional/messagingrp/resources/rabbitmq_test.go
@@ -64,9 +64,9 @@ func Test_RabbitMQ_Manual(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "rmq-app-ctnr"),
-						validation.NewK8sPodForResource(name, "rmq-ctnr"),
-						validation.NewK8sServiceForResource(name, "rmq-rte"),
+						validation.NewK8sPodForResource("rmq-app-ctnr", name, true),
+						validation.NewK8sPodForResource("rmq-ctnr", name, true),
+						validation.NewK8sServiceForResource("rmq-rte", name, true),
 					},
 				},
 			},
@@ -104,8 +104,8 @@ func Test_RabbitMQ_Recipe(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "rmq-recipe-app-ctnr").ValidateLabels(false),
-						validation.NewK8sPodForResource(name, "rmq-recipe-resource").ValidateLabels(false),
+						validation.NewK8sPodForResource("rmq-recipe-app-ctnr", name, true),
+						validation.NewK8sPodForResource("rmq-recipe-resource", name, true),
 					},
 				},
 			},

diff --git a/test/functional/samples/tutorial_test.go b/test/functional/samples/tutorial_test.go
@@ -110,7 +110,7 @@ func Test_FirstApplicationSample(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(appName, "demo"),
+						validation.NewK8sPodForResource("demo", appName, true),
 					},
 				},
 			},

diff --git a/test/functional/shared/cli/cli_test.go b/test/functional/shared/cli/cli_test.go
@@ -441,8 +441,8 @@ func Test_CLI(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					"default-kubernetes-cli": {
-						validation.NewK8sPodForResource(name, "containera"),
-						validation.NewK8sPodForResource(name, "containerb"),
+						validation.NewK8sPodForResource("containera", name, true),
+						validation.NewK8sPodForResource("containerb", name, true),
 					},
 				},
 			},
@@ -481,8 +481,8 @@ func Test_CLI_JSON(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					"default-kubernetes-cli-json": {
-						validation.NewK8sPodForResource(name, "containera-json"),
-						validation.NewK8sPodForResource(name, "containerb-json"),
+						validation.NewK8sPodForResource("containera-json", name, true),
+						validation.NewK8sPodForResource("containerb-json", name, true),
 					},
 				},
 			},
@@ -521,8 +521,8 @@ func Test_CLI_Delete(t *testing.T) {
 		validation.ValidateObjectsRunning(ctx, t, options.K8sClient, options.DynamicClient, validation.K8sObjectSet{
 			Namespaces: map[string][]validation.K8sObject{
 				"default-kubernetes-cli-with-resources": {
-					validation.NewK8sPodForResource(appName, "containera-app-with-resources"),
-					validation.NewK8sPodForResource(appName, "containerb-app-with-resources"),
+					validation.NewK8sPodForResource("containera-app-with-resources", appName, true),
+					validation.NewK8sPodForResource("containerb-app-with-resources", appName, true),
 				},
 			},
 		})
@@ -555,8 +555,8 @@ func Test_CLI_Delete(t *testing.T) {
 		validation.ValidateObjectsRunning(ctx, t, options.K8sClient, options.DynamicClient, validation.K8sObjectSet{
 			Namespaces: map[string][]validation.K8sObject{
 				"default-kubernetes-cli-with-resources": {
-					validation.NewK8sPodForResource(appName, "containera-app-with-resources"),
-					validation.NewK8sPodForResource(appName, "containerb-app-with-resources"),
+					validation.NewK8sPodForResource("containera-app-with-resources", appName, true),
+					validation.NewK8sPodForResource("containerb-app-with-resources", appName, true),
 				},
 			},
 		})
@@ -615,8 +615,8 @@ func Test_CLI_DeploymentParameters(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					"default-kubernetes-cli-params": {
-						validation.NewK8sPodForResource(name, "containerc"),
-						validation.NewK8sPodForResource(name, "containerd"),
+						validation.NewK8sPodForResource("containerc", name, true),
+						validation.NewK8sPodForResource("containerd", name, true),
 					},
 				},
 			},

diff --git a/test/functional/shared/mechanics/mechanics_test.go b/test/functional/shared/mechanics/mechanics_test.go
@@ -82,7 +82,7 @@ func Test_RedeployWithAnotherResource(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mechanicsa"),
+						validation.NewK8sPodForResource("mechanicsa", name, true),
 					},
 				},
 			},
@@ -110,8 +110,8 @@ func Test_RedeployWithAnotherResource(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mechanicsb"),
-						validation.NewK8sPodForResource(name, "mechanicsc"),
+						validation.NewK8sPodForResource("mechanicsb", name, true),
+						validation.NewK8sPodForResource("mechanicsc", name, true),
 					},
 				},
 			},
@@ -145,7 +145,7 @@ func Test_RedeployWithUpdatedResourceUpdatesResource(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mechanicsd"),
+						validation.NewK8sPodForResource("mechanicsd", name, true),
 					},
 				},
 			},
@@ -168,7 +168,7 @@ func Test_RedeployWithUpdatedResourceUpdatesResource(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mechanicsd"),
+						validation.NewK8sPodForResource("mechanicsd", name, true),
 					},
 				},
 			},
@@ -215,7 +215,7 @@ func Test_RedeployWithTwoSeparateResourcesKeepsResource(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mechanicse"),
+						validation.NewK8sPodForResource("mechanicse", name, true),
 					},
 				},
 			},
@@ -243,8 +243,8 @@ func Test_RedeployWithTwoSeparateResourcesKeepsResource(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mechanicse"),
-						validation.NewK8sPodForResource(name, "mechanicsf"),
+						validation.NewK8sPodForResource("mechanicse", name, true),
+						validation.NewK8sPodForResource("mechanicsf", name, true),
 					},
 				},
 			},
@@ -293,8 +293,8 @@ func Test_CommunicationCycle(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "mechanicsg"),
-						validation.NewK8sPodForResource(name, "cyclea"),
+						validation.NewK8sPodForResource("mechanicsg", name, true),
+						validation.NewK8sPodForResource("cyclea", name, true),
 					},
 				},
 			},

diff --git a/test/functional/shared/resources/azure_connections_test.go b/test/functional/shared/resources/azure_connections_test.go
@@ -56,7 +56,7 @@ func Test_AzureConnections(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, containerResourceName),
+						validation.NewK8sPodForResource(containerResourceName, name, true),
 					},
 				},
 			},

diff --git a/test/functional/shared/resources/container_runtimes_test.go b/test/functional/shared/resources/container_runtimes_test.go
@@ -60,7 +60,7 @@ func Test_Container_YAMLManifest(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "ctnr-manifest"),
+						validation.NewK8sPodForResource("ctnr-manifest", name, true),
 					},
 				},
 			},
@@ -126,7 +126,7 @@ func Test_Container_YAMLManifest_SideCar(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "ctnr-sidecar"),
+						validation.NewK8sPodForResource("ctnr-sidecar", name, true),
 					},
 				},
 			},
@@ -172,7 +172,7 @@ func Test_Container_pod_patching(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
-						validation.NewK8sPodForResource(name, "ctnr-podpatch"),
+						validation.NewK8sPodForResource("ctnr-podpatch", name, true),
 					},
 				},
 			},