From a28998e40f1be07cac83e3847094119209741dcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Weisbarth?= Date: Fri, 16 Aug 2024 18:13:40 +0200 Subject: [PATCH] Work in review-suggestions; --- .../cred_helper/storedprocedure_cred_helper.go | 2 +- src/autoscaler/db/helper_test.go | 2 +- src/autoscaler/db/sqldb/storedprocedure_sqldb.go | 2 +- src/changeloglockcleaner/sqldb/helper_test.go | 12 ++++++------ 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/autoscaler/cred_helper/storedprocedure_cred_helper.go b/src/autoscaler/cred_helper/storedprocedure_cred_helper.go index e487b11921..ac945e6095 100644 --- a/src/autoscaler/cred_helper/storedprocedure_cred_helper.go +++ b/src/autoscaler/cred_helper/storedprocedure_cred_helper.go @@ -39,7 +39,7 @@ func (c *storedProcedureCredentials) Create(ctx context.Context, appId string, u var count int var cred *models.Credential - // ⛔ Be aware that the subesquent line is a fatal programming error. We have never written into + // ⛔ Be aware that the subsequent line is a fatal programming error. We have never written into // that table the correct binding-id and instance-id. So this table has been filled since the // going-live of commit “a50665290878eaf9c21c0ae368f9d0100c185fdc” with lines where each colum // actually contains the app-id. diff --git a/src/autoscaler/db/helper_test.go b/src/autoscaler/db/helper_test.go index a254e0ab08..8d11705d80 100644 --- a/src/autoscaler/db/helper_test.go +++ b/src/autoscaler/db/helper_test.go @@ -44,7 +44,7 @@ var _ = Describe("Helper", func() { Expect(database).To(Equal(&Database{ DriverName: "mysql", DataSourceName: "root@tcp(localhost:3306)/autoscaler?parseTime=true", - OTELAttribute: semconv.DBSystemMySQL, + OTELAttribute: semconv.DBSystemMySQL, })) }) diff --git a/src/autoscaler/db/sqldb/storedprocedure_sqldb.go b/src/autoscaler/db/sqldb/storedprocedure_sqldb.go index 86c8c66acc..e7cdd93c0f 100644 --- a/src/autoscaler/db/sqldb/storedprocedure_sqldb.go +++ b/src/autoscaler/db/sqldb/storedprocedure_sqldb.go @@ -115,7 +115,7 @@ func (sdb *StoredProcedureSQLDb) ValidateCredentials(ctx context.Context, creds // “cred_helper/storedprocedure_cred_helper.go” – we store in each column just the corresponding // app_id. To “mark that”, we use here the `as app_id`-renaming. query := fmt.Sprintf( - "SELECT instance_id as app_id, binding_id from %s($1,$2) WHERE app_id = $3", + "SELECT instance_id as app_id, binding_id from %s($1,$2) WHERE binding_id = $3", procedureIdentifier.Sanitize()) err := sdb.sqldb.QueryRow(ctx, query, creds.Username, creds.Password, appId). Scan(&credOptions.InstanceId, &credOptions.BindingId) diff --git a/src/changeloglockcleaner/sqldb/helper_test.go b/src/changeloglockcleaner/sqldb/helper_test.go index d1b780c111..85819d6361 100644 --- a/src/changeloglockcleaner/sqldb/helper_test.go +++ b/src/changeloglockcleaner/sqldb/helper_test.go @@ -26,8 +26,8 @@ var _ = Describe("Helper", func() { It("returns mysql database object", func() { Expect(err).NotTo(HaveOccurred()) Expect(database).To(Equal(&Database{ - DriverName: "mysql", - DataSourceName: "root@tcp(localhost:3306)/autoscaler?parseTime=true&tls=preferred", + DriverName: "mysql", + DataSourceName: "root@tcp(localhost:3306)/autoscaler?parseTime=true&tls=preferred", })) }) }) @@ -39,8 +39,8 @@ var _ = Describe("Helper", func() { It("returns mysql database object", func() { Expect(err).NotTo(HaveOccurred()) Expect(database).To(Equal(&Database{ - DriverName: "mysql", - DataSourceName: "root@tcp(localhost:3306)/autoscaler?parseTime=true", + DriverName: "mysql", + DataSourceName: "root@tcp(localhost:3306)/autoscaler?parseTime=true", })) }) @@ -63,8 +63,8 @@ var _ = Describe("Helper", func() { It("returns postgres database object", func() { Expect(err).NotTo(HaveOccurred()) Expect(database).To(Equal(&Database{ - DriverName: "pgx", - DataSourceName: "postgres://postgres:password@localhost:5432/autoscaler?sslmode=disable", + DriverName: "pgx", + DataSourceName: "postgres://postgres:password@localhost:5432/autoscaler?sslmode=disable", })) }) })