[go: nahoru, domu]
Skip to content

Commit

Permalink
chore: migrate to owlbot (#823)
Browse files Browse the repository at this point in the history 
* chore: migrate to owlbot

* chore: update owlbot image

* chore: update owlbot image

* chore: add proto-google-cloud-firestore-bundle-v1 to exclude list

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: fix dependencies

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* chore: fix version update string

* update owlbot

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* fix xmls

* Update .repo-metadata.json

* Update pom.xml

* fix it config

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
Co-authored-by: Kristen O'Leary <kaoleary@google.com>
  • Loading branch information
@Neenu1995 @gcf-owl-bot @kolea2
3 people committed Feb 14, 2022
1 parent a19e804 commit 0350d16
Show file tree
Hide file tree
Showing 181 changed files with 627 additions and 476 deletions.
3 changes: 3 additions & 0 deletions .github/.OwlBot.lock.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
docker:
digest: sha256:3c950ed12391ebaffd1ee66d0374766a1c50144ebe6a7a0042300b2e6bb5856b
image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest
31 changes: 31 additions & 0 deletions .github/.OwlBot.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@

deep-remove-regex:
- "/grpc-google-.*/src"
- "/proto-google-.*/src"
- "/google-cloud-firestore/src/.*/java/com/google/cloud/firestore/v1/"
- "/google-cloud-firestore-admin/src"

deep-preserve-regex:
- "/google-.*/src/test/java/com/google/cloud/.*/v.*/it/IT.*Test.java"
- "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentPathName.java"
- "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/AnyPathName.java"
- "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DatabaseRootName.java"
- "/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentRootName.java"
- "/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ParentName.java"
- "/proto-google-cloud-firestore-v1/src/main/proto/firestore"

deep-copy-regex:
- source: "/google/firestore/(v\\d)/.*-java/proto-google-.*/src"
dest: "/owl-bot-staging/$1/proto-google-cloud-firestore-$1/src"
- source: "/google/firestore/(v\\d)/.*-java/grpc-google-.*/src"
dest: "/owl-bot-staging/$1/grpc-google-cloud-firestore-$1/src"
- source: "/google/firestore/(v\\d)/.*-java/gapic-google-.*/src"
dest: "/owl-bot-staging/$1/google-cloud-firestore/src"
- source: "/google/firestore/admin/(v\\d)/.*-java/proto-google-.*/src"
dest: "/owl-bot-staging/$1/proto-google-cloud-firestore-admin-$1/src"
- source: "/google/firestore/admin/(v\\d)/.*-java/grpc-google-.*/src"
dest: "/owl-bot-staging/$1/grpc-google-cloud-firestore-admin-$1/src"
- source: "/google/firestore/admin/(v\\d)/.*-java/gapic-google-.*/src"
dest: "/owl-bot-staging/$1/google-cloud-firestore-admin/src"
- source: "/google/firestore/bundle/google-cloud-firestore-bundle-v1-java/proto-google-cloud-firestore-bundle-v1-java/src"
dest: "/owl-bot-staging/v1/proto-google-cloud-firestore-bundle-v1/src"
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ If you are still having issues, please include as much information as possible:
General, Core, and Other are also allowed as types
2. OS type and version:
3. Java version:
4. firestore version(s):
4. version(s):

#### Steps to reproduce

Expand Down
17 changes: 16 additions & 1 deletion .github/workflows/approve-readme.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# Copyright 2022 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Github action job to test core java library features on
# downstream client libraries before they are released.
on:
pull_request:
name: auto-merge-readme
Expand All @@ -6,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
steps:
- uses: actions/github-script@v3
- uses: actions/github-script@v5
with:
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
script: |
Expand Down
29 changes: 22 additions & 7 deletions .github/workflows/auto-release.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# Copyright 2022 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Github action job to test core java library features on
# downstream client libraries before they are released.
on:
pull_request:
name: auto-release
Expand All @@ -6,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
if: contains(github.head_ref, 'release-please')
steps:
- uses: actions/github-script@v3
- uses: actions/github-script@v5
with:
github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
debug: true
Expand All @@ -16,13 +31,13 @@ jobs:
return;
}
// only approve PRs like "chore: release <release version>"
if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
// only approve PRs like "chore(main): release <release version>"
if ( !context.payload.pull_request.title.startsWith("chore(main): release") ) {
return;
}
// only approve PRs with pom.xml and versions.txt changes
const filesPromise = github.pulls.listFiles.endpoint({
const filesPromise = github.rest.pulls.listFiles.endpoint({
owner: context.repo.owner,
repo: context.repo.repo,
pull_number: context.payload.pull_request.number,
Expand Down Expand Up @@ -54,7 +69,7 @@ jobs:
return;
}
const promise = github.pulls.list.endpoint({
const promise = github.rest.pulls.list.endpoint({
owner: context.repo.owner,
repo: context.repo.repo,
state: 'open'
Expand All @@ -71,7 +86,7 @@ jobs:
}
// approve release PR
await github.pulls.createReview({
await github.rest.pulls.createReview({
owner: context.repo.owner,
repo: context.repo.repo,
body: 'Rubber stamped release!',
Expand All @@ -80,7 +95,7 @@ jobs:
});
// attach kokoro:force-run and automerge labels
await github.issues.addLabels({
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.payload.pull_request.number,
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# Copyright 2022 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Github action job to test core java library features on
# downstream client libraries before they are released.
on:
push:
branches:
Expand Down
15 changes: 15 additions & 0 deletions .github/workflows/samples.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
# Copyright 2022 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Github action job to test core java library features on
# downstream client libraries before they are released.
on:
pull_request:
name: samples
Expand Down
15 changes: 15 additions & 0 deletions .kokoro/build.bat
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
:: See documentation in type-shell-output.bat
# Copyright 2022 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# Github action job to test core java library features on
# downstream client libraries before they are released.

"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
37 changes: 37 additions & 0 deletions .kokoro/nightly/java11-integration.cfg
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Format: //devtools/kokoro/config/proto/build.proto

# Configure the docker image for kokoro-trampoline.
env_vars: {
key: "TRAMPOLINE_IMAGE"
value: "gcr.io/cloud-devrel-public-resources/java11014"
}

env_vars: {
key: "JOB_TYPE"
value: "integration"
}
# TODO: remove this after we've migrated all tests and scripts
env_vars: {
key: "GCLOUD_PROJECT"
value: "java-review"
}

env_vars: {
key: "GOOGLE_CLOUD_PROJECT"
value: "java-review"
}

env_vars: {
key: "ENABLE_FLAKYBOT"
value: "true"
}

env_vars: {
key: "GOOGLE_APPLICATION_CREDENTIALS"
value: "secret_manager/java-review_firestore-java-it"
}

env_vars: {
key: "SECRET_MANAGER_KEYS"
value: "java-review_firestore-java-it"
}
3 changes: 2 additions & 1 deletion .repo-metadata.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,6 @@
"api_id": "firestore.googleapis.com",
"library_type": "GAPIC_COMBO",
"api_description": "is a fully-managed NoSQL document database for mobile, web, and server development from Firebase and Google Cloud Platform. It's backed by a multi-region replicated database that ensures once data is committed, it's durable even in the face of unexpected disasters. Not only that, but despite being a distributed database, it's also strongly consistent and offers seamless integration with other Firebase and Google Cloud Platform products, including Google Cloud Functions.",
"transport": "grpc"
"transport": "grpc",
"excluded_poms": "google-cloud-firestore,google-cloud-firestore-bom"
}
17 changes: 8 additions & 9 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>libraries-bom</artifactId>
<version>22.0.0</version>
<version>24.3.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand All @@ -41,28 +41,28 @@ If you are using Maven without BOM, add this to your dependencies:
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore</artifactId>
<version>3.0.2</version>
<version>3.0.12</version>
</dependency>

```

If you are using Gradle 5.x or later, add this to your dependencies

```Groovy
implementation platform('com.google.cloud:libraries-bom:22.0.0')
implementation platform('com.google.cloud:libraries-bom:24.3.0')
implementation 'com.google.cloud:google-cloud-firestore'
```
If you are using Gradle without BOM, add this to your dependencies

```Groovy
implementation 'com.google.cloud:google-cloud-firestore:3.0.2'
implementation 'com.google.cloud:google-cloud-firestore:3.0.12'
```

If you are using SBT, add this to your dependencies

```Scala
libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.0.2"
libraryDependencies += "com.google.cloud" % "google-cloud-firestore" % "3.0.12"
```

## Authentication
Expand Down Expand Up @@ -126,7 +126,7 @@ Cloud Firestore uses gRPC for the transport layer.

## Supported Java Versions

Java 7 or above is required for using this client.
Java 8 or above is required for using this client.

Google's Java client libraries,
[Google Cloud Client Libraries][cloudlibs]
Expand Down Expand Up @@ -195,7 +195,6 @@ Apache 2.0 - See [LICENSE][license] for more information.

Java Version | Status
------------ | ------
Java 7 | [![Kokoro CI][kokoro-badge-image-1]][kokoro-badge-link-1]
Java 8 | [![Kokoro CI][kokoro-badge-image-2]][kokoro-badge-link-2]
Java 8 OSX | [![Kokoro CI][kokoro-badge-image-3]][kokoro-badge-link-3]
Java 8 Windows | [![Kokoro CI][kokoro-badge-image-4]][kokoro-badge-link-4]
Expand All @@ -204,7 +203,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5]
Java is a registered trademark of Oracle and/or its affiliates.

[product-docs]: https://cloud.google.com/firestore
[javadocs]: https://googleapis.dev/java/google-cloud-firestore/latest
[javadocs]: https://cloud.google.com/java/docs/reference/google-cloud-firestore/latest/history
[kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java7.svg
[kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java7.html
[kokoro-badge-image-2]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java8.svg
Expand All @@ -215,7 +214,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
[kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java8-win.html
[kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.svg
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-firestore/java11.html
[stability-image]: https://img.shields.io/badge/stability-ga-green
[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-firestore.svg
[maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-firestore&core=gav
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
Expand Down
2 changes: 1 addition & 1 deletion google-cloud-firestore-admin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<parent>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-parent</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-parent:current} -->
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
</parent>
<dependencies>
<dependency>
Expand Down
30 changes: 15 additions & 15 deletions google-cloud-firestore-bom/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0"?>
<?xml version='1.0' encoding='UTF-8'?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.google.cloud</groupId>
Expand Down Expand Up @@ -56,33 +56,33 @@
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
<artifactId>google-cloud-firestore-admin</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore:current} -->
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-admin-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-admin-v1:current} -->
<artifactId>proto-google-cloud-firestore-admin-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-admin-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.api.grpc</groupId>
<artifactId>grpc-google-cloud-firestore-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-firestore-v1:current} -->
<artifactId>proto-google-cloud-firestore-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-v1:current} -->
</dependency>
<dependency>
<groupId>com.google.cloud</groupId>
<artifactId>google-cloud-firestore-admin</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:google-cloud-firestore-admin:current} -->
<groupId>com.google.api.grpc</groupId>
<artifactId>proto-google-cloud-firestore-bundle-v1</artifactId>
<version>3.0.13-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-firestore-bundle-v1:current} -->
</dependency>
</dependencies>
</dependencyManagement>
Expand Down
Loading

0 comments on commit 0350d16

Please sign in to comment.