Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update generation configuration at Wed Oct 2 02:24:58 UTC 2024 #2342

Merged
merged 18 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
8fa13a9
chore: Update generation configuration at Tue Sep 17 02:09:48 UTC 2024
cloud-java-bot Sep 17, 2024
1632c59
chore: generate libraries at Tue Sep 17 02:10:14 UTC 2024
cloud-java-bot Sep 17, 2024
a56957d
chore: Update generation configuration at Wed Sep 18 02:21:49 UTC 2024
cloud-java-bot Sep 18, 2024
e7e1060
chore: Update generation configuration at Thu Sep 19 02:23:21 UTC 2024
cloud-java-bot Sep 19, 2024
b5634cd
chore: generate libraries at Thu Sep 19 02:23:39 UTC 2024
cloud-java-bot Sep 19, 2024
d556107
chore: Update generation configuration at Fri Sep 20 02:23:12 UTC 2024
cloud-java-bot Sep 20, 2024
79af04e
chore: generate libraries at Fri Sep 20 02:24:35 UTC 2024
cloud-java-bot Sep 20, 2024
78fb513
chore: Update generation configuration at Sat Sep 21 02:21:35 UTC 2024
cloud-java-bot Sep 21, 2024
993ca89
chore: generate libraries at Sat Sep 21 02:21:56 UTC 2024
cloud-java-bot Sep 21, 2024
654a783
chore: Update generation configuration at Tue Sep 24 02:25:16 UTC 2024
cloud-java-bot Sep 24, 2024
dcee20c
chore: Update generation configuration at Wed Sep 25 02:25:52 UTC 2024
cloud-java-bot Sep 25, 2024
832fcab
update gen script
JoeWang1127 Sep 25, 2024
90e8a9e
chore: generate libraries at Wed Sep 25 23:25:38 UTC 2024
cloud-java-bot Sep 25, 2024
a78d363
chore: Update generation configuration at Thu Sep 26 02:24:53 UTC 2024
cloud-java-bot Sep 26, 2024
9263df5
chore: Update generation configuration at Fri Sep 27 02:25:30 UTC 2024
cloud-java-bot Sep 27, 2024
02ca70a
chore: Update generation configuration at Sat Sep 28 02:24:04 UTC 2024
cloud-java-bot Sep 28, 2024
a158bcb
chore: Update generation configuration at Tue Oct 1 02:28:51 UTC 2024
cloud-java-bot Oct 1, 2024
0c24da8
chore: Update generation configuration at Wed Oct 2 02:24:58 UTC 2024
cloud-java-bot Oct 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 22 additions & 23 deletions .github/scripts/hermetic_library_generation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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")
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,20 +50,20 @@ 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.45.0')
implementation platform('com.google.cloud:libraries-bom:26.47.0')

implementation 'com.google.cloud:google-cloud-bigtable'
```
If you are using Gradle without BOM, add this to your dependencies:

```Groovy
implementation 'com.google.cloud:google-cloud-bigtable:2.43.0'
implementation 'com.google.cloud:google-cloud-bigtable:2.44.0'
```

If you are using SBT, add this to your dependencies:

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.43.0"
libraryDependencies += "com.google.cloud" % "google-cloud-bigtable" % "2.44.0"
```
<!-- {x-version-update-end} -->

Expand Down Expand Up @@ -545,7 +545,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-bigtable/java11.html
[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-bigtable.svg
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.43.0
[maven-version-link]: https://central.sonatype.com/artifact/com.google.cloud/google-cloud-bigtable/2.44.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
Expand Down
6 changes: 3 additions & 3 deletions generation_config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
gapic_generator_version: 2.45.0
googleapis_commitish: 65306b92f03408d6de03589bdf970b78f2e4055c
libraries_bom_version: 26.45.0
gapic_generator_version: 2.46.1
googleapis_commitish: 16a1580c06b3b32e8ab33c39d846bba7e21bfae3
libraries_bom_version: 26.47.0
template_excludes:
- .gitignore
- .kokoro/presubmit/integration.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,15 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Cluster$NodeScalingFactor",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Cluster$State",
"queryAllDeclaredConstructors": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -911,6 +911,7 @@ public void updateClusterTest() throws Exception {
Assert.assertEquals(request.getLocation(), actualRequest.getLocation());
Assert.assertEquals(request.getState(), actualRequest.getState());
Assert.assertEquals(request.getServeNodes(), actualRequest.getServeNodes());
Assert.assertEquals(request.getNodeScalingFactor(), actualRequest.getNodeScalingFactor());
Assert.assertEquals(request.getClusterConfig(), actualRequest.getClusterConfig());
Assert.assertEquals(request.getDefaultStorageType(), actualRequest.getDefaultStorageType());
Assert.assertEquals(request.getEncryptionConfig(), actualRequest.getEncryptionConfig());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

/**
Expand Down Expand Up @@ -4624,7 +4624,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return Whether the priority field is set.
*/
@java.lang.Deprecated
Expand All @@ -4644,7 +4644,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return The enum numeric value on the wire for priority.
*/
@java.lang.Deprecated
Expand All @@ -4667,7 +4667,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return The priority.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -6261,7 +6261,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return Whether the priority field is set.
*/
@java.lang.Override
Expand All @@ -6282,7 +6282,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return The enum numeric value on the wire for priority.
*/
@java.lang.Override
Expand All @@ -6306,7 +6306,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @param value The enum numeric value on the wire for priority to set.
* @return This builder for chaining.
*/
Expand All @@ -6330,7 +6330,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return The priority.
*/
@java.lang.Override
Expand Down Expand Up @@ -6359,7 +6359,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @param value The priority to set.
* @return This builder for chaining.
*/
Expand All @@ -6386,7 +6386,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public interface AppProfileOrBuilder
Expand Down Expand Up @@ -209,7 +209,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return Whether the priority field is set.
*/
@java.lang.Deprecated
Expand All @@ -227,7 +227,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return The enum numeric value on the wire for priority.
*/
@java.lang.Deprecated
Expand All @@ -245,7 +245,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=386
* google/bigtable/admin/v2/instance.proto;l=405
* @return The priority.
*/
@java.lang.Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public interface AuthorizedViewOrBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public interface AutoscalingLimitsOrBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/instance.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public interface AutoscalingTargetsOrBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public interface BackupInfoOrBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public interface BackupOrBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_instance_admin.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public final class BigtableInstanceAdminProto {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_table_admin.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public final class BigtableTableAdminProto {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/table.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

public interface ChangeStreamConfigOrBuilder
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: google/bigtable/admin/v2/bigtable_table_admin.proto

// Protobuf Java Version: 3.25.4
// Protobuf Java Version: 3.25.5
package com.google.bigtable.admin.v2;

/**
Expand Down
Loading
Loading