From 27e6b3d31b5b44e9807825a2f5fd52557e2d5c57 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Thu, 5 May 2022 10:27:44 -0400
Subject: [PATCH 1/2] use graal-sdk 21.3.2 to address CVE

---
 .cloudbuild/graal-build.yaml | 2 +-
 pom.xml                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.cloudbuild/graal-build.yaml b/.cloudbuild/graal-build.yaml
index c44a6e3c..fb3894c1 100644
--- a/.cloudbuild/graal-build.yaml
+++ b/.cloudbuild/graal-build.yaml
@@ -12,7 +12,7 @@ steps:
         fi
 
   # Build the sample images
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.2
     entrypoint: bash
     args: ['./.cloudbuild/graal-build-script.sh']
 
diff --git a/pom.xml b/pom.xml
index 9c62d684..aa18c0db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
   <properties>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
-    <graalvm.version>22.0.0.2</graalvm.version>
+    <graalvm.version>21.3.2</graalvm.version>
     <native.maven.plugin.version>0.9.11</native.maven.plugin.version>
     <grpc.netty.version>1.46.0</grpc.netty.version>
   </properties>

From 57fb10c522322f68c61253c5e348afb6866f0bb7 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Thu, 5 May 2022 10:48:07 -0400
Subject: [PATCH 2/2] use correct base image name

---
 .cloudbuild/graal-build.yaml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.cloudbuild/graal-build.yaml b/.cloudbuild/graal-build.yaml
index fb3894c1..2e3bb8dc 100644
--- a/.cloudbuild/graal-build.yaml
+++ b/.cloudbuild/graal-build.yaml
@@ -12,7 +12,7 @@ steps:
         fi
 
   # Build the sample images
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.2
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     entrypoint: bash
     args: ['./.cloudbuild/graal-build-script.sh']
 
@@ -48,56 +48,56 @@ steps:
     waitFor: [spanner-emulator, firestore-emulator, datastore-emulator, bigtable-emulator]
 
   # Run the tests
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/bigquery-sample/target/bigquery-sample' ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [
         './native-image-samples/native-image-samples-client-library/cloud-sql-sample/target/cloud-sql-sample',
         '-Dinstance=cloud-graalvm-support-ci:us-east1:test-instance',
         '-Dpassword=root'
     ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [
         './native-image-samples/native-image-samples-client-library/cloud-sql-postgres-sample/target/cloud-sql-postgres-sample',
         '-Dinstance=cloud-graalvm-support-ci:us-central1:test-postgres',
     ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/pubsub-sample/target/pubsub-sample' ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/storage-sample/target/storage-sample' ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/logging-sample/target/logging-sample' ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/secretmanager-sample/target/secretmanager-sample' ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/tasks-sample/target/tasks-sample' ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/trace-sample/target/trace-sample' ]
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/firestore-sample/target/firestore-sample' ]
     env:
       - 'FIRESTORE_EMULATOR_HOST=firestore-emulator:9010'
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/spanner-sample/target/spanner-sample' ]
     env:
       - 'SPANNER_EMULATOR_HOST=spanner-emulator:9010'
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/bigtable-sample/target/bigtable-sample' ]
     env:
       - 'BIGTABLE_EMULATOR_HOST=bigtable-emulator:9010'
 
-  - name: ghcr.io/graalvm/graalvm-ce:java11-21.3.0
+  - name: ghcr.io/graalvm/graalvm-ce:ol7-java11-21.3.2
     args: [ './native-image-samples/native-image-samples-client-library/datastore-sample/target/datastore-sample' ]
     env:
       - 'DATASTORE_EMULATOR_HOST=http://datastore-emulator:9010'