Merge branch 'main' of github.com:googleapis/google-cloud-java into datastore-default-metric-exporter-2

Author: lqiu96

.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

@@ -344,20 +344,20 @@ function run_graalvm_tests() {
 function generate_graalvm_presubmit_modules_list() {
   modules_assigned_list=()
   generate_modified_modules_list
-  if [[ ${#modified_module_list[@]} -gt 4 ]]; then
-    # Too many modules modified, run a subset
-    echo "Too many modules modified, running a subset"
-    module_list="java-aiplatform,java-compute"
-  elif [[ ${#modified_module_list[@]} -gt 0 ]]; then
+  if [[ ${#modified_module_list[@]} -gt 0 && ${#modified_module_list[@]} -lt 5 ]]; then
     # If only a few modules have been modified, focus presubmit testing only on them.
     module_list=$(
       IFS=,
       echo "${modified_module_list[*]}"
     )
   else
-    # no modules modified
-    echo "No modules modified"
-    module_list=""
+    # If no modules have been modified or if too many have been modified, just test the modules
+    # specified in the MAVEN_MODULES env var.
+    if [ -z "${MAVEN_MODULES}" ]; then
+      echo "MAVEN_MODULES not defined in environment."
+      exit 1
+    fi
+    module_list=${MAVEN_MODULES}
   fi
 }
 

.kokoro/common.sh

@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
 }
+
+env_vars: {
+  key: "MAVEN_MODULES"
+  value: "java-aiplatform,java-compute"
+}

.kokoro/presubmit/graalvm-native-a-presubmit.cfg

@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
 }
+
+env_vars: {
+  key: "MAVEN_MODULES"
+  value: "java-aiplatform,java-compute"
+}

.kokoro/presubmit/graalvm-native-b-presubmit.cfg

@@ -31,3 +31,8 @@ env_vars: {
   key: "SECRET_MANAGER_KEYS"
   value: "cloud-java-ci-it-service-account, java-bigqueryconnection-samples-secrets"
 }
+
+env_vars: {
+  key: "MAVEN_MODULES"
+  value: "java-aiplatform,java-compute"
+}

.kokoro/presubmit/graalvm-native-c-presubmit.cfg

@@ -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();
   }