Validating labels of k8s resources in functional tests

radius-project · Sep 16, 2023 · a7e1917 · a7e1917
1 parent 2eb5df4
commit a7e1917
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 50 deletions.
diff --git a/test/functional/daprrp/resources/dapr_pubsub_test.go b/test/functional/daprrp/resources/dapr_pubsub_test.go
@@ -57,13 +57,9 @@ func Test_DaprPubSubBroker_Manual(t *testing.T) {
 				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(name, "dpsb-manual-redis"),
+						validation.NewK8sServiceForResource(name, "dpsb-manual-redis"),
+						validation.NewDaprComponent(name, "dpsb-manual"),
 					},
 				},
 			},
@@ -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(name, "dpsb-recipe-ctnr"),
+						validation.NewDaprComponent(name, "dpsb-recipe"),
 					},
 				},
 			},

diff --git a/test/functional/daprrp/resources/dapr_secretstore_test.go b/test/functional/daprrp/resources/dapr_secretstore_test.go
@@ -56,10 +56,7 @@ func Test_DaprSecretStore_Manual(t *testing.T) {
 				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.NewDaprComponent(name, "gnrc-scs-manual"),
 					},
 				},
 			},
@@ -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(name, "gnrc-scs-ctnr-recipe"),
+						validation.NewDaprComponent(name, "gnrc-scs-recipe"),
 					},
 				},
 			},

diff --git a/test/functional/daprrp/resources/dapr_statestore_test.go b/test/functional/daprrp/resources/dapr_statestore_test.go
@@ -57,15 +57,10 @@ func Test_DaprStateStore_Manual(t *testing.T) {
 				Namespaces: map[string][]validation.K8sObject{
 					appNamespace: {
 						validation.NewK8sPodForResource(name, "dapr-sts-manual-ctnr"),
-
 						// 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(name, "dapr-sts-manual-redis"),
+						validation.NewK8sServiceForResource(name, "dapr-sts-manual-redis"),
+						validation.NewDaprComponent(name, "dapr-sts-manual"),
 					},
 				},
 			},
@@ -115,11 +110,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(name, "dapr-sts-recipe-ctnr"),
+						validation.NewDaprComponent(name, "dapr-sts-recipe"),
 					},
 				},
 			},

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(name, "mdb-us-app-ctnr"),
+						validation.NewK8sPodForResource(name, "mdb-us-ctnr"),
+						validation.NewK8sServiceForResource(name, "mdb-us-rte"),
 					},
 				},
 			},
@@ -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(name, "mongodb-app-ctnr"),
 					},
 				},
 			},
@@ -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(name, "mdb-param-ctnr"),
 					},
 				},
 			},
@@ -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(name, "mdb-ctx-ctnr"),
 					},
 				},
 			},

diff --git a/test/functional/datastoresrp/resources/sql_test.go b/test/functional/datastoresrp/resources/sql_test.go
@@ -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(name, "sql-recipe-app-ctnr"),
+						validation.NewK8sPodForResource(name, "sql-recipe-resource"),
 					},
 				},
 			},

diff --git a/test/functional/messagingrp/resources/rabbitmq_test.go b/test/functional/messagingrp/resources/rabbitmq_test.go
@@ -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(name, "rmq-recipe-app-ctnr"),
+						validation.NewK8sPodForResource(name, "rmq-recipe-resource"),
 					},
 				},
 			},

diff --git a/test/functional/shared/resources/recipe_terraform_test.go b/test/functional/shared/resources/recipe_terraform_test.go
@@ -90,12 +90,10 @@ func Test_TerraformRecipe_KubernetesRedis(t *testing.T) {
 			K8sObjects: &validation.K8sObjectSet{
 				Namespaces: map[string][]validation.K8sObject{
 					appName: {
-						validation.NewK8sServiceForResource(appName, redisCacheName).
-							ValidateLabels(false),
+						validation.NewK8sServiceForResource(appName, redisCacheName),
 					},
 					secretNamespace: {
-						validation.NewK8sSecretForResourceWithResourceName(secretPrefix + secretSuffix).
-							ValidateLabels(false),
+						validation.NewK8sSecretForResourceWithResourceName(secretPrefix + secretSuffix),
 					},
 				},
 			},
@@ -146,8 +144,7 @@ func Test_TerraformRecipe_Context(t *testing.T) {
 						validation.NewK8sSecretForResource(name, name),
 					},
 					secretNamespace: {
-						validation.NewK8sSecretForResourceWithResourceName(secretPrefix + secretSuffix).
-							ValidateLabels(false),
+						validation.NewK8sSecretForResourceWithResourceName(secretPrefix + secretSuffix),
 					},
 				},
 			},