fix: reversed names of tests (public and private) + DRY common consts

nearform · Oct 27, 2023 · 57923f4 · 57923f4
1 parent 30e245b
commit 57923f4
Showing 1 changed file with 23 additions and 32 deletions.
diff --git a/src/services/k8s/knative_test.go b/src/services/k8s/knative_test.go
@@ -14,19 +14,31 @@ import (
 )
 
 const (
-	root     = "../../../"
-	caCrt    = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNsakNDQVg0Q0NRRCtnL1BXUWJDSEFUQU5CZ2txaGtpRzl3MEJBUXNGQURBTk1Rc3dDUVlEVlFRR0V3SlYKVXpBZUZ3MHlNekExTURreE9EUTNNakZhRncweU5EQTFNRGd4T0RRM01qRmFNQTB4Q3pBSkJnTlZCQVlUQWxWVApNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTMzZXhaMldSUGtGeTJiQTQ4Z3RvClVwK0JkMFd2THFROU50WDBOS014YnA1SjEwMS9VaTVsY1RIcllDMWRqYTVwdjFKVGNGUW1jcWpBajBpL3dBakMKRm5oL1JKbVFrMHE1Y2liZWNURnA5UUFvRVNmbzJxYXovUTFmbmk4OG9ONlk1b1VGd2hrdTJ1bzNUWnV6M0JDMApNRnRyNXRDSGh1UzFObFhVT05VcHpzbW1UZzdZL0R1QXpNK3VIZS9qZlo1eHFqQUx3WHV6SkRFNkNCUGdhbHh6Ck9QM0V4QWNaMmRDWnRCREpVUnpTL29qMFYxOVdsRG5FK1FkTmtGTXlaMHN1UGxPTy95V0Ercno1byt2c2dKVGgKa2ZjaVZQSXZBOUdJdDdOcDZVdzU3MW1VOVlmd2x6MlU0Qm1xTXl6M05pZFF3bVd3V0wvay8yRHlXa0JDaFRBKwpvd0lEQVFBQk1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQWQ2M01qbFRJSWlSaVdOSDZvcDJySURjY1d5aWNKClJGbHJoODllSDVWeU04Q1o0NUhPYzVjbzZvRDVFdzQ3eG9vSlI2enZEd0c2anozelpFL3ArY2I5aGJ5dFJ5cysKaWNDd1g2dnRtbVpPN0M1RHdIMFYrUzk4emowNytmZFR3dUJHTDIxSlpZVmg1bFR6cEFpdU9iSkh6OTA5d1Y3OApObVhRSHpkMmtEZnpmTWhUaXpWZERPZEs3K2k1Q1RmaENIWUc4dDY2U3pmMGU5cWJ5eUFvTndwRnpxV01lRHROCkdJTGxBNHljcm1pYzBldUpmenZjeGk5NUVwMDdaZ1dYY3pINytLTWJtVnd2RkJWblZHdE9MZC9kMWhKaXlnU20KZUZERURxam9xL1JEcndCU2thbnlJMjNVa21uNGxkNDUvbHFVNDRSMVNqZXJaQmtNUmVIeTN0ZloKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
-	endpoint = "https://127.0.0.1:6443"
-	token    = "ZXlKaGJHY2lPaUpTVXpJMU5pSXNJbXRwWkNJNklqWllaRFEwT0ZwUWVsRlJRVkp0TUMxa04wWTRNV3N6UzFwVmRXOVhSMDlvYzA5MWFESXdPVWhwVkhjaWZRLmV5SnBjM01pT2lKcmRXSmxjbTVsZEdWekwzTmxjblpwWTJWaFkyTnZkVzUwSWl3aWEzVmlaWEp1WlhSbGN5NXBieTl6WlhKMmFXTmxZV05qYjNWdWRDOXVZVzFsYzNCaFkyVWlPaUpyZFdKbExYTjVjM1JsYlNJc0ltdDFZbVZ5Ym1WMFpYTXVhVzh2YzJWeWRtbGpaV0ZqWTI5MWJuUXZjMlZqY21WMExtNWhiV1VpT2lKdmEyVXRhM1ZpWldOdmJtWnBaeTF6WVMxMGIydGxiaUlzSW10MVltVnlibVYwWlhNdWFXOHZjMlZ5ZG1salpXRmpZMjkxYm5RdmMyVnlkbWxqWlMxaFkyTnZkVzUwTG01aGJXVWlPaUowWlhOMExYTmhJaXdpYTNWaVpYSnVaWFJsY3k1cGJ5OXpaWEoyYVdObFlXTmpiM1Z1ZEM5elpYSjJhV05sTFdGalkyOTFiblF1ZFdsa0lqb2lNelV4TkdJME9XVXRaVE15TWkwMFpHTTBMVGhsTUdVdE1qSTROemxsWm1GaE9HTXpJaXdpYzNWaUlqb2ljM2x6ZEdWdE9uTmxjblpwWTJWaFkyTnZkVzUwT210MVltVXRjM2x6ZEdWdE9uUmxjM1F0YzJFaWZRLlI5YnN3LU1MUjBubUhNOVJoUWJBZTBoZ2U0Z3JzYkJPa25RZUxVWC13SnRFY2dWejRDLVp6MFhVbUpPMEo4SVFmZXU1b3F3RnJwVHpSVEp0R24wdVdqc1RrSTZHSWNRNkpxM0FUSms3MEkwVzFqUTVJTkpJVjVmMFpfZDlIazNpZnVQaFNUUmpBZ2ljTDJCNjdMUHVBaW40T05hOHNkTE95VTZrSXFDU2Q3dURUNVMtLS1qQ0JzTnpJd1p0QVg1dVFfbDZGUHVUdlZxdGJiSUJGblVQUGExandaSWwwd3U1YV9DTG9rVFhWbDduVkZYUzBxZTJ1RWFmUlEwVGZIOWFjbWZndkFVcWFXbkNsTV9oekNzekhKOTBYaHNtOXIzQ3oya29UcDJhLWtVVWlhSWQxbGlPeWcyNFMtS29TZlNwUEpiNWcxVzZhNHB5VU1xMXNDNGFuUQ=="
+	root      = "../../../"
+	caCrt     = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNsakNDQVg0Q0NRRCtnL1BXUWJDSEFUQU5CZ2txaGtpRzl3MEJBUXNGQURBTk1Rc3dDUVlEVlFRR0V3SlYKVXpBZUZ3MHlNekExTURreE9EUTNNakZhRncweU5EQTFNRGd4T0RRM01qRmFNQTB4Q3pBSkJnTlZCQVlUQWxWVApNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTMzZXhaMldSUGtGeTJiQTQ4Z3RvClVwK0JkMFd2THFROU50WDBOS014YnA1SjEwMS9VaTVsY1RIcllDMWRqYTVwdjFKVGNGUW1jcWpBajBpL3dBakMKRm5oL1JKbVFrMHE1Y2liZWNURnA5UUFvRVNmbzJxYXovUTFmbmk4OG9ONlk1b1VGd2hrdTJ1bzNUWnV6M0JDMApNRnRyNXRDSGh1UzFObFhVT05VcHpzbW1UZzdZL0R1QXpNK3VIZS9qZlo1eHFqQUx3WHV6SkRFNkNCUGdhbHh6Ck9QM0V4QWNaMmRDWnRCREpVUnpTL29qMFYxOVdsRG5FK1FkTmtGTXlaMHN1UGxPTy95V0Ercno1byt2c2dKVGgKa2ZjaVZQSXZBOUdJdDdOcDZVdzU3MW1VOVlmd2x6MlU0Qm1xTXl6M05pZFF3bVd3V0wvay8yRHlXa0JDaFRBKwpvd0lEQVFBQk1BMEdDU3FHU0liM0RRRUJDd1VBQTRJQkFRQWQ2M01qbFRJSWlSaVdOSDZvcDJySURjY1d5aWNKClJGbHJoODllSDVWeU04Q1o0NUhPYzVjbzZvRDVFdzQ3eG9vSlI2enZEd0c2anozelpFL3ArY2I5aGJ5dFJ5cysKaWNDd1g2dnRtbVpPN0M1RHdIMFYrUzk4emowNytmZFR3dUJHTDIxSlpZVmg1bFR6cEFpdU9iSkh6OTA5d1Y3OApObVhRSHpkMmtEZnpmTWhUaXpWZERPZEs3K2k1Q1RmaENIWUc4dDY2U3pmMGU5cWJ5eUFvTndwRnpxV01lRHROCkdJTGxBNHljcm1pYzBldUpmenZjeGk5NUVwMDdaZ1dYY3pINytLTWJtVnd2RkJWblZHdE9MZC9kMWhKaXlnU20KZUZERURxam9xL1JEcndCU2thbnlJMjNVa21uNGxkNDUvbHFVNDRSMVNqZXJaQmtNUmVIeTN0ZloKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
+	endpoint  = "https://127.0.0.1:6443"
+	token     = "ZXlKaGJHY2lPaUpTVXpJMU5pSXNJbXRwWkNJNklqWllaRFEwT0ZwUWVsRlJRVkp0TUMxa04wWTRNV3N6UzFwVmRXOVhSMDlvYzA5MWFESXdPVWhwVkhjaWZRLmV5SnBjM01pT2lKcmRXSmxjbTVsZEdWekwzTmxjblpwWTJWaFkyTnZkVzUwSWl3aWEzVmlaWEp1WlhSbGN5NXBieTl6WlhKMmFXTmxZV05qYjNWdWRDOXVZVzFsYzNCaFkyVWlPaUpyZFdKbExYTjVjM1JsYlNJc0ltdDFZbVZ5Ym1WMFpYTXVhVzh2YzJWeWRtbGpaV0ZqWTI5MWJuUXZjMlZqY21WMExtNWhiV1VpT2lKdmEyVXRhM1ZpWldOdmJtWnBaeTF6WVMxMGIydGxiaUlzSW10MVltVnlibVYwWlhNdWFXOHZjMlZ5ZG1salpXRmpZMjkxYm5RdmMyVnlkbWxqWlMxaFkyTnZkVzUwTG01aGJXVWlPaUowWlhOMExYTmhJaXdpYTNWaVpYSnVaWFJsY3k1cGJ5OXpaWEoyYVdObFlXTmpiM1Z1ZEM5elpYSjJhV05sTFdGalkyOTFiblF1ZFdsa0lqb2lNelV4TkdJME9XVXRaVE15TWkwMFpHTTBMVGhsTUdVdE1qSTROemxsWm1GaE9HTXpJaXdpYzNWaUlqb2ljM2x6ZEdWdE9uTmxjblpwWTJWaFkyTnZkVzUwT210MVltVXRjM2x6ZEdWdE9uUmxjM1F0YzJFaWZRLlI5YnN3LU1MUjBubUhNOVJoUWJBZTBoZ2U0Z3JzYkJPa25RZUxVWC13SnRFY2dWejRDLVp6MFhVbUpPMEo4SVFmZXU1b3F3RnJwVHpSVEp0R24wdVdqc1RrSTZHSWNRNkpxM0FUSms3MEkwVzFqUTVJTkpJVjVmMFpfZDlIazNpZnVQaFNUUmpBZ2ljTDJCNjdMUHVBaW40T05hOHNkTE95VTZrSXFDU2Q3dURUNVMtLS1qQ0JzTnpJd1p0QVg1dVFfbDZGUHVUdlZxdGJiSUJGblVQUGExandaSWwwd3U1YV9DTG9rVFhWbDduVkZYUzBxZTJ1RWFmUlEwVGZIOWFjbWZndkFVcWFXbkNsTV9oekNzekhKOTBYaHNtOXIzQ3oya29UcDJhLWtVVWlhSWQxbGlPeWcyNFMtS29TZlNwUEpiNWcxVzZhNHB5VU1xMXNDNGFuUQ=="
+	namespace = "custom"
+	commitSha = "93f4be93"
 )
 
 var (
 	envSampleFile          = path.Join(root, "example/.env.initium.sample")
 	secretRefEnvSampleFile = path.Join(root, "example/.env.secretref.initium.sample")
+	proj                   = &project.Project{Name: "knative_test",
+		Directory: path.Join(root, "example"),
+		Resources: os.DirFS(root),
+		IsPrivate: false,
+	}
+	dockerImage = docker.DockerImage{
+		Registry:  "example.com",
+		Directory: ".",
+		Name:      "test",
+		Tag:       "v1.1.0",
+	}
 )
 
 func TestConfig(t *testing.T) {
-
 	decodedCert, err := base64.StdEncoding.DecodeString(caCrt)
 
 	if err != nil {
@@ -59,23 +71,7 @@ func TestConfig(t *testing.T) {
 
 }
 
-func TestLoadManifestForPrivateService(t *testing.T) {
-	namespace := "custom"
-	commitSha := "93f4be93"
-
-	proj := &project.Project{Name: "knative_test",
-		Directory: path.Join(root, "example"),
-		Resources: os.DirFS(root),
-		IsPrivate: false,
-	}
-
-	dockerImage := docker.DockerImage{
-		Registry:  "example.com",
-		Directory: ".",
-		Name:      "test",
-		Tag:       "v1.1.0",
-	}
-
+func TestLoadManifestForPublicService(t *testing.T) {
 	serviceManifest, err := LoadManifest(namespace, commitSha, proj, dockerImage, envSampleFile, secretRefEnvSampleFile)
 
 	if err != nil {
@@ -91,17 +87,12 @@ func TestLoadManifestForPrivateService(t *testing.T) {
 	assert.Assert(t, !ok, "Visibility label should not be set for public services")
 }
 
-func TestLoadManifestForPublicService(t *testing.T) {
-	namespace := "custom"
-	commitSha := "93f4be93"
+func TestLoadManifestForPrivateService(t *testing.T) {
 	imagePullSecrets := []string{"secretPassword123"}
 
-	proj := &project.Project{Name: "knative_test",
-		Directory:        path.Join(root, "example"),
-		Resources:        os.DirFS(root),
-		ImagePullSecrets: imagePullSecrets,
-		IsPrivate:        true,
-	}
+	privateProj := proj
+	privateProj.IsPrivate = true
+	privateProj.ImagePullSecrets = imagePullSecrets
 
 	dockerImage := docker.DockerImage{
 		Registry:  "example.com",
@@ -110,7 +101,7 @@ func TestLoadManifestForPublicService(t *testing.T) {
 		Tag:       "v1.1.0",
 	}
 
-	serviceManifest, err := LoadManifest(namespace, commitSha, proj, dockerImage, envSampleFile, secretRefEnvSampleFile)
+	serviceManifest, err := LoadManifest(namespace, commitSha, privateProj, dockerImage, envSampleFile, secretRefEnvSampleFile)
 
 	if err != nil {
 		t.Fatalf(fmt.Sprintf("Error: %v", err))