diff --git a/.gitignore b/.gitignore index 6196f7a8..1956161c 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ api_key # Python utilities *.pyc artman-genfiles + +.flattened-pom.xml diff --git a/.kokoro/build.sh b/.kokoro/build.sh index 75b5d7ca..8fadeee1 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -39,7 +39,7 @@ retry_with_backoff 3 10 \ # if GOOGLE_APPLICATION_CREDIENTIALS 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_ROOT}/src/${GOOGLE_APPLICATION_CREDENTIALS}) + export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS}) fi RETURN_CODE=0 diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg index 40c4abb7..0048c8ec 100644 --- a/.kokoro/nightly/integration.cfg +++ b/.kokoro/nightly/integration.cfg @@ -28,14 +28,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-it-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" } diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg index 20aabd55..f2542931 100644 --- a/.kokoro/nightly/samples.cfg +++ b/.kokoro/nightly/samples.cfg @@ -24,19 +24,15 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-docs-samples-service-account" } env_vars: { - key: "ENABLE_BUILD_COP" - value: "true" + key: "SECRET_MANAGER_KEYS" + value: "java-docs-samples-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "ENABLE_BUILD_COP" + value: "true" } diff --git a/.kokoro/populate-secrets.sh b/.kokoro/populate-secrets.sh new file mode 100755 index 00000000..f5251425 --- /dev/null +++ b/.kokoro/populate-secrets.sh @@ -0,0 +1,43 @@ +#!/bin/bash +# Copyright 2020 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. + +set -eo pipefail + +function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;} +function msg { println "$*" >&2 ;} +function println { printf '%s\n' "$(now) $*" ;} + + +# Populates requested secrets set in SECRET_MANAGER_KEYS from service account: +# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com +SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager" +msg "Creating folder on disk for secrets: ${SECRET_LOCATION}" +mkdir -p ${SECRET_LOCATION} +for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g") +do + msg "Retrieving secret ${key}" + docker run --entrypoint=gcloud \ + --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \ + gcr.io/google.com/cloudsdktool/cloud-sdk \ + secrets versions access latest \ + --project cloud-devrel-kokoro-resources \ + --secret ${key} > \ + "${SECRET_LOCATION}/${key}" + if [[ $? == 0 ]]; then + msg "Secret written to ${SECRET_LOCATION}/${key}" + else + msg "Error retrieving secret ${key}" + fi +done diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg index 522e5b10..dded67a9 100644 --- a/.kokoro/presubmit/integration.cfg +++ b/.kokoro/presubmit/integration.cfg @@ -24,14 +24,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-it-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-it-service-account" } diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg index 1171aead..01e09600 100644 --- a/.kokoro/presubmit/samples.cfg +++ b/.kokoro/presubmit/samples.cfg @@ -24,14 +24,10 @@ env_vars: { env_vars: { key: "GOOGLE_APPLICATION_CREDENTIALS" - value: "keystore/73713_java_it_service_account" + value: "secret_manager/java-docs-samples-service-account" } -before_action { - fetch_keystore { - keystore_resource { - keystore_config_id: 73713 - keyname: "java_it_service_account" - } - } -} +env_vars: { + key: "SECRET_MANAGER_KEYS" + value: "java-docs-samples-service-account" +} \ No newline at end of file diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh index ba17ce01..9da0f839 100644 --- a/.kokoro/trampoline.sh +++ b/.kokoro/trampoline.sh @@ -21,4 +21,6 @@ function cleanup() { echo "cleanup"; } trap cleanup EXIT + +$(dirname $0)/populate-secrets.sh # Secret Manager secrets. python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py" diff --git a/.repo-metadata.json b/.repo-metadata.json index 1104819b..f45fb748 100644 --- a/.repo-metadata.json +++ b/.repo-metadata.json @@ -4,7 +4,7 @@ "product_documentation": "https://cloud.google.com/dataproc", "client_documentation": "https://googleapis.dev/java/google-cloud-dataproc/latest/", "issue_tracker": "https://issuetracker.google.com/savedsearches/559745", - "release_level": "beta", + "release_level": "ga", "language": "java", "repo": "googleapis/java-dataproc", "repo_short": "java-dataproc", diff --git a/CHANGELOG.md b/CHANGELOG.md index f70f6317..d0daab13 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Changelog +## [1.0.0](https://www.github.com/googleapis/java-dataproc/compare/v0.122.3...v1.0.0) (2020-06-17) + + +### Features + +* promote to GA ([#226](https://www.github.com/googleapis/java-dataproc/issues/226)) ([3edcdfc](https://www.github.com/googleapis/java-dataproc/commit/3edcdfcb5ae060e4f83782dac8ae29bc3c26a5a6)) +* **deps:** adopt flatten plugin and google-cloud-shared-dependencies ([#228](https://www.github.com/googleapis/java-dataproc/issues/228)) ([31a94aa](https://www.github.com/googleapis/java-dataproc/commit/31a94aa465e850258a23637588cc89db9f726825)) + + +### Dependencies + +* update dependency com.google.protobuf:protobuf-java to v3.12.2 ([#192](https://www.github.com/googleapis/java-dataproc/issues/192)) ([7762282](https://www.github.com/googleapis/java-dataproc/commit/7762282f57212548d6091b34e8e1ce5bc90c711e)) +* update dependency io.grpc:grpc-bom to v1.30.0 ([#209](https://www.github.com/googleapis/java-dataproc/issues/209)) ([141db4b](https://www.github.com/googleapis/java-dataproc/commit/141db4b85428264b35dfa8a7501e90c09e06b2e4)) + ### [0.122.3](https://www.github.com/googleapis/java-dataproc/compare/v0.122.2...v0.122.3) (2020-06-09) diff --git a/README.md b/README.md index 21740076..2fa2245d 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ Java idiomatic client for [Dataproc][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 If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file @@ -20,7 +17,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file com.google.cloud libraries-bom - 5.5.0 + 5.7.0 pom import @@ -41,7 +38,7 @@ If you are using Maven without BOM, add this to your dependencies: com.google.cloud google-cloud-dataproc - 0.122.1 + 0.122.3 ``` @@ -50,11 +47,11 @@ If you are using Maven without BOM, add this to your dependencies: If you are using Gradle, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-dataproc:0.122.3' +compile 'com.google.cloud:google-cloud-dataproc:1.0.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "0.122.3" +libraryDependencies += "com.google.cloud" % "google-cloud-dataproc" % "1.0.0" ``` [//]: # ({x-version-update-end}) @@ -108,9 +105,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 @@ -148,7 +142,7 @@ Java 11 | [![Kokoro CI][kokoro-badge-image-5]][kokoro-badge-link-5] [kokoro-badge-link-4]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataproc/java8-win.html [kokoro-badge-image-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataproc/java11.svg [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-dataproc/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-dataproc.svg [maven-version-link]: https://search.maven.org/search?q=g:com.google.cloud%20AND%20a:google-cloud-dataproc&core=gav [authentication]: https://github.com/googleapis/google-cloud-java#authentication diff --git a/google-cloud-dataproc-bom/pom.xml b/google-cloud-dataproc-bom/pom.xml index fc89f80b..95214f19 100644 --- a/google-cloud-dataproc-bom/pom.xml +++ b/google-cloud-dataproc-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-dataproc-bom - 0.122.3 + 1.0.0 pom com.google.cloud google-cloud-shared-config - 0.6.0 + 0.8.1 Google Cloud Dataproc BOM @@ -64,27 +64,27 @@ com.google.cloud google-cloud-dataproc - 0.122.3 + 1.0.0 com.google.api.grpc proto-google-cloud-dataproc-v1beta2 - 0.87.3 + 0.88.0 com.google.api.grpc grpc-google-cloud-dataproc-v1 - 0.87.3 + 1.0.0 com.google.api.grpc proto-google-cloud-dataproc-v1 - 0.87.3 + 1.0.0 com.google.api.grpc grpc-google-cloud-dataproc-v1beta2 - 0.87.3 + 0.88.0 diff --git a/google-cloud-dataproc/pom.xml b/google-cloud-dataproc/pom.xml index 8131797b..31f7e178 100644 --- a/google-cloud-dataproc/pom.xml +++ b/google-cloud-dataproc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-dataproc - 0.122.3 + 1.0.0 jar Google Cloud Dataproc https://github.com/googleapis/java-dataproc @@ -11,7 +11,7 @@ com.google.cloud google-cloud-dataproc-parent - 0.122.3 + 1.0.0 google-cloud-dataproc @@ -112,4 +112,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-dataproc-v1/pom.xml b/grpc-google-cloud-dataproc-v1/pom.xml index 6d6d9e03..40522d97 100644 --- a/grpc-google-cloud-dataproc-v1/pom.xml +++ b/grpc-google-cloud-dataproc-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dataproc-v1 - 0.87.3 + 1.0.0 grpc-google-cloud-dataproc-v1 GRPC library for grpc-google-cloud-dataproc-v1 com.google.cloud google-cloud-dataproc-parent - 0.122.3 + 1.0.0 @@ -57,4 +57,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/grpc-google-cloud-dataproc-v1beta2/pom.xml b/grpc-google-cloud-dataproc-v1beta2/pom.xml index 052f83a5..d021ce15 100644 --- a/grpc-google-cloud-dataproc-v1beta2/pom.xml +++ b/grpc-google-cloud-dataproc-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-dataproc-v1beta2 - 0.87.3 + 0.88.0 grpc-google-cloud-dataproc-v1beta2 GRPC library for grpc-google-cloud-dataproc-v1beta2 com.google.cloud google-cloud-dataproc-parent - 0.122.3 + 1.0.0 @@ -57,4 +57,13 @@ + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index a85e705c..1fc85658 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-dataproc-parent pom - 0.122.3 + 1.0.0 Google Cloud Dataproc Parent https://github.com/googleapis/java-dataproc @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.6.0 + 0.8.1 @@ -63,17 +63,6 @@ UTF-8 github google-cloud-dataproc-parent - 1.93.5 - 1.9.2 - 1.18.0 - 1.56.0 - 1.29.0 - 3.12.0 - 4.13 - 29.0-android - 1.4.4 - 1.3.2 - 1.18 @@ -81,98 +70,41 @@ com.google.api.grpc proto-google-cloud-dataproc-v1beta2 - 0.87.3 + 0.88.0 com.google.api.grpc proto-google-cloud-dataproc-v1 - 0.87.3 + 1.0.0 com.google.api.grpc grpc-google-cloud-dataproc-v1 - 0.87.3 + 1.0.0 com.google.api.grpc grpc-google-cloud-dataproc-v1beta2 - 0.87.3 + 0.88.0 com.google.cloud google-cloud-dataproc - 0.122.3 + 1.0.0 - io.grpc - grpc-bom - ${grpc.version} - pom - import - - - com.google.api - gax-bom - ${gax.version} - pom - import - - - com.google.guava - guava-bom - ${guava.version} + com.google.cloud + google-cloud-shared-dependencies + 0.8.1 pom import - - com.google.protobuf - protobuf-java - ${protobuf.version} - - - com.google.api - api-common - ${google.api-common.version} - - - com.google.api.grpc - proto-google-common-protos - ${google.common-protos.version} - - - com.google.cloud - google-cloud-core - ${google.core.version} - - - org.threeten - threetenbp - ${threeten.version} - - - javax.annotation - javax.annotation-api - ${javax.annotations.version} - - - org.codehaus.mojo - animal-sniffer-annotations - ${animal-sniffer.version} - - junit junit - ${junit.version} - test - - - com.google.api - gax-grpc - ${gax.version} - testlib + 4.13 test @@ -264,7 +196,7 @@ https://developers.google.com/protocol-buffers/docs/reference/java/ https://googleapis.dev/java/google-auth-library/latest/ https://googleapis.dev/java/gax/latest/ - https://googleapis.github.io/api-common-java/${google.api-common.version}/apidocs/ + https://googleapis.github.io/api-common-java/ diff --git a/proto-google-cloud-dataproc-v1/pom.xml b/proto-google-cloud-dataproc-v1/pom.xml index a9c5dd34..5aa08284 100644 --- a/proto-google-cloud-dataproc-v1/pom.xml +++ b/proto-google-cloud-dataproc-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dataproc-v1 - 0.87.3 + 1.0.0 proto-google-cloud-dataproc-v1 PROTO library for proto-google-cloud-dataproc-v1 com.google.cloud google-cloud-dataproc-parent - 0.122.3 + 1.0.0 @@ -30,4 +30,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/proto-google-cloud-dataproc-v1beta2/pom.xml b/proto-google-cloud-dataproc-v1beta2/pom.xml index 2fe2be87..f042612c 100644 --- a/proto-google-cloud-dataproc-v1beta2/pom.xml +++ b/proto-google-cloud-dataproc-v1beta2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-dataproc-v1beta2 - 0.87.3 + 0.88.0 proto-google-cloud-dataproc-v1beta2 PROTO library for proto-google-cloud-dataproc-v1beta2 com.google.cloud google-cloud-dataproc-parent - 0.122.3 + 1.0.0 @@ -30,4 +30,13 @@ guava + + + + + org.codehaus.mojo + flatten-maven-plugin + + + \ No newline at end of file diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 5c5182a1..10296412 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.17 + 1.0.18 @@ -29,7 +29,7 @@ com.google.cloud google-cloud-dataproc - 0.122.1 + 0.122.3 diff --git a/samples/pom.xml b/samples/pom.xml index 29e710e7..aef99518 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.17 + 1.0.18 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index ab260194..3a270902 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.17 + 1.0.18 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-dataproc - 0.122.1 + 0.122.3 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 5e1594f2..03d45439 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.17 + 1.0.18 @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 5.5.0 + 7.0.0 pom import diff --git a/synth.metadata b/synth.metadata index ed1ef450..8f8201ab 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,30 +4,30 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-dataproc.git", - "sha": "d1903ac932de256fd813b12b1f15e3cccb45d811" + "sha": "014be727560796f95d1c80207ff4adffbd91802b" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "60c7a4c6e8d1f4e4179d46bbad6239abc898dc40", - "internalRef": "315548051" + "sha": "91b7e0e581f4a74852ac1af7cfa693c88aa2bef3", + "internalRef": "315988875" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "60c7a4c6e8d1f4e4179d46bbad6239abc898dc40", - "internalRef": "315548051" + "sha": "91b7e0e581f4a74852ac1af7cfa693c88aa2bef3", + "internalRef": "315988875" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "987270824bd26f6a8c716d5e2022057b8ae7b26e" + "sha": "c4f3059c27591eb24d6942a0e357ec94c80459f2" } } ], diff --git a/versions.txt b/versions.txt index 3d49f228..76785b3d 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Format: # module:released-version:current-version -proto-google-cloud-dataproc-v1beta2:0.87.3:0.87.3 -proto-google-cloud-dataproc-v1:0.87.3:0.87.3 -grpc-google-cloud-dataproc-v1:0.87.3:0.87.3 -grpc-google-cloud-dataproc-v1beta2:0.87.3:0.87.3 -google-cloud-dataproc:0.122.3:0.122.3 +proto-google-cloud-dataproc-v1beta2:0.88.0:0.88.0 +proto-google-cloud-dataproc-v1:1.0.0:1.0.0 +grpc-google-cloud-dataproc-v1:1.0.0:1.0.0 +grpc-google-cloud-dataproc-v1beta2:0.88.0:0.88.0 +google-cloud-dataproc:1.0.0:1.0.0