Remove the special treatment for oracle and sqlserver service binding with spring-cloud-bindings

Author: xieshenzh

controllers/rdsconnection_controller.go

@@ -80,7 +80,7 @@ type RDSConnectionReconciler struct {
 //+kubebuilder:rbac:groups=dbaas.redhat.com,resources=rdsconnections/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=dbaas.redhat.com,resources=rdsconnections/finalizers,verbs=update
 //+kubebuilder:rbac:groups=rds.services.k8s.aws,resources=dbinstances,verbs=get;list;watch
-//+kubebuilder:rbac:groups="",resources=secrets;configmaps,verbs=get;list;watch;create;delete;update
+//+kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;delete;update
 
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
@@ -322,28 +322,6 @@ func setSecret(secret *v1.Secret, dbSecret *v1.Secret, dbInstance *rdsv1alpha1.D
 		}
 	}
 
-	if dbInstance.Spec.Engine != nil {
-		host := data["host"]
-		port := data["port"]
-		db, dbOk := data["database"]
-
-		switch *dbInstance.Spec.Engine {
-		case oracleSe2, oracleSe2Cdb, oracleEe, oracleEeCdb, customOracleEe:
-			if dbOk {
-				data["jdbc-url"] = []byte(fmt.Sprintf("jdbc:oracle:thin:@%s:%s/%s", host, port, db))
-			} else {
-				data["jdbc-url"] = []byte(fmt.Sprintf("jdbc:oracle:thin:@%s:%s", host, port))
-			}
-		case sqlserverEe, sqlserverSe, sqlserverEx, sqlserverWeb, customSqlserverEe, customSqlserverSe, customSqlserverWeb:
-			if dbOk {
-				data["jdbc-url"] = []byte(fmt.Sprintf("jdbc:sqlserver://%s:%s;databaseName=%s", host, port, db))
-			} else {
-				data["jdbc-url"] = []byte(fmt.Sprintf("jdbc:sqlserver://%s:%s", host, port))
-			}
-		default:
-		}
-	}
-
 	secret.Data = data
 }
 

controllers/rdsconnection_controller_test.go

@@ -495,7 +495,7 @@ var _ = Describe("RDSConnectionController", func() {
 												})
 
 												Context("when the Instance connection info is complete", func() {
-													It("should create Secret and ConfigMap for binding", func() {
+													It("should create Secret for binding", func() {
 														By("checking the status of the Connection")
 														conn := &rdsdbaasv1alpha1.RDSConnection{
 															ObjectMeta: metav1.ObjectMeta{
@@ -648,7 +648,7 @@ var _ = Describe("RDSConnectionController", func() {
 				BeforeEach(assertResourceCreation(connection))
 				AfterEach(assertResourceDeletion(connection))
 
-				It("should add jdbc-url to the ConfigMap for service binding", func() {
+				It("should not add jdbc-url to the Secret for service binding", func() {
 					By("checking the status of the Connection")
 					conn := &rdsdbaasv1alpha1.RDSConnection{
 						ObjectMeta: metav1.ObjectMeta{
@@ -669,7 +669,7 @@ var _ = Describe("RDSConnectionController", func() {
 						return true
 					}, timeout).Should(BeTrue())
 
-					By("checking the ConfigMap of the Connection")
+					By("checking the Secret of the Connection")
 					secret := &v1.Secret{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      conn.Status.Binding.Name,
@@ -684,9 +684,8 @@ var _ = Describe("RDSConnectionController", func() {
 					password, passwordOk := secret.Data["password"]
 					Expect(passwordOk).Should(BeTrue())
 					Expect(string(password)).Should(Equal("testpassword"))
-					ju, juOk := secret.Data["jdbc-url"]
-					Expect(juOk).Should(BeTrue())
-					Expect(string(ju)).Should(Equal("jdbc:oracle:thin:@address-oracle-connection-controller:9000/ORCL"))
+					_, juOk := secret.Data["jdbc-url"]
+					Expect(juOk).Should(BeFalse())
 					t, typeOk := secret.Data["type"]
 					Expect(typeOk).Should(BeTrue())
 					Expect(string(t)).Should(Equal("oracle"))
@@ -738,7 +737,7 @@ var _ = Describe("RDSConnectionController", func() {
 				BeforeEach(assertResourceCreation(connection))
 				AfterEach(assertResourceDeletion(connection))
 
-				It("should add jdbc-url to the ConfigMap for service binding", func() {
+				It("should not add jdbc-url to the Secret for service binding", func() {
 					By("checking the status of the Connection")
 					conn := &rdsdbaasv1alpha1.RDSConnection{
 						ObjectMeta: metav1.ObjectMeta{
@@ -759,7 +758,7 @@ var _ = Describe("RDSConnectionController", func() {
 						return true
 					}, timeout).Should(BeTrue())
 
-					By("checking the ConfigMap of the Connection")
+					By("checking the Secret of the Connection")
 					secret := &v1.Secret{
 						ObjectMeta: metav1.ObjectMeta{
 							Name:      conn.Status.Binding.Name,
@@ -774,9 +773,8 @@ var _ = Describe("RDSConnectionController", func() {
 					password, passwordOk := secret.Data["password"]
 					Expect(passwordOk).Should(BeTrue())
 					Expect(string(password)).Should(Equal("testpassword"))
-					ju, juOk := secret.Data["jdbc-url"]
-					Expect(juOk).Should(BeTrue())
-					Expect(string(ju)).Should(Equal("jdbc:sqlserver://address-sqlserver-connection-controller:9000;databaseName=master"))
+					_, juOk := secret.Data["jdbc-url"]
+					Expect(juOk).Should(BeFalse())
 					t, typeOk := secret.Data["type"]
 					Expect(typeOk).Should(BeTrue())
 					Expect(string(t)).Should(Equal("sqlserver"))