Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/scripts/update_generation_config.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -ex
set -e
# This script should be run at the root of the repository.
# This script is used to update googleapis_commitish, gapic_generator_version,
# and libraries_bom_version in generation configuration at the time of running
Expand Down Expand Up @@ -174,4 +174,4 @@ if [ -z "${pr_num}" ]; then
else
git push
gh pr edit "${pr_num}" --title "${title}" --body "${title}"
fi
fi
2 changes: 1 addition & 1 deletion .github/workflows/hermetic_library_generation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
with:
fetch-depth: 0
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
- uses: googleapis/sdk-platform-java/.github/scripts@v2.59.0
- uses: googleapis/sdk-platform-java/.github/scripts@v2.60.2
if: env.SHOULD_RUN == 'true'
with:
base_ref: ${{ github.base_ref }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/update_generation_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:
schedule:
- cron: '0 2 * * *'
workflow_dispatch:

jobs:
update-generation-config:
runs-on: ubuntu-24.04
Expand All @@ -42,4 +43,5 @@ jobs:
--base_branch "${base_branch}" \
--repo ${{ github.repository }}
env:
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}

2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-a.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-b.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion .kokoro/presubmit/graalvm-native-c.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.49.0" # {x-version-update:google-cloud-shared-dependencies:current}
value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.50.2" # {x-version-update:google-cloud-shared-dependencies:current}
}

