diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index b28d9107..23bcdc9b 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:d63f88abaa7cefc60021d1a86b6a2fb7c02948f8d6448142df4e3012a52308a2 image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:2e88a4a7fe3377cf8de1fa5982134f6ef2768980fa2f94edcc1ba6604ae2e7ca diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 05d88a1a..a618e43a 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -22,9 +22,8 @@ deep-remove-regex: deep-copy-regex: - source: "/google/appengine/(v.*)/.*-java/proto-google-.*/src" - dest: "/proto-google-cloud-appengine-admin-$1/src" + dest: "/owl-bot-staging/$1/proto-google-cloud-appengine-admin-$1/src" - source: "/google/appengine/(v.*)/.*-java/grpc-google-.*/src" - dest: "/grpc-google-cloud-appengine-admin-$1/src" -- source: "/google/appengine/v.*/.*-java/gapic-google-.*/src" - dest: "/google-cloud-appengine-admin/src" - \ No newline at end of file + dest: "/owl-bot-staging/$1/grpc-google-cloud-appengine-admin-$1/src" +- source: "/google/appengine/(v.*)/.*-java/gapic-google-.*/src" + dest: "/owl-bot-staging/$1/google-cloud-appengine-admin/src" diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml index 47c2ba13..c644a24e 100644 --- a/.github/generated-files-bot.yml +++ b/.github/generated-files-bot.yml @@ -9,3 +9,4 @@ ignoreAuthors: - 'renovate-bot' - 'yoshi-automation' - 'release-please[bot]' +- 'gcf-owl-bot[bot]' diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata new file mode 100644 index 00000000..0765483d --- /dev/null +++ b/.github/readme/synth.metadata/synth.metadata @@ -0,0 +1,18 @@ +{ + "sources": [ + { + "git": { + "name": ".", + "remote": "https://github.com/googleapis/java-appengine-admin.git", + "sha": "534ba43f8e38944ee9ffae8cc91019df23f6737f" + } + }, + { + "git": { + "name": "synthtool", + "remote": "https://github.com/googleapis/synthtool.git", + "sha": "1620b2cbb253f05f9e97be5efc371d2ba3844179" + } + } + ] +} \ No newline at end of file diff --git a/.github/release-please.yml b/.github/release-please.yml index dce2c845..8ca7f9ca 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,2 +1,3 @@ +bumpMinorPreMajor: true +handleGHRelease: true releaseType: java-yoshi -bumpMinorPreMajor: true \ No newline at end of file diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index def8b3a2..0195b32f 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -19,10 +19,6 @@ jobs: - run: .kokoro/build.sh env: JOB_TYPE: test - - name: coverage - uses: codecov/codecov-action@v1 - with: - name: actions ${{matrix.java}} windows: runs-on: windows-latest steps: @@ -80,4 +76,4 @@ jobs: - run: java -version - run: .kokoro/build.sh env: - JOB_TYPE: clirr \ No newline at end of file + JOB_TYPE: clirr diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 0d7891cf..bdce0753 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -23,8 +23,8 @@ cd ${scriptDir}/.. # include common functions source ${scriptDir}/common.sh -# Print out Java version -java -version +# Print out Maven & Java version +mvn -version echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) @@ -37,7 +37,7 @@ retry_with_backoff 3 10 \ -Dgcloud.download.skip=true \ -T 1C -# if GOOGLE_APPLICATION_CREDIENTIALS is specified as a relative path prepend Kokoro root directory onto it +# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh index 5cf7ba49..46edbf7f 100755 --- a/.kokoro/coerce_logs.sh +++ b/.kokoro/coerce_logs.sh @@ -28,7 +28,6 @@ job=$(basename ${KOKORO_JOB_NAME}) echo "coercing sponge logs..." for xml in `find . -name *-sponge_log.xml` do - echo "processing ${xml}" class=$(basename ${xml} | cut -d- -f2) dir=$(dirname ${xml})/${job}/${class} text=$(dirname ${xml})/${class}-sponge_log.txt diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 0fb8c843..9030ba8f 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -14,6 +14,7 @@ # limitations under the License. set -eo pipefail +shopt -s nullglob ## Get the directory of the build script scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}")) @@ -33,6 +34,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" retry_with_backoff 3 10 \ mvn install -B -V -ntp \ -DskipTests=true \ + -Dmaven.javadoc.skip=true \ -Dclirr.skip=true mvn -B dependency:analyze -DfailOnWarning=true @@ -45,7 +47,7 @@ function completenessCheck() { # This is stripped from the output as it is not present in the flattened pom. # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list. msg "Generating dependency list using original pom..." - mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e s/\\s--\\smodule.*// >.org-list.txt + mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO] .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes) msg "Generating dependency list using flattened pom..." @@ -69,7 +71,7 @@ function completenessCheck() { set +e error_count=0 -for path in $(find -name ".flattened-pom.xml") +for path in **/.flattened-pom.xml do # Check flattened pom in each dir that contains it for completeness dir=$(dirname "$path") diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh index fff55cda..a6630aa1 100755 --- a/.kokoro/release/publish_javadoc11.sh +++ b/.kokoro/release/publish_javadoc11.sh @@ -42,6 +42,8 @@ mvn clean site -B -q -P docFX # copy README to docfx-yml dir and rename index.md cp README.md target/docfx-yml/index.md +# copy CHANGELOG to docfx-yml dir and rename history.md +cp CHANGELOG.md target/docfx-yml/history.md pushd target/docfx-yml @@ -49,6 +51,13 @@ pushd target/docfx-yml python3 -m docuploader create-metadata \ --name ${NAME} \ --version ${VERSION} \ + --xrefs devsite://java/gax \ + --xrefs devsite://java/google-cloud-core \ + --xrefs devsite://java/api-common \ + --xrefs devsite://java/proto-google-common-protos \ + --xrefs devsite://java/google-api-client \ + --xrefs devsite://java/google-http-client \ + --xrefs devsite://java/protobuf \ --language java # upload yml to production bucket diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh index 098168a7..1f55b770 100755 --- a/.kokoro/release/snapshot.sh +++ b/.kokoro/release/snapshot.sh @@ -25,7 +25,7 @@ grep SNAPSHOT versions.txt setup_environment_secrets create_settings_xml_file "settings.xml" -mvn clean install deploy -B \ +mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DperformRelease=true \ -Dgpg.executable=gpg \ diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh index 16126d2e..8a103384 100755 --- a/.kokoro/release/stage.sh +++ b/.kokoro/release/stage.sh @@ -29,7 +29,7 @@ create_settings_xml_file "settings.xml" # attempt to stage 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn clean install deploy -B \ + mvn clean deploy -B \ --settings ${MAVEN_SETTINGS_FILE} \ -DskipTests=true \ -DperformRelease=true \ diff --git a/.repo-metadata.json b/.repo-metadata.json index a9c3a98d..867d3a0d 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -4,7 +4,7 @@ "product_documentation": "https://cloud.google.com/appengine/docs/admin-api/", "api_description": "you to manage your App Engine applications.", "client_documentation": "https://googleapis.dev/java/google-cloud-appengine-admin/latest/index.html", - "release_level": "beta", + "release_level": "ga", "transport": "grpc", "language": "java", "repo": "googleapis/java-appengine-admin", @@ -12,4 +12,4 @@ "distribution_name": "com.google.cloud:google-cloud-appengine-admin", "api_id": "appengine.googleapis.com", "requires_billing": true -} \ No newline at end of file +} diff --git a/CHANGELOG.md b/CHANGELOG.md index 14922e40..67ccf707 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,45 @@ # Changelog +## [1.0.0](https://www.github.com/googleapis/java-appengine-admin/compare/v0.1.3...v1.0.0) (2021-07-12) + + +### Features + +* promote to ga ([#72](https://www.github.com/googleapis/java-appengine-admin/issues/72)) ([534ba43](https://www.github.com/googleapis/java-appengine-admin/commit/534ba43f8e38944ee9ffae8cc91019df23f6737f)) + + +### Bug Fixes + +* Add `shopt -s nullglob` to dependencies script ([#1130](https://www.github.com/googleapis/java-appengine-admin/issues/1130)) ([#69](https://www.github.com/googleapis/java-appengine-admin/issues/69)) ([c3f6daa](https://www.github.com/googleapis/java-appengine-admin/commit/c3f6daac5b133d20aabc855d5512d41cda0d6ed3)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#71](https://www.github.com/googleapis/java-appengine-admin/issues/71)) ([18e40f2](https://www.github.com/googleapis/java-appengine-admin/commit/18e40f2298d05469dcbd4988a3ca54243881b245)) + +### [0.1.3](https://www.github.com/googleapis/java-appengine-admin/compare/v0.1.2...v0.1.3) (2021-06-09) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.3.0 ([#58](https://www.github.com/googleapis/java-appengine-admin/issues/58)) ([354b3e1](https://www.github.com/googleapis/java-appengine-admin/commit/354b3e1149d4a86d600043a05c9255e291370c92)) + +### [0.1.2](https://www.github.com/googleapis/java-appengine-admin/compare/v0.1.1...v0.1.2) (2021-05-26) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.2.0 ([#47](https://www.github.com/googleapis/java-appengine-admin/issues/47)) ([b395030](https://www.github.com/googleapis/java-appengine-admin/commit/b395030405a17234ee0edaa67b7f52bb593f79a4)) + +### [0.1.1](https://www.github.com/googleapis/java-appengine-admin/compare/v0.1.0...v0.1.1) (2021-05-14) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v0.21.1 ([#27](https://www.github.com/googleapis/java-appengine-admin/issues/27)) ([b198994](https://www.github.com/googleapis/java-appengine-admin/commit/b1989947e17e6580c5543396fe1962fb2e4d837b)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1 ([#31](https://www.github.com/googleapis/java-appengine-admin/issues/31)) ([9a2bfa0](https://www.github.com/googleapis/java-appengine-admin/commit/9a2bfa075b44e32fec99b2fcc25424515ee1eb2a)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.1.0 ([#39](https://www.github.com/googleapis/java-appengine-admin/issues/39)) ([e58d04a](https://www.github.com/googleapis/java-appengine-admin/commit/e58d04a60a8547ccea0c829c62fbdb7e441d8a37)) + ## 0.1.0 (2021-04-13) diff --git a/README.md b/README.md index 5067049d..19e5adde 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ Java idiomatic client for [App Engine Admin API][product-docs]. - [Product Documentation][product-docs] - [Client Library Documentation][javadocs] -> Note: This client is a work-in-progress, and may occasionally -> make backwards-incompatible changes. - ## Quickstart @@ -20,18 +17,18 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-appengine-admin - 0.0.0 + 0.1.3 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-appengine-admin:0.0.0' +compile 'com.google.cloud:google-cloud-appengine-admin:0.1.3' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "0.0.0" +libraryDependencies += "com.google.cloud" % "google-cloud-appengine-admin" % "0.1.3" ``` ## Authentication @@ -84,9 +81,6 @@ Java 7 or above is required for using this client. This library follows [Semantic Versioning](http://semver.org/). -It is currently in major version zero (``0.y.z``), which means that anything may change at any time -and the public API should not be considered stable. - ## Contributing @@ -126,7 +120,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-appengine-admin/java8-win.html [kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-appengine-admin/java11.svg [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-appengine-admin/java11.html -[stability-image]: https://img.shields.io/badge/stability-beta-yellow +[stability-image]: https://img.shields.io/badge/stability-ga-green [maven-version-image]: https://img.shields.io/maven-central/v/com.google.cloud/google-cloud-appengine-admin.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-appengine-admin&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..8b58ae9c --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,7 @@ +# Security Policy + +To report a security issue, please use [g.co/vulnz](https://g.co/vulnz). + +The Google Security Team will respond within 5 working days of your report on g.co/vulnz. + +We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue. diff --git a/google-cloud-appengine-admin-bom/pom.xml b/google-cloud-appengine-admin-bom/pom.xml index 6a27264c..2a9e01d4 100644 --- a/google-cloud-appengine-admin-bom/pom.xml +++ b/google-cloud-appengine-admin-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-appengine-admin-bom - 0.1.0 + 1.0.0 pom com.google.cloud google-cloud-shared-config - 0.11.0 + 0.12.0 Google App Engine Admin API BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-appengine-admin - 0.1.0 + 1.0.0 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 0.1.0 + 1.0.0 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 0.1.0 + 1.0.0 diff --git a/google-cloud-appengine-admin/pom.xml b/google-cloud-appengine-admin/pom.xml index dc4d4450..816f2513 100644 --- a/google-cloud-appengine-admin/pom.xml +++ b/google-cloud-appengine-admin/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-appengine-admin - 0.1.0 + 1.0.0 jar Google App Engine Admin API https://github.com/googleapis/java-appengine-admin @@ -11,7 +11,7 @@ com.google.cloud google-cloud-appengine-admin-parent - 0.1.0 + 1.0.0 google-cloud-appengine-admin diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ApplicationsStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ApplicationsStubSettings.java index 525239d2..e65196fc 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ApplicationsStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ApplicationsStubSettings.java @@ -164,6 +164,11 @@ public static String getDefaultEndpoint() { return "appengine.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "appengine.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -320,6 +325,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedCertificatesStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedCertificatesStubSettings.java index d1e6e439..197031e7 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedCertificatesStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedCertificatesStubSettings.java @@ -247,6 +247,11 @@ public static String getDefaultEndpoint() { return "appengine.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "appengine.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -403,6 +408,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedDomainsStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedDomainsStubSettings.java index bbc5229a..42bb012a 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedDomainsStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/AuthorizedDomainsStubSettings.java @@ -197,6 +197,11 @@ public static String getDefaultEndpoint() { return "appengine.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "appengine.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -313,6 +318,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/DomainMappingsStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/DomainMappingsStubSettings.java index bc094b6f..cb29e08b 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/DomainMappingsStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/DomainMappingsStubSettings.java @@ -252,6 +252,11 @@ public static String getDefaultEndpoint() { return "appengine.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "appengine.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -419,6 +424,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/FirewallStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/FirewallStubSettings.java index 6c0b0241..f505e247 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/FirewallStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/FirewallStubSettings.java @@ -224,6 +224,11 @@ public static String getDefaultEndpoint() { return "appengine.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "appengine.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -374,6 +379,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/InstancesStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/InstancesStubSettings.java index 226bfd38..ed979e60 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/InstancesStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/InstancesStubSettings.java @@ -222,6 +222,11 @@ public static String getDefaultEndpoint() { return "appengine.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "appengine.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -365,6 +370,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ServicesStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ServicesStubSettings.java index 2ead7a99..f8a713a9 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ServicesStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/ServicesStubSettings.java @@ -222,6 +222,11 @@ public static String getDefaultEndpoint() { return "appengine.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "appengine.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -364,6 +369,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/VersionsStubSettings.java b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/VersionsStubSettings.java index 05f29cca..d54a4fe6 100644 --- a/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/VersionsStubSettings.java +++ b/google-cloud-appengine-admin/src/main/java/com/google/appengine/v1/stub/VersionsStubSettings.java @@ -238,6 +238,11 @@ public static String getDefaultEndpoint() { return "appengine.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "appengine.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -392,6 +397,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/ApplicationsClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/ApplicationsClientTest.java index 4eb8cb04..ec3fae2c 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/ApplicationsClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/ApplicationsClientTest.java @@ -48,8 +48,8 @@ public class ApplicationsClientTest { private static MockApplications mockApplications; private static MockServiceHelper mockServiceHelper; - private ApplicationsClient client; private LocalChannelProvider channelProvider; + private ApplicationsClient client; @BeforeClass public static void startStaticServer() { diff --git a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/AuthorizedCertificatesClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/AuthorizedCertificatesClientTest.java index 235be6c8..1ecd5c78 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/AuthorizedCertificatesClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/AuthorizedCertificatesClientTest.java @@ -46,10 +46,10 @@ @Generated("by gapic-generator-java") public class AuthorizedCertificatesClientTest { - private static MockServiceHelper mockServiceHelper; private static MockAuthorizedCertificates mockAuthorizedCertificates; - private AuthorizedCertificatesClient client; + private static MockServiceHelper mockServiceHelper; private LocalChannelProvider channelProvider; + private AuthorizedCertificatesClient client; @BeforeClass public static void startStaticServer() { diff --git a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/AuthorizedDomainsClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/AuthorizedDomainsClientTest.java index 27784387..52497fe5 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/AuthorizedDomainsClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/AuthorizedDomainsClientTest.java @@ -44,8 +44,8 @@ public class AuthorizedDomainsClientTest { private static MockAuthorizedDomains mockAuthorizedDomains; private static MockServiceHelper mockServiceHelper; - private AuthorizedDomainsClient client; private LocalChannelProvider channelProvider; + private AuthorizedDomainsClient client; @BeforeClass public static void startStaticServer() { diff --git a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/DomainMappingsClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/DomainMappingsClientTest.java index 227aa325..03f57d73 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/DomainMappingsClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/DomainMappingsClientTest.java @@ -49,10 +49,10 @@ @Generated("by gapic-generator-java") public class DomainMappingsClientTest { - private static MockServiceHelper mockServiceHelper; - private DomainMappingsClient client; private static MockDomainMappings mockDomainMappings; + private static MockServiceHelper mockServiceHelper; private LocalChannelProvider channelProvider; + private DomainMappingsClient client; @BeforeClass public static void startStaticServer() { diff --git a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/FirewallClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/FirewallClientTest.java index 777e2725..b40d0861 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/FirewallClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/FirewallClientTest.java @@ -46,10 +46,10 @@ @Generated("by gapic-generator-java") public class FirewallClientTest { - private static MockServiceHelper mockServiceHelper; private static MockFirewall mockFirewall; - private FirewallClient client; + private static MockServiceHelper mockServiceHelper; private LocalChannelProvider channelProvider; + private FirewallClient client; @BeforeClass public static void startStaticServer() { diff --git a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/InstancesClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/InstancesClientTest.java index cad73be2..ada4ede6 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/InstancesClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/InstancesClientTest.java @@ -48,10 +48,10 @@ @Generated("by gapic-generator-java") public class InstancesClientTest { - private static MockServiceHelper mockServiceHelper; private static MockInstances mockInstances; - private InstancesClient client; + private static MockServiceHelper mockServiceHelper; private LocalChannelProvider channelProvider; + private InstancesClient client; @BeforeClass public static void startStaticServer() { diff --git a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/ServicesClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/ServicesClientTest.java index 389f4695..9397885c 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/ServicesClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/ServicesClientTest.java @@ -50,8 +50,8 @@ public class ServicesClientTest { private static MockServiceHelper mockServiceHelper; private static MockServices mockServices; - private ServicesClient client; private LocalChannelProvider channelProvider; + private ServicesClient client; @BeforeClass public static void startStaticServer() { diff --git a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/VersionsClientTest.java b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/VersionsClientTest.java index cc6601cc..525d379b 100644 --- a/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/VersionsClientTest.java +++ b/google-cloud-appengine-admin/src/test/java/com/google/appengine/v1/VersionsClientTest.java @@ -52,10 +52,10 @@ @Generated("by gapic-generator-java") public class VersionsClientTest { - private static MockVersions mockVersions; private static MockServiceHelper mockServiceHelper; - private VersionsClient client; + private static MockVersions mockVersions; private LocalChannelProvider channelProvider; + private VersionsClient client; @BeforeClass public static void startStaticServer() { diff --git a/grpc-google-cloud-appengine-admin-v1/pom.xml b/grpc-google-cloud-appengine-admin-v1/pom.xml index 63fbbc07..4c4ce951 100644 --- a/grpc-google-cloud-appengine-admin-v1/pom.xml +++ b/grpc-google-cloud-appengine-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 0.1.0 + 1.0.0 grpc-google-cloud-appengine-admin-v1 GRPC library for google-cloud-appengine-admin com.google.cloud google-cloud-appengine-admin-parent - 0.1.0 + 1.0.0 diff --git a/java.header b/java.header index 3a9b503a..d0970ba7 100644 --- a/java.header +++ b/java.header @@ -1,5 +1,5 @@ ^/\*$ -^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)( All [rR]ights [rR]eserved\.)?$ +^ \* Copyright \d\d\d\d,? Google (Inc\.|LLC)$ ^ \*$ ^ \* Licensed under the Apache License, Version 2\.0 \(the "License"\);$ ^ \* you may not use this file except in compliance with the License\.$ diff --git a/synth.py b/owlbot.py similarity index 66% rename from synth.py rename to owlbot.py index 892e8d91..dca9d867 100644 --- a/synth.py +++ b/owlbot.py @@ -4,7 +4,7 @@ # 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 +# https://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, @@ -12,6 +12,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -import synthtool.languages.java as java +import synthtool as s +from synthtool.languages import java -java.common_templates() \ No newline at end of file + +for library in s.get_staging_dirs(): + # put any special-case replacements here + s.move(library) + +s.remove_staging_dirs() +java.common_templates() diff --git a/pom.xml b/pom.xml index 5e368471..84ab6056 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-appengine-admin-parent pom - 0.1.0 + 1.0.0 Google App Engine Admin API Parent https://github.com/googleapis/java-appengine-admin @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.11.0 + 0.12.0 @@ -60,23 +60,23 @@ com.google.cloud google-cloud-appengine-admin - 0.1.0 + 1.0.0 com.google.api.grpc grpc-google-cloud-appengine-admin-v1 - 0.1.0 + 1.0.0 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 0.1.0 + 1.0.0 com.google.cloud google-cloud-shared-dependencies - 0.21.0 + 1.4.0 pom import @@ -112,7 +112,7 @@ org.apache.maven.plugins maven-project-info-reports-plugin - 3.1.1 + 3.1.2 @@ -139,7 +139,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.2.0 + 3.3.0 html diff --git a/proto-google-cloud-appengine-admin-v1/pom.xml b/proto-google-cloud-appengine-admin-v1/pom.xml index 089d1fa1..0b17302c 100644 --- a/proto-google-cloud-appengine-admin-v1/pom.xml +++ b/proto-google-cloud-appengine-admin-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-appengine-admin-v1 - 0.1.0 + 1.0.0 proto-google-cloud-appengine-admin-v1 Proto library for google-cloud-appengine-admin com.google.cloud google-cloud-appengine-admin-parent - 0.1.0 + 1.0.0 diff --git a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceName.java b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceName.java index 13fee4fc..e9e2c782 100644 --- a/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceName.java +++ b/proto-google-cloud-appengine-admin-v1/src/main/java/com/google/appengine/v1/InstanceName.java @@ -244,10 +244,10 @@ public Builder setInstance(String instance) { } private Builder(InstanceName instanceName) { - app = instanceName.app; - service = instanceName.service; - version = instanceName.version; - instance = instanceName.instance; + this.app = instanceName.app; + this.service = instanceName.service; + this.version = instanceName.version; + this.instance = instanceName.instance; } public InstanceName build() { diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 37282c11..c93c3736 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.23 @@ -29,7 +29,7 @@ com.google.cloud google-cloud-appengine-admin - 0.0.0 + 0.1.3 @@ -42,7 +42,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test @@ -53,7 +53,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/pom.xml b/samples/pom.xml index 15fc7d8b..122d942c 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.18 + 1.0.23 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 42f54e25..6f807d8c 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.23 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-appengine-admin - 0.0.0 + 0.1.3 @@ -41,7 +41,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test @@ -52,7 +52,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.1.0 + 3.2.0 add-snippets-source diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index ee5e3e71..7b7fb3f8 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.12 + 1.0.23 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-appengine-admin - 0.0.0 + 0.1.3 @@ -40,7 +40,7 @@ com.google.truth truth - 1.1.2 + 1.1.3 test diff --git a/synth.metadata b/synth.metadata index 0f930e8c..e9b644b8 100644 --- a/synth.metadata +++ b/synth.metadata @@ -3,92 +3,24 @@ { "git": { "name": ".", - "remote": "https://github.com/googleapis/java-appengine-admin.git", - "sha": "8cb351b8dc4412f8080f5ffd972269a8fa22ff08" + "remote": "git@github.com:googleapis/java-appengine-admin.git", + "sha": "b1989947e17e6580c5543396fe1962fb2e4d837b" + } + }, + { + "git": { + "name": "googleapis-gen", + "remote": "https://github.com/googleapis/googleapis-gen.git", + "sha": "32337a2c2ec4d35de81519661e279ada7e3bfcf2", + "internalRef": "369574301" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "1f5e6bc8dc8e3661ee550905fc070e55e1b6cea1" + "sha": "5a6f30b8bb7672cf237c4f75d5aa96bfba170e7f" } } - ], - "generatedFiles": [ - ".github/CODEOWNERS", - ".github/ISSUE_TEMPLATE/bug_report.md", - ".github/ISSUE_TEMPLATE/feature_request.md", - ".github/ISSUE_TEMPLATE/support_request.md", - ".github/PULL_REQUEST_TEMPLATE.md", - ".github/blunderbuss.yml", - ".github/generated-files-bot.yml", - ".github/readme/synth.py", - ".github/release-please.yml", - ".github/snippet-bot.yml", - ".github/sync-repo-settings.yaml", - ".github/trusted-contribution.yml", - ".github/workflows/approve-readme.yaml", - ".github/workflows/auto-release.yaml", - ".github/workflows/ci.yaml", - ".github/workflows/samples.yaml", - ".kokoro/build.bat", - ".kokoro/build.sh", - ".kokoro/coerce_logs.sh", - ".kokoro/common.cfg", - ".kokoro/common.sh", - ".kokoro/continuous/common.cfg", - ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/readme.cfg", - ".kokoro/dependencies.sh", - ".kokoro/nightly/common.cfg", - ".kokoro/nightly/integration.cfg", - ".kokoro/nightly/java11.cfg", - ".kokoro/nightly/java7.cfg", - ".kokoro/nightly/java8-osx.cfg", - ".kokoro/nightly/java8-win.cfg", - ".kokoro/nightly/java8.cfg", - ".kokoro/nightly/samples.cfg", - ".kokoro/populate-secrets.sh", - ".kokoro/presubmit/clirr.cfg", - ".kokoro/presubmit/common.cfg", - ".kokoro/presubmit/dependencies.cfg", - ".kokoro/presubmit/integration.cfg", - ".kokoro/presubmit/java11.cfg", - ".kokoro/presubmit/java7.cfg", - ".kokoro/presubmit/java8-osx.cfg", - ".kokoro/presubmit/java8-win.cfg", - ".kokoro/presubmit/java8.cfg", - ".kokoro/presubmit/linkage-monitor.cfg", - ".kokoro/presubmit/lint.cfg", - ".kokoro/presubmit/samples.cfg", - ".kokoro/readme.sh", - ".kokoro/release/bump_snapshot.cfg", - ".kokoro/release/common.cfg", - ".kokoro/release/common.sh", - ".kokoro/release/drop.cfg", - ".kokoro/release/drop.sh", - ".kokoro/release/promote.cfg", - ".kokoro/release/promote.sh", - ".kokoro/release/publish_javadoc.cfg", - ".kokoro/release/publish_javadoc.sh", - ".kokoro/release/publish_javadoc11.cfg", - ".kokoro/release/publish_javadoc11.sh", - ".kokoro/release/snapshot.cfg", - ".kokoro/release/snapshot.sh", - ".kokoro/release/stage.cfg", - ".kokoro/release/stage.sh", - ".kokoro/trampoline.sh", - "CODE_OF_CONDUCT.md", - "CONTRIBUTING.md", - "LICENSE", - "codecov.yaml", - "java.header", - "license-checks.xml", - "renovate.json", - "samples/install-without-bom/pom.xml", - "samples/pom.xml", - "samples/snapshot/pom.xml", - "samples/snippets/pom.xml" ] } \ No newline at end of file diff --git a/versions.txt b/versions.txt index 617a2c9d..d105d4c3 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-appengine-admin:0.1.0:0.1.0 -grpc-google-cloud-appengine-admin-v1:0.1.0:0.1.0 -proto-google-cloud-appengine-admin-v1:0.1.0:0.1.0 +google-cloud-appengine-admin:1.0.0:1.0.0 +grpc-google-cloud-appengine-admin-v1:1.0.0:1.0.0 +proto-google-cloud-appengine-admin-v1:1.0.0:1.0.0