From bc27c79e45cf5ad22298880dc3072ba910565a81 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Thu, 28 Nov 2024 10:49:43 +0100
Subject: [PATCH] chore: rename to `google-cloudsql` Signed-off-by: blam
 <ben@blam.sh>

Signed-off-by: blam <ben@blam.sh>
---
 .changeset/pink-pets-jump.md                                | 2 +-
 .../src/entrypoints/database/DatabaseManager.ts             | 2 +-
 .../src/entrypoints/database/connectors/postgres.test.ts    | 6 +++---
 .../src/entrypoints/database/connectors/postgres.ts         | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.changeset/pink-pets-jump.md b/.changeset/pink-pets-jump.md
index 1d65169349..eb01eb27e1 100644
--- a/.changeset/pink-pets-jump.md
+++ b/.changeset/pink-pets-jump.md
@@ -2,4 +2,4 @@
 '@backstage/backend-defaults': patch
 ---
 
-Support `client: pg+google-cloud-sql` in database client for usage with `@google-cloud/cloud-sql-connector` and `iam` auth
+Support `client: pg+google-cloudsql` in database client for usage with `@google-cloud/cloud-sql-connector` and `iam` auth
diff --git a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
index 4ea66de2cc..d94b462794 100644
--- a/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
+++ b/packages/backend-defaults/src/entrypoints/database/DatabaseManager.ts
@@ -252,7 +252,7 @@ export class DatabaseManager {
         databaseConfig,
         {
           pg: new PgConnector(databaseConfig, prefix),
-          'pg+cloudsql': new PgConnector(databaseConfig, prefix),
+          'pg+google-cloudsql': new PgConnector(databaseConfig, prefix),
           sqlite3: new Sqlite3Connector(databaseConfig),
           'better-sqlite3': new Sqlite3Connector(databaseConfig),
           mysql: new MysqlConnector(databaseConfig, prefix),
diff --git a/packages/backend-defaults/src/entrypoints/database/connectors/postgres.test.ts b/packages/backend-defaults/src/entrypoints/database/connectors/postgres.test.ts
index 55568bc816..9d820510fd 100644
--- a/packages/backend-defaults/src/entrypoints/database/connectors/postgres.test.ts
+++ b/packages/backend-defaults/src/entrypoints/database/connectors/postgres.test.ts
@@ -138,14 +138,14 @@ describe('postgres', () => {
       });
     });
 
-    it('uses the correct config when using pg+google-cloud-sql', async () => {
+    it('uses the correct config when using pg+google-cloudsql', async () => {
       const mockConnectionString = createMockConnectionString();
       const mockConnection = createMockConnection();
 
       expect(
         await buildPgDatabaseConfig(
           new ConfigReader({
-            client: 'pg+google-cloud-sql',
+            client: 'pg+google-cloudsql',
             connection: mockConnectionString,
             instanceConnectionName: 'project:region:instance',
           }),
@@ -177,7 +177,7 @@ describe('postgres', () => {
       expect(
         await buildPgDatabaseConfig(
           new ConfigReader({
-            client: 'pg+google-cloud-sql',
+            client: 'pg+google-cloudsql',
             connection: mockConnectionString,
             instanceConnectionName: 'project:region:instance',
           }),
diff --git a/packages/backend-defaults/src/entrypoints/database/connectors/postgres.ts b/packages/backend-defaults/src/entrypoints/database/connectors/postgres.ts
index c81d352b74..a7cb173972 100644
--- a/packages/backend-defaults/src/entrypoints/database/connectors/postgres.ts
+++ b/packages/backend-defaults/src/entrypoints/database/connectors/postgres.ts
@@ -77,7 +77,7 @@ export async function buildPgDatabaseConfig(
     overrides,
   );
 
-  if (config.client === 'pg+google-cloud-sql') {
+  if (config.client === 'pg+google-cloudsql') {
     const {
       Connector: CloudSqlConnector,
       IpAddressTypes,