From c055df3d4096de9d0e4985d295d56eae97a346b9 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Fri, 29 Apr 2022 10:42:07 -0400
Subject: [PATCH 1/3] fix: fix native image tests

---
 google-cloud-compute/pom.xml                             | 4 ++++
 .../resources/META-INF/native-image/reflect-config.json  | 7 +++++++
 .../resources/META-INF/native-image/resource-config.json | 9 +++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 google-cloud-compute/src/main/resources/META-INF/native-image/reflect-config.json
 create mode 100644 google-cloud-compute/src/main/resources/META-INF/native-image/resource-config.json

diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml
index 46ef80bba..4c4e2e1fe 100644
--- a/google-cloud-compute/pom.xml
+++ b/google-cloud-compute/pom.xml
@@ -35,6 +35,10 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.api</groupId>
+      <artifactId>gax-grpc</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-httpjson</artifactId>
diff --git a/google-cloud-compute/src/main/resources/META-INF/native-image/reflect-config.json b/google-cloud-compute/src/main/resources/META-INF/native-image/reflect-config.json
new file mode 100644
index 000000000..04340dceb
--- /dev/null
+++ b/google-cloud-compute/src/main/resources/META-INF/native-image/reflect-config.json
@@ -0,0 +1,7 @@
+[
+  {
+  "name":"com.google.api.client.json.GenericJson",
+  "allDeclaredFields":true,
+  "methods":[{"name":"<init>","parameterTypes":[] }]
+}
+]
\ No newline at end of file
diff --git a/google-cloud-compute/src/main/resources/META-INF/native-image/resource-config.json b/google-cloud-compute/src/main/resources/META-INF/native-image/resource-config.json
new file mode 100644
index 000000000..69a8c17d9
--- /dev/null
+++ b/google-cloud-compute/src/main/resources/META-INF/native-image/resource-config.json
@@ -0,0 +1,9 @@
+{
+  "resources":{
+  "includes":[
+    {
+      "pattern":"\\Qdependencies.properties\\E"
+    }
+  ]},
+  "bundles":[]
+}

From b97b330b15151ddb761e1a4762ce679513184c80 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Fri, 29 Apr 2022 15:00:17 -0400
Subject: [PATCH 2/3] remove redundant configurations

---
 .../resources/META-INF/native-image/reflect-config.json  | 7 -------
 .../resources/META-INF/native-image/resource-config.json | 9 ---------
 2 files changed, 16 deletions(-)
 delete mode 100644 google-cloud-compute/src/main/resources/META-INF/native-image/reflect-config.json
 delete mode 100644 google-cloud-compute/src/main/resources/META-INF/native-image/resource-config.json

diff --git a/google-cloud-compute/src/main/resources/META-INF/native-image/reflect-config.json b/google-cloud-compute/src/main/resources/META-INF/native-image/reflect-config.json
deleted file mode 100644
index 04340dceb..000000000
--- a/google-cloud-compute/src/main/resources/META-INF/native-image/reflect-config.json
+++ /dev/null
@@ -1,7 +0,0 @@
-[
-  {
-  "name":"com.google.api.client.json.GenericJson",
-  "allDeclaredFields":true,
-  "methods":[{"name":"<init>","parameterTypes":[] }]
-}
-]
\ No newline at end of file
diff --git a/google-cloud-compute/src/main/resources/META-INF/native-image/resource-config.json b/google-cloud-compute/src/main/resources/META-INF/native-image/resource-config.json
deleted file mode 100644
index 69a8c17d9..000000000
--- a/google-cloud-compute/src/main/resources/META-INF/native-image/resource-config.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "resources":{
-  "includes":[
-    {
-      "pattern":"\\Qdependencies.properties\\E"
-    }
-  ]},
-  "bundles":[]
-}

From 3276504e4c7fc8a116763ea41fdb4f2ac815ebf8 Mon Sep 17 00:00:00 2001
From: Mridula Peddada <mpeddada@google.com>
Date: Fri, 29 Apr 2022 15:14:26 -0400
Subject: [PATCH 3/3] add source code comment; fix dep issue

---
 google-cloud-compute/pom.xml | 4 ++++
 pom.xml                      | 1 +
 2 files changed, 5 insertions(+)

diff --git a/google-cloud-compute/pom.xml b/google-cloud-compute/pom.xml
index 4c4e2e1fe..a7a177170 100644
--- a/google-cloud-compute/pom.xml
+++ b/google-cloud-compute/pom.xml
@@ -35,10 +35,14 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
     </dependency>
+
+    <!-- gax-grpc brings in Protobuf reflection configurations which are needed
+    for native image compilation. -->
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-grpc</artifactId>
     </dependency>
+
     <dependency>
       <groupId>com.google.api</groupId>
       <artifactId>gax-httpjson</artifactId>
diff --git a/pom.xml b/pom.xml
index 2e74d3f81..01281f884 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,6 +96,7 @@
             <ignoredUnusedDeclaredDependencies>
               <ignoredUnusedDeclaredDependency>org.objenesis:objenesis</ignoredUnusedDeclaredDependency>
               <ignoredUnusedDeclaredDependency>javax.annotation:javax.annotation-api</ignoredUnusedDeclaredDependency>
+              <ignoredUnusedDeclaredDependency>com.google.api:gax-grpc</ignoredUnusedDeclaredDependency>
             </ignoredUnusedDeclaredDependencies>
           </configuration>
         </plugin>