Merge pull request #138 from tchughesiv/fixTest0.1.4

fix connection/instance tests

Author: tchughesiv

.github/workflows/dockerbuild.yml

@@ -2,9 +2,13 @@ name: Build Image
 
 on:
   push:
-    branches: [main]
+    branches:
+    - main
+    - release-*
   pull_request:
-    branches: [main]
+    branches:
+    - main
+    - release-*
 
 jobs:
   build:

.github/workflows/gobuild.yml

@@ -2,9 +2,13 @@ name: Go
 
 on:
   push:
-    branches: [main]
+    branches:
+    - main
+    - release-*
   pull_request:
-    branches: [main]
+    branches:
+    - main
+    - release-*
 
 jobs:
   test:

.github/workflows/golangci-lint.yml

@@ -1,11 +1,14 @@
 name: Golangci-lint and Gosec
+
 on:
   push:
     branches:
-      - main
+    - main
+    - release-*
   pull_request:
     branches:
-      - main
+    - main
+    - release-*
 
 jobs:
   golangci:

controllers/dbaasconnection_controller_test.go

@@ -236,7 +236,7 @@ var _ = Describe("DBaaSConnection controller - nominal", func() {
 			}
 
 			Context("after creating DBaaSConnection", func() {
-				connectionName := "test-connection"
+				connectionName := "test-connection-1"
 				instanceID := "test-instanceID"
 				DBaaSConnectionSpec := &v1alpha1.DBaaSConnectionSpec{
 					InventoryRef: v1alpha1.NamespacedName{
@@ -309,7 +309,7 @@ var _ = Describe("DBaaSConnection controller - valid dev namespaces", func() {
 					Name: "other2",
 				},
 			}
-			inventoryRefName := "test-inventory-ref"
+			inventoryRefName := "test-inventory-ref-2"
 			createdDBaaSInventory := &v1alpha1.DBaaSInventory{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      inventoryRefName,
@@ -350,7 +350,7 @@ var _ = Describe("DBaaSConnection controller - valid dev namespaces", func() {
 			}
 
 			Context("after creating DBaaSConnections in separate, valid dev namespaces", func() {
-				connectionName := "test-connection"
+				connectionName := "test-connection-2"
 				instanceID := "test-instanceID"
 				DBaaSConnectionSpec := &v1alpha1.DBaaSConnectionSpec{
 					InventoryRef: v1alpha1.NamespacedName{
@@ -415,7 +415,7 @@ var _ = Describe("DBaaSConnection controller - valid dev namespaces", func() {
 					Name: "other3",
 				},
 			}
-			inventoryRefName := "test-inventory-ref"
+			inventoryRefName := "test-inventory-ref-3"
 			createdDBaaSInventory := &v1alpha1.DBaaSInventory{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      inventoryRefName,
@@ -456,7 +456,7 @@ var _ = Describe("DBaaSConnection controller - valid dev namespaces", func() {
 			}
 
 			Context("after creating DBaaSConnections in separate, valid dev namespaces", func() {
-				connectionName := "test-connection"
+				connectionName := "test-connection-3"
 				instanceID := "test-instanceID"
 				DBaaSConnectionSpec := &v1alpha1.DBaaSConnectionSpec{
 					InventoryRef: v1alpha1.NamespacedName{

controllers/dbaasinstance_controller_test.go

@@ -124,8 +124,8 @@ var _ = Describe("DBaaSInstance controller with errors", func() {
 		It("reconcile with error", assertDBaaSResourceStatusUpdated(createdDBaaSInstance, metav1.ConditionFalse, v1alpha1.DBaaSInventoryNotReady))
 	})
 	Context("after creating DBaaSInstance in an invalid namespace", func() {
-		instanceName := "test-instance-not-ready"
-		inventoryName := "test-instance-inventory-not-ready"
+		instanceName := "test-instance-not-ready-2"
+		inventoryName := "test-instance-inventory-diff-ns"
 		DBaaSInventorySpec := &v1alpha1.DBaaSInventorySpec{
 			CredentialsRef: &v1alpha1.NamespacedName{
 				Name:      testSecret.Name,
@@ -325,7 +325,7 @@ var _ = Describe("DBaaSInstance controller - valid dev namespaces", func() {
 					Name: "other2",
 				},
 			}
-			inventoryRefName := "test-inventory-ref"
+			inventoryRefName := "test-inventory-ref-2"
 			createdDBaaSInventory := &v1alpha1.DBaaSInventory{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      inventoryRefName,
@@ -366,7 +366,7 @@ var _ = Describe("DBaaSInstance controller - valid dev namespaces", func() {
 			}
 
 			Context("after creating DBaaSInstance in separate, valid dev namespace", func() {
-				instanceName := "test-instance"
+				instanceName := "test-instance-2"
 				DBaaSInstanceSpec := &v1alpha1.DBaaSInstanceSpec{
 					InventoryRef: v1alpha1.NamespacedName{
 						Name:      inventoryRefName,
@@ -438,7 +438,7 @@ var _ = Describe("DBaaSInstance controller - valid dev namespaces", func() {
 					Name: "other3",
 				},
 			}
-			inventoryRefName := "test-inventory-ref"
+			inventoryRefName := "test-inventory-ref-3"
 			createdDBaaSInventory := &v1alpha1.DBaaSInventory{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      inventoryRefName,
@@ -479,7 +479,7 @@ var _ = Describe("DBaaSInstance controller - valid dev namespaces", func() {
 			}
 
 			Context("after creating DBaaSInstance in separate, valid dev namespace", func() {
-				instanceName := "test-instance"
+				instanceName := "test-instance-3"
 				DBaaSInstanceSpec := &v1alpha1.DBaaSInstanceSpec{
 					InventoryRef: v1alpha1.NamespacedName{
 						Name:      inventoryRefName,