feat: Change SqlHost to DSN

api/v1alpha1/fields.go

@@ -1,13 +1,5 @@
 package v1alpha1
 
-type SqlHostEndpoint struct {
-	// Host of the sql server. This can be either dns or ip
-	Host string `json:"host,omitempty"`
-
-	// Port to use when connecting to the sql server
-	Port int `json:"port,omitempty"`
-}
-
 type SqlCredentials struct {
 	// Username for the sql user
 	Username string `json:"username,omitempty"`

api/v1alpha1/sqlhost_types.go

@@ -26,10 +26,7 @@ type SqlHostSpec struct {
 	Engine EngineType `json:"engine"`
 
 	// Endpoint to manage
-	Endpoint SqlHostEndpoint `json:"endpoint"`
-
-	// Credentials to use when connecting to the endpoint
-	Credentials SqlCredentials `json:"credentials"`
+	DSN string `json:"dsn"`
 }
 
 // +kubebuilder:validation:Enum=Mysql

charts/sql-operator/crds/crds.yaml

@@ -252,34 +252,16 @@ spec:
           spec:
             description: SqlHostSpec defines the desired state of SqlHost
             properties:
-              credentials:
-                description: Credentials to use when connecting to the endpoint
-                properties:
-                  password:
-                    description: Password for the sql user
-                    type: string
-                  username:
-                    description: Username for the sql user
-                    type: string
-                type: object
-              endpoint:
+              dsn:
                 description: Endpoint to manage
-                properties:
-                  host:
-                    description: Host of the sql server. This can be either dns or ip
-                    type: string
-                  port:
-                    description: Port to use when connecting to the sql server
-                    type: integer
-                type: object
+                type: string
               engine:
                 description: Engine of the external endpoint (like Mysql)
                 enum:
                 - Mysql
                 type: string
             required:
-            - credentials
-            - endpoint
+            - dsn
             - engine
             type: object
           status:

config/crd/bases/stenic.io_sqlhosts.yaml

@@ -32,34 +32,16 @@ spec:
           spec:
             description: SqlHostSpec defines the desired state of SqlHost
             properties:
-              credentials:
-                description: Credentials to use when connecting to the endpoint
-                properties:
-                  password:
-                    description: Password for the sql user
-                    type: string
-                  username:
-                    description: Username for the sql user
-                    type: string
-                type: object
-              endpoint:
+              dsn:
                 description: Endpoint to manage
-                properties:
-                  host:
-                    description: Host of the sql server. This can be either dns or ip
-                    type: string
-                  port:
-                    description: Port to use when connecting to the sql server
-                    type: integer
-                type: object
+                type: string
               engine:
                 description: Engine of the external endpoint (like Mysql)
                 enum:
                 - Mysql
                 type: string
             required:
-            - credentials
-            - endpoint
+            - dsn
             - engine
             type: object
           status:

config/samples/_v1alpha1_sqlhost.yaml

@@ -4,9 +4,4 @@ metadata:
   name: sqlhost-sample
 spec:
   engine: Mysql
-  endpoint:
-    host: 192.168.23.82
-    port: 3306
-  credentials:
-    username: sqloperator
-    password: sqloperator
+  dsn: "sqloperator:sqloperator@tcp(192.168.23.82:3306)/"

controllers/suite_test.go

@@ -109,14 +109,7 @@ var _ = Describe("Sql-operator", func() {
 		},
 		Spec: v1alpha1.SqlHostSpec{
 			Engine: "Mysql",
-			Endpoint: steniciov1alpha1.SqlHostEndpoint{
-				Host: "127.0.0.1",
-				Port: 3306,
-			},
-			Credentials: steniciov1alpha1.SqlCredentials{
-				Username: "username",
-				Password: "password",
-			},
+			DSN:    "username:password@tcp(127.0.0.1:3306)/",
 		},
 	}
 

drivers/mysql.go

@@ -19,14 +19,7 @@ type MySqlDriver struct {
 }
 
 func (d *MySqlDriver) connect() (*sql.DB, error) {
-	dsn := fmt.Sprintf(
-		"%s:%s@tcp(%s:%d)/",
-		d.Host.Spec.Credentials.Username,
-		d.Host.Spec.Credentials.Password,
-		d.Host.Spec.Endpoint.Host,
-		d.Host.Spec.Endpoint.Port,
-	)
-	db, err := sql.Open("mysql", dsn)
+	db, err := sql.Open("mysql", d.Host.Spec.DSN)
 	if err == nil {
 		db.SetConnMaxLifetime(time.Minute * 1)
 		db.SetMaxIdleConns(0)

examples/sqlhost-mysql.yaml

@@ -4,9 +4,4 @@ metadata:
   name: sample-host
 spec:
   engine: Mysql
-  endpoint:
-    host: test-db-mariadb.sql-operator-testdb
-    port: 3306
-  credentials:
-    username: root
-    password: n0tS3cur3
+  dsn: "root:n0tS3cur3@tcp(test-db-mariadb.sql-operator-testdb:3306)/"