From 27141905686c859f739ab031229f7842cbe64a0d Mon Sep 17 00:00:00 2001 From: Richard87 Date: Wed, 13 Mar 2024 10:54:38 +0100 Subject: [PATCH 1/3] Bugfix for sql dsn --- radixconfig.tpl.yaml | 9 +++------ radixconfig.yaml | 9 +++------ repository/gorm_repository.go | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/radixconfig.tpl.yaml b/radixconfig.tpl.yaml index d4a5e6b..875bc0d 100644 --- a/radixconfig.tpl.yaml +++ b/radixconfig.tpl.yaml @@ -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 @@ -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 diff --git a/radixconfig.yaml b/radixconfig.yaml index be22ada..f3fd4de 100644 --- a/radixconfig.yaml +++ b/radixconfig.yaml @@ -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 @@ -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 diff --git a/repository/gorm_repository.go b/repository/gorm_repository.go index 0df5e6a..9bb5cdd 100644 --- a/repository/gorm_repository.go +++ b/repository/gorm_repository.go @@ -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 } From 62e43d87ff1729dae51bc194861957a1c9a945be Mon Sep 17 00:00:00 2001 From: Richard87 Date: Wed, 13 Mar 2024 11:01:12 +0100 Subject: [PATCH 2/3] Bugfix for sql dsn update c2 radixconfig --- radixconfig.c2.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/radixconfig.c2.yaml b/radixconfig.c2.yaml index 3c79ca3..176ddfd 100644 --- a/radixconfig.c2.yaml +++ b/radixconfig.c2.yaml @@ -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 @@ -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 From 7e8146384e03834995c5af0659f3970f3b386d69 Mon Sep 17 00:00:00 2001 From: Richard87 Date: Wed, 13 Mar 2024 11:02:59 +0100 Subject: [PATCH 3/3] Bugfix for sql dsn update radixconfig --- radixconfig.dev.yaml | 9 +++------ radixconfig.platform.yaml | 9 +++------ radixconfig.playground.yaml | 9 +++------ 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/radixconfig.dev.yaml b/radixconfig.dev.yaml index d2bd84c..7612a3a 100644 --- a/radixconfig.dev.yaml +++ b/radixconfig.dev.yaml @@ -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 @@ -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 diff --git a/radixconfig.platform.yaml b/radixconfig.platform.yaml index a5550f3..ecd9a1e 100644 --- a/radixconfig.platform.yaml +++ b/radixconfig.platform.yaml @@ -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 @@ -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 diff --git a/radixconfig.playground.yaml b/radixconfig.playground.yaml index 9721760..678b1fd 100644 --- a/radixconfig.playground.yaml +++ b/radixconfig.playground.yaml @@ -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 @@ -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