env_vars: {
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.61.0')
implementation platform('com.google.cloud:libraries-bom:26.64.0')

implementation 'com.google.cloud:google-cloud-bigtable'
```
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.59.0
googleapis_commitish: 33d5137a234625ed94afd630031321c31bd16143
libraries_bom_version: 26.61.0
gapic_generator_version: 2.60.2
googleapis_commitish: 64e82d17e410ff5e71ab3e040ea393db362f2850
libraries_bom_version: 26.64.0
template_excludes:
- .gitignore
- .kokoro/presubmit/integration.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,36 +209,31 @@ public class GrpcBigtableStub extends BigtableStub {
private static final PathTemplate READ_ROWS_1_PATH_TEMPLATE =
PathTemplate.create("{app_profile_id=**}");
private static final PathTemplate READ_ROWS_2_PATH_TEMPLATE =
PathTemplate.create(
"{authorized_view_name=projects/*/instances/*/tables/*/authorizedViews/*}");
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}/**");
private static final PathTemplate SAMPLE_ROW_KEYS_0_PATH_TEMPLATE =
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
private static final PathTemplate SAMPLE_ROW_KEYS_1_PATH_TEMPLATE =
PathTemplate.create("{app_profile_id=**}");
private static final PathTemplate SAMPLE_ROW_KEYS_2_PATH_TEMPLATE =
PathTemplate.create(
"{authorized_view_name=projects/*/instances/*/tables/*/authorizedViews/*}");
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}/**");
private static final PathTemplate MUTATE_ROW_0_PATH_TEMPLATE =
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
private static final PathTemplate MUTATE_ROW_1_PATH_TEMPLATE =
PathTemplate.create("{app_profile_id=**}");
private static final PathTemplate MUTATE_ROW_2_PATH_TEMPLATE =
PathTemplate.create(
"{authorized_view_name=projects/*/instances/*/tables/*/authorizedViews/*}");
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}/**");
private static final PathTemplate MUTATE_ROWS_0_PATH_TEMPLATE =
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
private static final PathTemplate MUTATE_ROWS_1_PATH_TEMPLATE =
PathTemplate.create("{app_profile_id=**}");
private static final PathTemplate MUTATE_ROWS_2_PATH_TEMPLATE =
PathTemplate.create(
"{authorized_view_name=projects/*/instances/*/tables/*/authorizedViews/*}");
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}/**");
private static final PathTemplate CHECK_AND_MUTATE_ROW_0_PATH_TEMPLATE =
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}");
private static final PathTemplate CHECK_AND_MUTATE_ROW_1_PATH_TEMPLATE =
PathTemplate.create("{app_profile_id=**}");
private static final PathTemplate CHECK_AND_MUTATE_ROW_2_PATH_TEMPLATE =
PathTemplate.create(
"{authorized_view_name=projects/*/instances/*/tables/*/authorizedViews/*}");
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}/**");
private static final PathTemplate PING_AND_WARM_0_PATH_TEMPLATE =
PathTemplate.create("{name=projects/*/instances/*}");
private static final PathTemplate PING_AND_WARM_1_PATH_TEMPLATE =
Expand All @@ -248,8 +243,7 @@ public class GrpcBigtableStub extends BigtableStub {
private static final PathTemplate READ_MODIFY_WRITE_ROW_1_PATH_TEMPLATE =
PathTemplate.create("{app_profile_id=**}");
private static final PathTemplate READ_MODIFY_WRITE_ROW_2_PATH_TEMPLATE =
PathTemplate.create(
"{authorized_view_name=projects/*/instances/*/tables/*/authorizedViews/*}");
PathTemplate.create("{table_name=projects/*/instances/*/tables/*}/**");
private static final PathTemplate PREPARE_QUERY_0_PATH_TEMPLATE =
PathTemplate.create("{name=projects/*/instances/*}");
private static final PathTemplate PREPARE_QUERY_1_PATH_TEMPLATE =
Expand Down Expand Up @@ -304,9 +298,7 @@ protected GrpcBigtableStub(
builder.add(
request.getAppProfileId(), "app_profile_id", READ_ROWS_1_PATH_TEMPLATE);
builder.add(
request.getAuthorizedViewName(),
"authorized_view_name",
READ_ROWS_2_PATH_TEMPLATE);
request.getAuthorizedViewName(), "table_name", READ_ROWS_2_PATH_TEMPLATE);
return builder.build();
})
.build();
Expand All @@ -322,7 +314,7 @@ protected GrpcBigtableStub(
request.getAppProfileId(), "app_profile_id", SAMPLE_ROW_KEYS_1_PATH_TEMPLATE);
builder.add(
request.getAuthorizedViewName(),
"authorized_view_name",
"table_name",
SAMPLE_ROW_KEYS_2_PATH_TEMPLATE);
return builder.build();
})
Expand All @@ -337,9 +329,7 @@ protected GrpcBigtableStub(
builder.add(
request.getAppProfileId(), "app_profile_id", MUTATE_ROW_1_PATH_TEMPLATE);
builder.add(
request.getAuthorizedViewName(),
"authorized_view_name",
MUTATE_ROW_2_PATH_TEMPLATE);
request.getAuthorizedViewName(), "table_name", MUTATE_ROW_2_PATH_TEMPLATE);
return builder.build();
})
.build();
Expand All @@ -353,9 +343,7 @@ protected GrpcBigtableStub(
builder.add(
request.getAppProfileId(), "app_profile_id", MUTATE_ROWS_1_PATH_TEMPLATE);
builder.add(
request.getAuthorizedViewName(),
"authorized_view_name",
MUTATE_ROWS_2_PATH_TEMPLATE);
request.getAuthorizedViewName(), "table_name", MUTATE_ROWS_2_PATH_TEMPLATE);
return builder.build();
})
.build();
Expand All @@ -376,7 +364,7 @@ protected GrpcBigtableStub(
CHECK_AND_MUTATE_ROW_1_PATH_TEMPLATE);
builder.add(
request.getAuthorizedViewName(),
"authorized_view_name",
"table_name",
CHECK_AND_MUTATE_ROW_2_PATH_TEMPLATE);
return builder.build();
})
Expand Down Expand Up @@ -410,7 +398,7 @@ protected GrpcBigtableStub(
READ_MODIFY_WRITE_ROW_1_PATH_TEMPLATE);
builder.add(
request.getAuthorizedViewName(),
"authorized_view_name",
"table_name",
READ_MODIFY_WRITE_ROW_2_PATH_TEMPLATE);
return builder.build();
})
Expand Down
Loading
Loading