Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix for sql dsn #22

Merged
merged 3 commits into from
Mar 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions radixconfig.c2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ spec:
TOKEN_AUDIENCE: "6dae42f8-4368-4678-94ff-3960e28e3630"
TOKEN_ISSUER: https://sts.windows.net/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/
SQL_USE_FEDERATED: "true"
PRETTY_PRINT: "false"
LOG_LEVEL: INFO
GIN_MODE: release
secrets:
- SQL_SERVER
- SQL_DATABASE
Expand All @@ -42,11 +45,5 @@ spec:
environmentConfig:
- environment: qa
replicas: 1
variables:
LOG_LEVEL: INFO
GIN_MODE: debug
- environment: prod
replicas: 2
variables:
LOG_LEVEL: INFO
GIN_MODE: release
9 changes: 3 additions & 6 deletions radixconfig.dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ spec:
TOKEN_AUDIENCE: "6dae42f8-4368-4678-94ff-3960e28e3630"
TOKEN_ISSUER: https://sts.windows.net/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/
SQL_USE_FEDERATED: "true"
PRETTY_PRINT: "false"
LOG_LEVEL: INFO
GIN_MODE: release
secrets:
- SQL_SERVER
- SQL_DATABASE
Expand All @@ -42,11 +45,5 @@ spec:
environmentConfig:
- environment: qa
replicas: 1
variables:
LOG_LEVEL: INFO
GIN_MODE: debug
- environment: prod
replicas: 2
variables:
LOG_LEVEL: INFO
GIN_MODE: release
9 changes: 3 additions & 6 deletions radixconfig.platform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ spec:
TOKEN_AUDIENCE: "6dae42f8-4368-4678-94ff-3960e28e3630"
TOKEN_ISSUER: https://sts.windows.net/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/
SQL_USE_FEDERATED: "true"
PRETTY_PRINT: "false"
LOG_LEVEL: INFO
GIN_MODE: release
secrets:
- SQL_SERVER
- SQL_DATABASE
Expand All @@ -42,11 +45,5 @@ spec:
environmentConfig:
- environment: qa
replicas: 1
variables:
LOG_LEVEL: INFO
GIN_MODE: debug
- environment: prod
replicas: 2
variables:
LOG_LEVEL: INFO
GIN_MODE: release
9 changes: 3 additions & 6 deletions radixconfig.playground.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ spec:
TOKEN_AUDIENCE: "6dae42f8-4368-4678-94ff-3960e28e3630"
TOKEN_ISSUER: https://sts.windows.net/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/
SQL_USE_FEDERATED: "true"
PRETTY_PRINT: "false"
LOG_LEVEL: INFO
GIN_MODE: release
secrets:
- SQL_SERVER
- SQL_DATABASE
Expand All @@ -42,11 +45,5 @@ spec:
environmentConfig:
- environment: qa
replicas: 1
variables:
LOG_LEVEL: INFO
GIN_MODE: debug
- environment: prod
replicas: 2
variables:
LOG_LEVEL: INFO
GIN_MODE: release
9 changes: 3 additions & 6 deletions radixconfig.tpl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ spec:
TOKEN_AUDIENCE: "6dae42f8-4368-4678-94ff-3960e28e3630"
TOKEN_ISSUER: https://sts.windows.net/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/
SQL_USE_FEDERATED: "true"
PRETTY_PRINT: "false"
LOG_LEVEL: INFO
GIN_MODE: release
secrets:
- SQL_SERVER
- SQL_DATABASE
Expand All @@ -42,11 +45,5 @@ spec:
environmentConfig:
- environment: qa
replicas: 1
variables:
LOG_LEVEL: INFO
GIN_MODE: debug
- environment: prod
replicas: 2
variables:
LOG_LEVEL: INFO
GIN_MODE: release
9 changes: 3 additions & 6 deletions radixconfig.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ spec:
TOKEN_AUDIENCE: "6dae42f8-4368-4678-94ff-3960e28e3630"
TOKEN_ISSUER: https://sts.windows.net/3aa4a235-b6e2-48d5-9195-7fcf05b459b0/
SQL_USE_FEDERATED: "false"
PRETTY_PRINT: "false"
LOG_LEVEL: INFO
GIN_MODE: release
secrets:
- SQL_SERVER
- SQL_DATABASE
Expand All @@ -42,11 +45,5 @@ spec:
environmentConfig:
- environment: qa
replicas: 1
variables:
LOG_LEVEL: INFO
GIN_MODE: debug
- environment: prod
replicas: 2
variables:
LOG_LEVEL: INFO
GIN_MODE: release
2 changes: 1 addition & 1 deletion repository/gorm_repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func GetFederatedSqlServerDsn(server, database string) string {
}

func GetSqlServerDsn(server, database, userID, password string) string {
dsn := fmt.Sprintf("server=%s;database=%s;user id=%s;password=%s", server, userID, password, database)
dsn := fmt.Sprintf("server=%s;database=%s;user id=%s;password=%s", server, database, userID, password)
return dsn
}

Expand Down
Loading