From 711b987c22b55e66e5679055d24db2b850eb3db9 Mon Sep 17 00:00:00 2001
From: Katie McLaughlin <katie@glasnt.com>
Date: Wed, 6 Nov 2024 09:12:49 +1100
Subject: [PATCH] Update Cloud SQL samples to Artifact Registry

---
 sql-private-pool/cloudbuild.yaml | 8 +++++---
 sql-proxy/cloudbuild.yaml        | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/sql-private-pool/cloudbuild.yaml b/sql-private-pool/cloudbuild.yaml
index c09389fe..6e45216b 100644
--- a/sql-private-pool/cloudbuild.yaml
+++ b/sql-private-pool/cloudbuild.yaml
@@ -38,15 +38,17 @@ steps:
 options:
   pool:
     name: projects/$PROJECT_ID/locations/us-central1/workerPools/private-pool
-  dynamic_substitutions: true
+  dynamicSubstitutions: true
 
 substitutions:
   _DATABASE_PASSWORD_KEY: database_password
   _DATABASE_TYPE: postgres
-  _IMAGE_NAME: gcr.io/${PROJECT_ID}/sample-private-pool
+  _AR_REPO_REGION: us-central1
+  _AR_REPO_NAME: my-docker-repo
+  _IMAGE_NAME: ${_REGION}-docker.pkg.dev/${PROJECT_ID}/${_AR_REPO_NAME}/sample-private-pool
 
 availableSecrets:
   secretManager:
     - versionName: projects/$PROJECT_ID/secrets/${_DATABASE_PASSWORD_KEY}/versions/latest
       env: DATABASE_PASS
-# [END cloudbuild_sql_private_pool]
\ No newline at end of file
+# [END cloudbuild_sql_private_pool]
diff --git a/sql-proxy/cloudbuild.yaml b/sql-proxy/cloudbuild.yaml
index f908bbda..8c10c8b7 100644
--- a/sql-proxy/cloudbuild.yaml
+++ b/sql-proxy/cloudbuild.yaml
@@ -78,7 +78,7 @@ steps:
   # [END cloudbuild_sql_proxy_socket]
 
 options:
-  dynamic_substitutions: true
+  dynamicSubstitutions: true
 
 substitutions:
   _DATABASE_USER: myuser
@@ -87,7 +87,9 @@ substitutions:
   _DATABASE_PORT: '5432'
   _DATABASE_TYPE: postgres
   _DATABASE_PASSWORD_KEY: database_password
-  _IMAGE_NAME: gcr.io/${PROJECT_ID}/sample-sql-proxy
+  _AR_REPO_REGION: us-central1
+  _AR_REPO_NAME: my-docker-repo
+  _IMAGE_NAME: ${_REGION}-docker.pkg.dev/${PROJECT_ID}/${_AR_REPO_NAME}/sample-sql-proxy
 
 availableSecrets:
   secretManager: