Merge pull request #26 from ConductorOne/jirwin/user-password-config

Allow setting the username and password separately from the DSN

Author: jirwin

pkg/bsql/config.go

@@ -16,7 +16,9 @@ type Config struct {
 }
 
 type DatabaseConfig struct {
-	DSN string `yaml:"dsn" json:"dsn"` // DSN connection string
+	DSN      string `yaml:"dsn" json:"dsn"` // DSN connection string
+	User     string `yaml:"user" json:"user"`
+	Password string `yaml:"password" json:"password"`
 }
 
 type ResourceType struct {

pkg/connector/connector.go

@@ -83,7 +83,7 @@ func New(ctx context.Context, configFilePath string) (*Connector, error) {
 }
 
 func newConnector(ctx context.Context, c *bsql.Config) (*Connector, error) {
-	db, dbEngine, err := database.Connect(ctx, c.Connect.DSN)
+	db, dbEngine, err := database.Connect(ctx, c.Connect.DSN, c.Connect.User, c.Connect.Password)
 	if err != nil {
 		return nil, err
 	}

pkg/database/database.go

@@ -27,7 +27,7 @@ const (
 	Oracle
 )
 
-func updateDSNFromEnv(ctx context.Context, dsn string) (string, error) {
+func updateFromEnv(ctx context.Context, dsn string) (string, error) {
 	var err error
 
 	result := DSNREnvRegex.ReplaceAllStringFunc(dsn, func(match string) string {
@@ -47,8 +47,8 @@ func updateDSNFromEnv(ctx context.Context, dsn string) (string, error) {
 	return result, nil
 }
 
-func Connect(ctx context.Context, dsn string) (*sql.DB, DbEngine, error) {
-	populatedDSN, err := updateDSNFromEnv(ctx, dsn)
+func Connect(ctx context.Context, dsn string, user string, password string) (*sql.DB, DbEngine, error) {
+	populatedDSN, err := updateFromEnv(ctx, dsn)
 	if err != nil {
 		return nil, Unknown, err
 	}
@@ -58,23 +58,41 @@ func Connect(ctx context.Context, dsn string) (*sql.DB, DbEngine, error) {
 		return nil, Unknown, err
 	}
 
+	if parsedDsn.User == nil {
+		if user == "" || password == "" {
+			return nil, Unknown, errors.New("user and password must be set in DSN or in the configuration")
+		}
+
+		populatedUser, err := updateFromEnv(ctx, user)
+		if err != nil {
+			return nil, Unknown, err
+		}
+
+		populatedPassword, err := updateFromEnv(ctx, password)
+		if err != nil {
+			return nil, Unknown, err
+		}
+
+		parsedDsn.User = url.UserPassword(populatedUser, populatedPassword)
+	}
+
 	switch parsedDsn.Scheme {
 	case "mysql":
-		db, err := mysql.Connect(ctx, populatedDSN)
+		db, err := mysql.Connect(ctx, parsedDsn.String())
 		if err != nil {
 			return nil, Unknown, err
 		}
 		return db, MySQL, nil
 
 	case "oracle":
-		db, err := oracle.Connect(ctx, populatedDSN)
+		db, err := oracle.Connect(ctx, parsedDsn.String())
 		if err != nil {
 			return nil, Unknown, err
 		}
 		return db, Oracle, nil
 
 	case "sqlserver":
-		db, err := sqlserver.Connect(ctx, populatedDSN)
+		db, err := sqlserver.Connect(ctx, parsedDsn.String())
 		if err != nil {
 			return nil, Unknown, err
 		}

pkg/database/database_test.go

@@ -68,13 +68,13 @@ func Test_updateDSNFromEnv(t *testing.T) {
 					t.Fatalf("failed to set env var %s: %v", k, err)
 				}
 			}
-			got, err := updateDSNFromEnv(tt.args.ctx, tt.args.dsn)
+			got, err := updateFromEnv(tt.args.ctx, tt.args.dsn)
 			if (err != nil) != tt.wantErr {
-				t.Errorf("updateDSNFromEnv() error = %v, wantErr %v", err, tt.wantErr)
+				t.Errorf("updateFromEnv() error = %v, wantErr %v", err, tt.wantErr)
 				return
 			}
 			if got != tt.want {
-				t.Errorf("updateDSNFromEnv() got = %v, want %v", got, tt.want)
+				t.Errorf("updateFromEnv() got = %v, want %v", got, tt.want)
 			}
 			for k := range tt.env {
 				if err := os.Unsetenv(k); err != nil {