Merge branch 'main' into mut-cred-example

Author: ldetmer

.github/scripts/release_manager_merge_bot

@@ -213,7 +213,16 @@ func main() {
 		}
 
 		state = *status.State
-		log.Printf("Overall status: %s", state)
+		log.Printf("Overall commit status: %s", state)
+		if pr.MergeableState != nil {
+			log.Printf("PR mergeable state: %s", *pr.MergeableState)
+			if *pr.MergeableState == "dirty" {
+				fatalError("PR #%d has merge conflicts (dirty).", prNumber)
+			}
+			if *pr.MergeableState == "draft" {
+				fatalError("PR #%d is a draft.", prNumber)
+			}
+		}
 
 		switch state {
 		case "failure":
@@ -230,7 +239,19 @@ func main() {
 			}
 			retryCount++
 		case "success":
-			log.Println("All checks have passed. Merging the pull request...")
+			// Check if the PR is truly mergeable. MergeableState can be "blocked" if required
+			// check runs (e.g. GitHub Actions) or reviews are missing, even if CombinedStatus is "success".
+			// If it's nil, GitHub is still calculating mergeability.
+			if pr.MergeableState == nil || *pr.MergeableState == "blocked" || *pr.MergeableState == "behind" {
+				stateStr := "nil"
+				if pr.MergeableState != nil {
+					stateStr = *pr.MergeableState
+				}
+				log.Printf("Commit status is success, but PR mergeable state is %q. Waiting...", stateStr)
+				goto wait
+			}
+
+			log.Println("All checks have passed and PR is mergeable. Merging the pull request...")
 			commitMessage := fmt.Sprintf("Merge pull request #%d from %s/%s", prNumber, owner, repo)
 			mergeResult, _, err := client.PullRequests.Merge(ctx, owner, repo, prNumber, commitMessage, &github.PullRequestOptions{
 				MergeMethod: "squash",

.github/scripts/release_manager_merge_bot.go

@@ -1,5 +1,5 @@
 gapic_generator_version: 2.68.0
-googleapis_commitish: 7e8511aad98db8480de0fd594c1cfd09a32b1cf3
+googleapis_commitish: 77c78e90aeeb1c4612e9ab772c90bc40748a7a19
 libraries_bom_version: 26.78.0
 libraries:
 - api_shortname: accessapproval

generation_config.yaml

@@ -42,20 +42,20 @@ If you are using Maven without the BOM, add this to your dependencies:
 <dependency>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-backupdr</artifactId>
-  <version>0.46.0</version>
+  <version>0.47.0</version>
 </dependency>
 ```
 
 If you are using Gradle without BOM, add this to your dependencies:
 
 ```Groovy
-implementation 'com.google.cloud:google-cloud-backupdr:0.46.0'
+implementation 'com.google.cloud:google-cloud-backupdr:0.47.0'
 ```
 
 If you are using SBT, add this to your dependencies:
 
 ```Scala
-libraryDependencies += "com.google.cloud" % "google-cloud-backupdr" % "0.46.0"
+libraryDependencies += "com.google.cloud" % "google-cloud-backupdr" % "0.47.0"
 ```
 
 ## Authentication
@@ -175,7 +175,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-backupdr/latest/overview
 [stability-image]: https://img.shields.io/badge/stability-stable-green
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-backupdr.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-backupdr/0.46.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-backupdr/0.47.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

java-backupdr/README.md

@@ -1770,6 +1770,7 @@ protected LibraryMetadata getLibraryMetadata() {
     return LibraryMetadata.newBuilder()
         .setArtifactName("com.google.cloud:google-cloud-backupdr")
         .setRepository("googleapis/google-cloud-java")
+        .setVersion(Version.VERSION)
         .build();
   }
 

java-backupdr/google-cloud-backupdr/src/main/java/com/google/cloud/backupdr/v1/stub/BackupDRStubSettings.java

@@ -424,6 +424,7 @@ protected LibraryMetadata getLibraryMetadata() {
     return LibraryMetadata.newBuilder()
         .setArtifactName("com.google.cloud:google-cloud-backupdr")
         .setRepository("googleapis/google-cloud-java")
+        .setVersion(Version.VERSION)
         .build();
   }
 

java-backupdr/google-cloud-backupdr/src/main/java/com/google/cloud/backupdr/v1/stub/BackupDrProtectionSummaryStubSettings.java

@@ -807,6 +807,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<GetManagementServerRequest, ManagementServer>
         getManagementServerTransportSettings =
@@ -818,6 +819,7 @@ protected GrpcBackupDRStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<CreateManagementServerRequest, Operation>
         createManagementServerTransportSettings =
@@ -829,6 +831,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<DeleteManagementServerRequest, Operation>
         deleteManagementServerTransportSettings =
@@ -840,6 +843,7 @@ protected GrpcBackupDRStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<CreateBackupVaultRequest, Operation> createBackupVaultTransportSettings =
         GrpcCallSettings.<CreateBackupVaultRequest, Operation>newBuilder()
@@ -850,6 +854,7 @@ protected GrpcBackupDRStub(
                   builder.add("parent", String.valueOf(request.getParent()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getParent())
             .build();
     GrpcCallSettings<ListBackupVaultsRequest, ListBackupVaultsResponse>
         listBackupVaultsTransportSettings =
@@ -861,6 +866,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<FetchUsableBackupVaultsRequest, FetchUsableBackupVaultsResponse>
         fetchUsableBackupVaultsTransportSettings =
@@ -873,6 +879,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<GetBackupVaultRequest, BackupVault> getBackupVaultTransportSettings =
         GrpcCallSettings.<GetBackupVaultRequest, BackupVault>newBuilder()
@@ -883,6 +890,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<UpdateBackupVaultRequest, Operation> updateBackupVaultTransportSettings =
         GrpcCallSettings.<UpdateBackupVaultRequest, Operation>newBuilder()
@@ -904,6 +912,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<ListDataSourcesRequest, ListDataSourcesResponse>
         listDataSourcesTransportSettings =
@@ -915,6 +924,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<GetDataSourceRequest, DataSource> getDataSourceTransportSettings =
         GrpcCallSettings.<GetDataSourceRequest, DataSource>newBuilder()
@@ -925,6 +935,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<UpdateDataSourceRequest, Operation> updateDataSourceTransportSettings =
         GrpcCallSettings.<UpdateDataSourceRequest, Operation>newBuilder()
@@ -946,6 +957,7 @@ protected GrpcBackupDRStub(
                   builder.add("parent", String.valueOf(request.getParent()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getParent())
             .build();
     GrpcCallSettings<FetchBackupsForResourceTypeRequest, FetchBackupsForResourceTypeResponse>
         fetchBackupsForResourceTypeTransportSettings =
@@ -959,6 +971,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<GetBackupRequest, Backup> getBackupTransportSettings =
         GrpcCallSettings.<GetBackupRequest, Backup>newBuilder()
@@ -969,6 +982,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<UpdateBackupRequest, Operation> updateBackupTransportSettings =
         GrpcCallSettings.<UpdateBackupRequest, Operation>newBuilder()
@@ -989,6 +1003,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<RestoreBackupRequest, Operation> restoreBackupTransportSettings =
         GrpcCallSettings.<RestoreBackupRequest, Operation>newBuilder()
@@ -999,6 +1014,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<CreateBackupPlanRequest, Operation> createBackupPlanTransportSettings =
         GrpcCallSettings.<CreateBackupPlanRequest, Operation>newBuilder()
@@ -1009,6 +1025,7 @@ protected GrpcBackupDRStub(
                   builder.add("parent", String.valueOf(request.getParent()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getParent())
             .build();
     GrpcCallSettings<UpdateBackupPlanRequest, Operation> updateBackupPlanTransportSettings =
         GrpcCallSettings.<UpdateBackupPlanRequest, Operation>newBuilder()
@@ -1030,6 +1047,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<ListBackupPlansRequest, ListBackupPlansResponse>
         listBackupPlansTransportSettings =
@@ -1041,6 +1059,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<DeleteBackupPlanRequest, Operation> deleteBackupPlanTransportSettings =
         GrpcCallSettings.<DeleteBackupPlanRequest, Operation>newBuilder()
@@ -1051,6 +1070,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<GetBackupPlanRevisionRequest, BackupPlanRevision>
         getBackupPlanRevisionTransportSettings =
@@ -1062,6 +1082,7 @@ protected GrpcBackupDRStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<ListBackupPlanRevisionsRequest, ListBackupPlanRevisionsResponse>
         listBackupPlanRevisionsTransportSettings =
@@ -1074,6 +1095,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<CreateBackupPlanAssociationRequest, Operation>
         createBackupPlanAssociationTransportSettings =
@@ -1085,6 +1107,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<UpdateBackupPlanAssociationRequest, Operation>
         updateBackupPlanAssociationTransportSettings =
@@ -1109,6 +1132,7 @@ protected GrpcBackupDRStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<ListBackupPlanAssociationsRequest, ListBackupPlanAssociationsResponse>
         listBackupPlanAssociationsTransportSettings =
@@ -1121,6 +1145,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<
             FetchBackupPlanAssociationsForResourceTypeRequest,
@@ -1137,6 +1162,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<DeleteBackupPlanAssociationRequest, Operation>
         deleteBackupPlanAssociationTransportSettings =
@@ -1148,6 +1174,7 @@ protected GrpcBackupDRStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<TriggerBackupRequest, Operation> triggerBackupTransportSettings =
         GrpcCallSettings.<TriggerBackupRequest, Operation>newBuilder()
@@ -1158,6 +1185,7 @@ protected GrpcBackupDRStub(
                   builder.add("name", String.valueOf(request.getName()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getName())
             .build();
     GrpcCallSettings<GetDataSourceReferenceRequest, DataSourceReference>
         getDataSourceReferenceTransportSettings =
@@ -1169,6 +1197,7 @@ protected GrpcBackupDRStub(
                       builder.add("name", String.valueOf(request.getName()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getName())
                 .build();
     GrpcCallSettings<ListDataSourceReferencesRequest, ListDataSourceReferencesResponse>
         listDataSourceReferencesTransportSettings =
@@ -1181,6 +1210,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<
             FetchDataSourceReferencesForResourceTypeRequest,
@@ -1197,6 +1227,7 @@ protected GrpcBackupDRStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<InitializeServiceRequest, Operation> initializeServiceTransportSettings =
         GrpcCallSettings.<InitializeServiceRequest, Operation>newBuilder()
@@ -1237,6 +1268,7 @@ protected GrpcBackupDRStub(
                   builder.add("resource", String.valueOf(request.getResource()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getResource())
             .build();
     GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
@@ -1247,6 +1279,7 @@ protected GrpcBackupDRStub(
                   builder.add("resource", String.valueOf(request.getResource()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getResource())
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
         testIamPermissionsTransportSettings =
@@ -1258,6 +1291,7 @@ protected GrpcBackupDRStub(
                       builder.add("resource", String.valueOf(request.getResource()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getResource())
                 .build();
 
     this.listManagementServersCallable =

java-backupdr/google-cloud-backupdr/src/main/java/com/google/cloud/backupdr/v1/stub/GrpcBackupDRStub.java

@@ -188,6 +188,7 @@ protected GrpcBackupDrProtectionSummaryStub(
                       builder.add("parent", String.valueOf(request.getParent()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getParent())
                 .build();
     GrpcCallSettings<ListLocationsRequest, ListLocationsResponse> listLocationsTransportSettings =
         GrpcCallSettings.<ListLocationsRequest, ListLocationsResponse>newBuilder()
@@ -218,6 +219,7 @@ protected GrpcBackupDrProtectionSummaryStub(
                   builder.add("resource", String.valueOf(request.getResource()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getResource())
             .build();
     GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
@@ -228,6 +230,7 @@ protected GrpcBackupDrProtectionSummaryStub(
                   builder.add("resource", String.valueOf(request.getResource()));
                   return builder.build();
                 })
+            .setResourceNameExtractor(request -> request.getResource())
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
         testIamPermissionsTransportSettings =
@@ -239,6 +242,7 @@ protected GrpcBackupDrProtectionSummaryStub(
                       builder.add("resource", String.valueOf(request.getResource()));
                       return builder.build();
                     })
+                .setResourceNameExtractor(request -> request.getResource())
                 .build();
 
     this.listResourceBackupConfigsCallable =