Merge branch 'main' into recycle_fixes

Author: igorbernstein2

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
-    - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@v1.85.0
+    - uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@google-cloud-shared-dependencies/v3.61.0
       if: env.SHOULD_RUN == 'true'
       with:
         image_tag: latest

README.md

@@ -49,7 +49,7 @@ If you are using Maven without the BOM, add this to your dependencies:
 If you are using Gradle 5.x or later, add this to your dependencies:
 
 ```Groovy
-implementation platform('com.google.cloud:libraries-bom:26.79.0')
+implementation platform('com.google.cloud:libraries-bom:26.80.0')
 
 implementation 'com.google.cloud:google-cloud-bigtable'
 ```

generation_config.yaml

@@ -1,6 +1,6 @@
-gapic_generator_version: 2.69.0
-googleapis_commitish: 9a832ccde3f3ca4d4e1c39593b1cbf9aa62a75b3
-libraries_bom_version: 26.79.0
+gapic_generator_version: 2.71.0
+googleapis_commitish: 939ba3bf8408af83f0f73ae35c76c4b11a8c8c8d
+libraries_bom_version: 26.80.0
 template_excludes:
   - .gitignore
   - .kokoro/presubmit/integration.cfg

google-cloud-bigtable/src/main/resources/META-INF/native-image/com.google.cloud.bigtable.admin.v2/reflect-config.json

@@ -1871,6 +1871,15 @@
     "allDeclaredClasses": true,
     "allPublicClasses": true
   },
+  {
+    "name": "com.google.bigtable.admin.v2.Instance$Edition",
+    "queryAllDeclaredConstructors": true,
+    "queryAllPublicConstructors": true,
+    "queryAllDeclaredMethods": true,
+    "allPublicMethods": true,
+    "allDeclaredClasses": true,
+    "allPublicClasses": true
+  },
   {
     "name": "com.google.bigtable.admin.v2.Instance$State",
     "queryAllDeclaredConstructors": true,

google-cloud-bigtable/src/test/java/com/google/cloud/bigtable/admin/v2/BaseBigtableInstanceAdminClientTest.java

@@ -475,6 +475,7 @@ public void updateInstanceTest() throws Exception {
     Assert.assertEquals(request.getDisplayName(), actualRequest.getDisplayName());
     Assert.assertEquals(request.getState(), actualRequest.getState());
     Assert.assertEquals(request.getType(), actualRequest.getType());
+    Assert.assertEquals(request.getEdition(), actualRequest.getEdition());
     Assert.assertEquals(request.getLabelsMap(), actualRequest.getLabelsMap());
     Assert.assertEquals(request.getCreateTime(), actualRequest.getCreateTime());
     Assert.assertEquals(request.getSatisfiesPzs(), actualRequest.getSatisfiesPzs());

proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java

@@ -4510,7 +4510,7 @@ public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting getSingleClu
    * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
    *
    * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-   *     google/bigtable/admin/v2/instance.proto;l=421
+   *     google/bigtable/admin/v2/instance.proto;l=448
    * @return Whether the priority field is set.
    */
   @java.lang.Deprecated
@@ -4531,7 +4531,7 @@ public boolean hasPriority() {
    * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
    *
    * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-   *     google/bigtable/admin/v2/instance.proto;l=421
+   *     google/bigtable/admin/v2/instance.proto;l=448
    * @return The enum numeric value on the wire for priority.
    */
   @java.lang.Deprecated
@@ -4555,7 +4555,7 @@ public int getPriorityValue() {
    * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
    *
    * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-   *     google/bigtable/admin/v2/instance.proto;l=421
+   *     google/bigtable/admin/v2/instance.proto;l=448
    * @return The priority.
    */
   @java.lang.Deprecated
@@ -6158,7 +6158,7 @@ public Builder clearSingleClusterRouting() {
      * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
      *
      * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-     *     google/bigtable/admin/v2/instance.proto;l=421
+     *     google/bigtable/admin/v2/instance.proto;l=448
      * @return Whether the priority field is set.
      */
     @java.lang.Override
@@ -6180,7 +6180,7 @@ public boolean hasPriority() {
      * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
      *
      * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-     *     google/bigtable/admin/v2/instance.proto;l=421
+     *     google/bigtable/admin/v2/instance.proto;l=448
      * @return The enum numeric value on the wire for priority.
      */
     @java.lang.Override
@@ -6205,7 +6205,7 @@ public int getPriorityValue() {
      * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
      *
      * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-     *     google/bigtable/admin/v2/instance.proto;l=421
+     *     google/bigtable/admin/v2/instance.proto;l=448
      * @param value The enum numeric value on the wire for priority to set.
      * @return This builder for chaining.
      */
@@ -6230,7 +6230,7 @@ public Builder setPriorityValue(int value) {
      * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
      *
      * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-     *     google/bigtable/admin/v2/instance.proto;l=421
+     *     google/bigtable/admin/v2/instance.proto;l=448
      * @return The priority.
      */
     @java.lang.Override
@@ -6260,7 +6260,7 @@ public com.google.bigtable.admin.v2.AppProfile.Priority getPriority() {
      * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
      *
      * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-     *     google/bigtable/admin/v2/instance.proto;l=421
+     *     google/bigtable/admin/v2/instance.proto;l=448
      * @param value The priority to set.
      * @return This builder for chaining.
      */
@@ -6288,7 +6288,7 @@ public Builder setPriority(com.google.bigtable.admin.v2.AppProfile.Priority valu
      * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
      *
      * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-     *     google/bigtable/admin/v2/instance.proto;l=421
+     *     google/bigtable/admin/v2/instance.proto;l=448
      * @return This builder for chaining.
      */
     @java.lang.Deprecated

proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfileOrBuilder.java

@@ -218,7 +218,7 @@ public interface AppProfileOrBuilder
    * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
    *
    * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-   *     google/bigtable/admin/v2/instance.proto;l=421
+   *     google/bigtable/admin/v2/instance.proto;l=448
    * @return Whether the priority field is set.
    */
   @java.lang.Deprecated
@@ -237,7 +237,7 @@ public interface AppProfileOrBuilder
    * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
    *
    * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-   *     google/bigtable/admin/v2/instance.proto;l=421
+   *     google/bigtable/admin/v2/instance.proto;l=448
    * @return The enum numeric value on the wire for priority.
    */
   @java.lang.Deprecated
@@ -256,7 +256,7 @@ public interface AppProfileOrBuilder
    * <code>.google.bigtable.admin.v2.AppProfile.Priority priority = 7 [deprecated = true];</code>
    *
    * @deprecated google.bigtable.admin.v2.AppProfile.priority is deprecated. See
-   *     google/bigtable/admin/v2/instance.proto;l=421
+   *     google/bigtable/admin/v2/instance.proto;l=448
    * @return The priority.
    */
   @java.lang.Deprecated