From 2e5ef772271c47de4183ba8b7e67fd2550e28462 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Thu, 12 Sep 2024 14:35:39 -0400
Subject: [PATCH 1/2] chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime

---
 .../clirr-ignored-differences.xml             | 62 +++++++++++++++++
 .../clirr-ignored-differences.xml             | 62 +++++++++++++++++
 .../clirr-ignored-differences.xml             | 62 +++++++++++++++++
 .../clirr-ignored-differences.xml             | 68 +++++++++++++++++++
 4 files changed, 254 insertions(+)

diff --git a/proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml b/proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
index c1e8fc9b84a..3799fb341ac 100644
--- a/proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-spanner-admin-database-v1/clirr-ignored-differences.xml
@@ -16,4 +16,66 @@
     <className>com/google/spanner/admin/database/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+
+  <!-- The following 7006 exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* getDefaultInstanceForType()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* addRepeatedField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* clear()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* clearField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* clearOneof(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* clone()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* mergeUnknownFields(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* setField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* setRepeatedField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/database/v1/**</className>
+    <method>* setUnknownFields(*)</method>
+    <to>**</to>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml b/proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml
index b24b9e881c1..fa9181b755b 100644
--- a/proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-spanner-admin-instance-v1/clirr-ignored-differences.xml
@@ -16,4 +16,66 @@
     <className>com/google/spanner/admin/instance/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+
+  <!-- The following 7006 exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* getDefaultInstanceForType()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* addRepeatedField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* clear()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* clearField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* clearOneof(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* clone()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* mergeUnknownFields(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* setField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* setRepeatedField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/admin/instance/v1/**</className>
+    <method>* setUnknownFields(*)</method>
+    <to>**</to>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-spanner-executor-v1/clirr-ignored-differences.xml b/proto-google-cloud-spanner-executor-v1/clirr-ignored-differences.xml
index cfd1e566a20..c8787595be2 100644
--- a/proto-google-cloud-spanner-executor-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-spanner-executor-v1/clirr-ignored-differences.xml
@@ -36,4 +36,66 @@
     <differenceType>8001</differenceType>
     <className>com/google/spanner/executor/v1/SpannerExecutorProxyGrpc$SpannerExecutorProxyStub</className>
   </difference>
+
+  <!-- The following 7006 exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* getDefaultInstanceForType()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* addRepeatedField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* clear()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* clearField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* clearOneof(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* clone()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* mergeUnknownFields(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* setField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* setRepeatedField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/executor/v1/**</className>
+    <method>* setUnknownFields(*)</method>
+    <to>**</to>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml b/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
index f9ff2435339..62b5283e531 100644
--- a/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
@@ -16,4 +16,72 @@
     <className>com/google/spanner/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+
+  <!-- The following 7006 exemptions are related to Protobuf 4.27.4+ runtime upgrade -->
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* getDefaultInstanceForType()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* addRepeatedField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* clear()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* clear()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* clearField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* clearOneof(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* clone()</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* mergeUnknownFields(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* setField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* setRepeatedField(*)</method>
+    <to>**</to>
+  </difference>
+  <difference>
+    <differenceType>7006</differenceType>
+    <className>com/google/spanner/v1/**</className>
+    <method>* setUnknownFields(*)</method>
+    <to>**</to>
+  </difference>
 </differences>

From b0b153a566a48fb242d351c1889d55c82eb8c265 Mon Sep 17 00:00:00 2001
From: Lawrence Qiu <lawrenceqiu@google.com>
Date: Thu, 12 Sep 2024 14:36:36 -0400
Subject: [PATCH 2/2] chore: Add Clirr exemptions for Protobuf 4.27.4+ runtime

---
 proto-google-cloud-spanner-v1/clirr-ignored-differences.xml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml b/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
index 62b5283e531..89fd05b2e3c 100644
--- a/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-spanner-v1/clirr-ignored-differences.xml
@@ -36,12 +36,6 @@
     <method>* clear()</method>
     <to>**</to>
   </difference>
-  <difference>
-    <differenceType>7006</differenceType>
-    <className>com/google/spanner/v1/**</className>
-    <method>* clear()</method>
-    <to>**</to>
-  </difference>
   <difference>
     <differenceType>7006</differenceType>
     <className>com/google/spanner/v1/**</className>