Minor fixes

Author: ewoutp

tests/auth_test.go

@@ -42,7 +42,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {
 
 	// Secret must now exist
 	if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
-		t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
+		t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
 	}
 
 	// Create a database client
@@ -59,7 +59,7 @@ func TestAuthenticationSingleDefaultSecret(t *testing.T) {
 
 	// Secret must no longer exist
 	if err := waitUntilSecretNotFound(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, time.Minute); err != nil {
-		t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.JWTSecretName, err)
+		t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
 	}
 }
 
@@ -181,7 +181,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {
 
 	// Secret must now exist
 	if _, err := waitUntilSecret(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, nil, time.Second); err != nil {
-		t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.JWTSecretName, err)
+		t.Fatalf("JWT secret '%s' not found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
 	}
 
 	// Create a database client
@@ -198,7 +198,7 @@ func TestAuthenticationClusterDefaultSecret(t *testing.T) {
 
 	// Secret must no longer exist
 	if err := waitUntilSecretNotFound(kubecli, depl.Spec.Authentication.GetJWTSecretName(), ns, time.Minute); err != nil {
-		t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.JWTSecretName, err)
+		t.Fatalf("JWT secret '%s' still found: %v", depl.Spec.Authentication.GetJWTSecretName(), err)
 	}
 }
 

tests/deployments_test.go

@@ -75,7 +75,7 @@ func deploymentSubTest(t *testing.T, mode api.DeploymentMode, engine api.Storage
 	c := kubeArangoClient.MustNewInCluster()
 
 	// Prepare deployment config
-	depl := newDeployment("test-1-deployment-" + string(mode) + "-" + string(engine) + "-" + uniuri.NewLen(4))
+	depl := newDeployment("test-deployment-" + string(mode) + "-" + string(engine) + "-" + uniuri.NewLen(4))
 	depl.Spec.Mode = api.NewMode(mode)
 	depl.Spec.StorageEngine = api.NewStorageEngine(engine)
 	depl.Spec.TLS = api.TLSSpec{}         // should auto-generate cert
@@ -110,13 +110,13 @@ func TestMultiDeployment(t *testing.T) {
 	c := kubeArangoClient.MustNewInCluster()
 
 	// Prepare deployment configurations
-	depl1 := newDeployment("test-multidep1-1-" + uniuri.NewLen(4))
+	depl1 := newDeployment("test-multidep-1-" + uniuri.NewLen(4))
 	depl1.Spec.Mode = api.NewMode(api.DeploymentModeCluster)
 	depl1.Spec.StorageEngine = api.NewStorageEngine(api.StorageEngineRocksDB)
 	depl1.Spec.TLS = api.TLSSpec{}          // should auto-generate cert
 	depl1.Spec.SetDefaults(depl1.GetName()) // this must be last
 
-	depl2 := newDeployment("test-multidep1-2-" + uniuri.NewLen(4))
+	depl2 := newDeployment("test-multidep-2-" + uniuri.NewLen(4))
 	depl2.Spec.Mode = api.NewMode(api.DeploymentModeSingle)
 	depl2.Spec.StorageEngine = api.NewStorageEngine(api.StorageEngineMMFiles)
 	depl2.Spec.TLS = api.TLSSpec{}          // should auto-generate cert