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
17 changes: 11 additions & 6 deletions .github/scripts/update_generation_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,14 @@ function update_config() {
}

# Update an action to a new version in GitHub action.
# the second argument must have the git tag (including "v").
function update_action() {
local key_word=$1
local new_value=$2
local file=$3
echo "Update ${key_word} to ${new_value} in ${file}"
# use a different delimiter because the key_word contains "/".
sed -i -e "s|${key_word}@v.*$|${key_word}@v${new_value}|" "${file}"
sed -i -e "s|${key_word}@[^ ]*$|${key_word}@${new_value}|" "${file}"
}

# The parameters of this script is:
Expand Down Expand Up @@ -143,12 +144,16 @@ rm -rf tmp-googleapis
update_config "googleapis_commitish" "${latest_commit}" "${generation_config}"

# Update gapic-generator-java version to the latest
latest_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
update_config "gapic_generator_version" "${latest_version}" "${generation_config}"

# Update composite action version to latest gapic-generator-java version
latest_gapic_generator_version=$(get_latest_released_version "com.google.api" "gapic-generator-java")
update_config "gapic_generator_version" "${latest_gapic_generator_version}" "${generation_config}"

# Update the GitHub Actions reference to the latest.
# After the google-cloud-java monorepo migration of sdk-platform-java,
# we cannot rely on the gapic-generator-java version tag. Let's use
# the gapic-libraries-bom version
latest_gapic_libraries_bom_version=$(get_latest_released_version "com.google.cloud" "gapic-libraries-bom")
update_action "googleapis/google-cloud-java/sdk-platform-java/.github/scripts" \
"${latest_version}" \
"v${latest_gapic_libraries_bom_version}" \
"${workflow}"

# Update libraries-bom version to the latest
Expand Down
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/google-cloud-java/sdk-platform-java/.github/scripts@v1.85.0
- uses: googleapis/google-cloud-java/sdk-platform-java/.github/scripts@google-cloud-shared-dependencies/v3.61.0
if: env.SHOULD_RUN == 'true'
with:
image_tag: latest
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/renovate_config_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
paths:
- 'renovate.json'
- '.github/workflows/renovate_config_check.yaml'

jobs:
renovate_bot_config_validation:
Expand All @@ -18,8 +19,6 @@ jobs:
with:
node-version: '22'

- name: Install Renovate and Config Validator
- name: Run Renovate Config Validator
run: |
npm install -g npm@latest
npm install --global renovate
renovate-config-validator
npx --package renovate@43.136.0 renovate-config-validator
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.79.0')
implementation platform('com.google.cloud:libraries-bom:26.80.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.69.0
googleapis_commitish: 9a832ccde3f3ca4d4e1c39593b1cbf9aa62a75b3
libraries_bom_version: 26.79.0
gapic_generator_version: 2.71.0
googleapis_commitish: 939ba3bf8408af83f0f73ae35c76c4b11a8c8c8d
libraries_bom_version: 26.80.0
template_excludes:
- .gitignore
- .kokoro/presubmit/integration.cfg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1871,6 +1871,15 @@
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Instance$Edition",
"queryAllDeclaredConstructors": true,
"queryAllPublicConstructors": true,
"queryAllDeclaredMethods": true,
"allPublicMethods": true,
"allDeclaredClasses": true,
"allPublicClasses": true
},
{
"name": "com.google.bigtable.admin.v2.Instance$State",
"queryAllDeclaredConstructors": true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -475,6 +475,7 @@ public void updateInstanceTest() throws Exception {
Assert.assertEquals(request.getDisplayName(), actualRequest.getDisplayName());
Assert.assertEquals(request.getState(), actualRequest.getState());
Assert.assertEquals(request.getType(), actualRequest.getType());
Assert.assertEquals(request.getEdition(), actualRequest.getEdition());
Assert.assertEquals(request.getLabelsMap(), actualRequest.getLabelsMap());
Assert.assertEquals(request.getCreateTime(), actualRequest.getCreateTime());
Assert.assertEquals(request.getSatisfiesPzs(), actualRequest.getSatisfiesPzs());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4510,7 +4510,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return Whether the priority field is set.
*/
@java.lang.Deprecated
Expand All @@ -4531,7 +4531,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return The enum numeric value on the wire for priority.
*/
@java.lang.Deprecated
Expand All @@ -4555,7 +4555,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return The priority.
*/
@java.lang.Deprecated
Expand Down Expand Up @@ -6158,7 +6158,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return Whether the priority field is set.
*/
@java.lang.Override
Expand All @@ -6180,7 +6180,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return The enum numeric value on the wire for priority.
*/
@java.lang.Override
Expand All @@ -6205,7 +6205,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @param value The enum numeric value on the wire for priority to set.
* @return This builder for chaining.
*/
Expand All @@ -6230,7 +6230,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return The priority.
*/
@java.lang.Override
Expand Down Expand Up @@ -6260,7 +6260,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @param value The priority to set.
* @return This builder for chaining.
*/
Expand Down Expand Up @@ -6288,7 +6288,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return This builder for chaining.
*/
@java.lang.Deprecated
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return Whether the priority field is set.
*/
@java.lang.Deprecated
Expand All @@ -237,7 +237,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return The enum numeric value on the wire for priority.
*/
@java.lang.Deprecated
Expand All @@ -256,7 +256,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=421
* google/bigtable/admin/v2/instance.proto;l=448
* @return The priority.
*/
@java.lang.Deprecated
Expand Down
Loading
Loading