chore: Update generation configuration at Sat Sep 28 02:22:38 UTC 2024 (

#1599)

* chore: Update generation configuration at Wed Sep 25 02:24:24 UTC 2024

* update gen script

* chore: generate libraries at Wed Sep 25 23:31:54 UTC 2024

* chore: Update generation configuration at Thu Sep 26 02:23:26 UTC 2024

* chore: Update generation configuration at Fri Sep 27 02:23:56 UTC 2024

* chore: Update generation configuration at Sat Sep 28 02:22:38 UTC 2024

---------

Co-authored-by: Joe Wang <joewa@google.com>

.github/scripts/hermetic_library_generation.sh

@@ -67,20 +67,24 @@ message="chore: generate libraries at $(date)"
 
 git checkout "${target_branch}"
 git checkout "${current_branch}"
-# if the last commit doesn't contain changes to generation configuration,
-# do not generate again as the result will be the same.
-change_of_last_commit="$(git diff-tree --no-commit-id --name-only HEAD~1..HEAD -r)"
-if [[ ! ("${change_of_last_commit}" == *"${generation_config}"*) ]]; then
-    echo "The last commit doesn't contain any changes to the generation_config.yaml, skipping the whole generation process." || true
-    exit 0
-fi
+
 # copy generation configuration from target branch to current branch.
 git show "${target_branch}":"${generation_config}" > "${baseline_generation_config}"
-config_diff=$(diff "${generation_config}" "${baseline_generation_config}" || true)
 
 # parse image tag from the generation configuration.
 image_tag=$(grep "gapic_generator_version" "${generation_config}" | cut -d ':' -f 2 | xargs)
 
+repo_root_dir=$(pwd)
+mkdir -p "${repo_root_dir}/output"
+# download api definitions from googleapis repository
+googleapis_commitish=$(grep googleapis_commitish "${generation_config}" | cut -d ":" -f 2 | xargs)
+api_def_dir=$(mktemp -d)
+git clone https://github.com/googleapis/googleapis.git "${api_def_dir}"
+pushd "${api_def_dir}"
+git checkout "${googleapis_commitish}"
+cp -r google/ grafeas/ "${repo_root_dir}/output"
+popd
+
 # run hermetic code generation docker image.
 docker run \
   --rm \
@@ -90,26 +94,21 @@ docker run \
   --baseline-generation-config-path="${workspace_name}/${baseline_generation_config}" \
   --current-generation-config-path="${workspace_name}/${generation_config}"
 
+# remove api definitions after generation
+rm -rf "${api_def_dir}"
 
 # commit the change to the pull request.
-if [[ $(basename $(pwd)) == "google-cloud-java" ]]; then
-  git add java-* pom.xml gapic-libraries-bom/pom.xml versions.txt
-else
-  # The image leaves intermediate folders and files it works with. Here we remove them
-  rm -rdf output googleapis "${baseline_generation_config}"
-  git add --all -- ':!pr_description.txt'
-fi
+rm -rdf output googleapis "${baseline_generation_config}"
+git add --all -- ':!pr_description.txt' ':!hermetic_library_generation.sh'
 changed_files=$(git diff --cached --name-only)
-if [[ "${changed_files}" == "" ]]; then
-    echo "There is no generated code change with the generation config change ${config_diff}."
-    echo "Skip committing to the pull request."
-    exit 0
+if [[ "${changed_files}" != "" ]]; then
+    echo "Commit changes..."
+    git commit -m "${message}"
+    git push
+else
+    echo "There is no generated code change, skip commit."
 fi
 
-echo "Configuration diff:"
-echo "${config_diff}"
-git commit -m "${message}"
-git push
 # set pr body if pr_description.txt is generated.
 if [[ -f "pr_description.txt" ]]; then
   pr_num=$(gh pr list -s open -H "${current_branch}" -q . --json number | jq ".[] | .number")

generation_config.yaml

@@ -1,5 +1,5 @@
-gapic_generator_version: 2.45.0
-googleapis_commitish: 534e49c0ca0b9297f4ede6f119a0db054b35dd1e
+gapic_generator_version: 2.46.1
+googleapis_commitish: d6f184876ec67295addccbb70aa4af622e049a7e
 libraries_bom_version: 26.47.0
 libraries:
   - api_shortname: datastore

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadata.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CommonMetadataOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface CommonMetadataOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/CreateIndexRequestOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface CreateIndexRequestOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreAdminProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public final class DatastoreAdminProto {

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadata.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DatastoreFirestoreMigrationMetadataOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface DatastoreFirestoreMigrationMetadataOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/DeleteIndexRequestOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface DeleteIndexRequestOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilter.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/EntityFilterOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface EntityFilterOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadata.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesMetadataOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesMetadataOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesRequestOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesRequestOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponse.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ExportEntitiesResponseOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ExportEntitiesResponseOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/GetIndexRequestOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface GetIndexRequestOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadata.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesMetadataOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesMetadataOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ImportEntitiesRequestOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ImportEntitiesRequestOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/Index.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadata.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOperationMetadataOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface IndexOperationMetadataOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface IndexOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/IndexProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/index.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public final class IndexProto {

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequest.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesRequestOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesRequestOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponse.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/ListIndexesResponseOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/datastore_admin.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface ListIndexesResponseOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEvent.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 /**

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProgressEventOrBuilder.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public interface MigrationProgressEventOrBuilder

proto-google-cloud-datastore-admin-v1/src/main/java/com/google/datastore/admin/v1/MigrationProto.java

@@ -16,7 +16,7 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // source: google/datastore/admin/v1/migration.proto
 
-// Protobuf Java Version: 3.25.4
+// Protobuf Java Version: 3.25.5
 package com.google.datastore.admin.v1;
 
 public final class MigrationProto {