Align self register e2e tests (#2101)

* Merge tests * bump version
kyma-incubator · Nov 8, 2021 · 9685326 · 9685326
1 parent cc3cb45
commit 9685326
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 67 deletions.
diff --git a/chart/compass/templates/tests/director/director-test.yaml b/chart/compass/templates/tests/director/director-test.yaml
@@ -124,10 +124,6 @@ spec:
               value: {{ .Values.global.connector.secrets.ca.keyKey | quote }}
             - name: SKIP_TESTS_REGEX
               value: {{ .Values.global.tests.director.skipPattern }}
-            - name: APP_SELF_REGISTER_DISTINGUISH_LABEL_KEY
-              value: {{ .Values.global.director.selfRegister.distinguishLabel }}
-            - name: APP_SELF_REGISTER_LABEL_KEY
-              value: {{ .Values.global.director.selfRegister.label }}
           {{ if .Values.global.isLocalEnv }}
           volumeMounts:
             - mountPath: "/src/github.com/kyma-incubator/compass/components/director/examples"

diff --git a/chart/compass/templates/tests/ord-service/ord-service-test.yaml b/chart/compass/templates/tests/ord-service/ord-service-test.yaml
@@ -143,6 +143,10 @@ spec:
               value: "0.0.0.0:{{.Values.global.tests.token.server.port}}"
             - name: SKIP_TESTS_REGEX
               value: {{ .Values.global.tests.ordService.skipPattern }}
+            - name: APP_SELF_REGISTER_DISTINGUISH_LABEL_KEY
+              value: {{ .Values.global.director.selfRegister.distinguishLabel }}
+            - name: APP_SELF_REGISTER_LABEL_KEY
+              value: {{ .Values.global.director.selfRegister.label }}
         {{if eq .Values.global.database.embedded.enabled false}}
         - name: cloudsql-proxy
           image: gcr.io/cloudsql-docker/gce-proxy:1.23.0-alpine

diff --git a/chart/compass/values.yaml b/chart/compass/values.yaml
@@ -112,7 +112,7 @@ global:
       version: "PR-46"
     e2e_tests:
       dir:
-      version: "PR-2096"
+      version: "PR-2101"
   isLocalEnv: false
   oauth2:
     host: oauth2

diff --git a/tests/director/tests/self_reg_test.go b/tests/director/tests/self_reg_test.go
diff --git a/tests/ord-service/tests/main_test.go b/tests/ord-service/tests/main_test.go
@@ -79,6 +79,8 @@ type config struct {
 	ClientSecret                     string
 	SubscriptionProviderLabelKey     string
 	ConsumerSubaccountIdsLabelKey    string
+	SelfRegisterDistinguishLabelKey  string `envconfig:"APP_SELF_REGISTER_DISTINGUISH_LABEL_KEY"`
+	SelfRegisterLabelKey             string `envconfig:"APP_SELF_REGISTER_LABEL_KEY"`
 }
 
 var testConfig config

diff --git a/tests/ord-service/tests/subscription_flow_test.go b/tests/ord-service/tests/subscription_flow_test.go
@@ -46,6 +46,7 @@ func TestSelfRegisterFlow(stdT *testing.T) {
 	t := testingx.NewT(stdT)
 	t.Run("TestSelfRegisterFlow flow: label definitions of the parent tenant are not overwritten", func(t *testing.T) {
 		ctx := context.Background()
+		distinguishLblValue := "test-distinguish-value"
 
 		// defaultTenantId is the parent of the subaccountID
 		defaultTenantId := tenant.TestTenants.GetDefaultTenantID()
@@ -75,11 +76,15 @@ func TestSelfRegisterFlow(stdT *testing.T) {
 		runtimeInput := graphql.RuntimeInput{
 			Name:        "selfRegisterRuntime",
 			Description: ptr.String("selfRegisterRuntime-description"),
+			Labels:      graphql.Labels{testConfig.SelfRegisterDistinguishLabelKey: distinguishLblValue},
 		}
 		runtime, err := fixtures.RegisterRuntimeFromInputWithinTenant(t, ctx, directorCertSecuredClient, defaultTenantId, &runtimeInput)
 		defer fixtures.CleanupRuntime(t, ctx, directorCertSecuredClient, defaultTenantId, &runtime)
 		require.NoError(t, err)
 		require.NotEmpty(t, runtime.ID)
+		strLbl, ok := runtime.Labels[testConfig.SelfRegisterLabelKey].(string)
+		require.True(t, ok)
+		require.Contains(t, strLbl, distinguishLblValue)
 
 		labelDefinitions, err := fixtures.ListLabelDefinitionsWithinTenant(t, ctx, dexGraphQLClient, defaultTenantId)
 		require.NoError(t, err)

diff --git a/tests/pkg/config/director.go b/tests/pkg/config/director.go
@@ -2,18 +2,16 @@ package config
 
 type DirectorConfig struct {
 	BaseDirectorConfig
-	HealthUrl                       string `envconfig:"default=https://director.kyma.local/healthz"`
-	WebhookUrl                      string `envconfig:"default=https://kyma-project.io"`
-	InfoUrl                         string `envconfig:"APP_INFO_API_ENDPOINT,default=https://director.kyma.local/v1/info"`
-	CertIssuer                      string `envconfig:"APP_INFO_CERT_ISSUER"`
-	CertSubject                     string `envconfig:"APP_INFO_CERT_SUBJECT"`
-	DefaultScenarioEnabled          bool   `envconfig:"default=true"`
-	DefaultNormalizationPrefix      string `envconfig:"default=mp-"`
-	GatewayOauth                    string
-	DirectorExternalCertSecuredURL  string
-	SelfRegisterDistinguishLabelKey string `envconfig:"APP_SELF_REGISTER_DISTINGUISH_LABEL_KEY"`
-	SelfRegisterLabelKey            string `envconfig:"APP_SELF_REGISTER_LABEL_KEY"`
-	CA                              ConnectorCAConfig
+	HealthUrl                      string `envconfig:"default=https://director.kyma.local/healthz"`
+	WebhookUrl                     string `envconfig:"default=https://kyma-project.io"`
+	InfoUrl                        string `envconfig:"APP_INFO_API_ENDPOINT,default=https://director.kyma.local/v1/info"`
+	CertIssuer                     string `envconfig:"APP_INFO_CERT_ISSUER"`
+	CertSubject                    string `envconfig:"APP_INFO_CERT_SUBJECT"`
+	DefaultScenarioEnabled         bool   `envconfig:"default=true"`
+	DefaultNormalizationPrefix     string `envconfig:"default=mp-"`
+	GatewayOauth                   string
+	DirectorExternalCertSecuredURL string
+	CA                             ConnectorCAConfig
 }
 
 type BaseDirectorConfig struct {