diff --git a/.github/readme/synth.metadata/synth.metadata b/.github/readme/synth.metadata/synth.metadata index 691e1c81..1b9bab23 100644 --- a/.github/readme/synth.metadata/synth.metadata +++ b/.github/readme/synth.metadata/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigqueryreservation.git", - "sha": "8fcd797def0cc8eb58fd851eb68e5f5cfde2d9a5" + "sha": "b2fe40a4b6b94c17bae44b4f1296e97b41513ce4" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "c3e41da0fa256ad7f6b4bc76b9d069dedecdfef4" + "sha": "8da7927493739fa36130360019ca21258242f73a" } } ] 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 59d2aafc..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]}")) @@ -46,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..." @@ -70,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/CHANGELOG.md b/CHANGELOG.md index f8039331..8e3b0056 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +### [1.2.2](https://www.github.com/googleapis/java-bigqueryreservation/compare/v1.2.1...v1.2.2) (2021-06-30) + + +### Bug Fixes + +* Add `shopt -s nullglob` to dependencies script ([#425](https://www.github.com/googleapis/java-bigqueryreservation/issues/425)) ([593ab3c](https://www.github.com/googleapis/java-bigqueryreservation/commit/593ab3cd1d6ba234a69ccbde246f257de67880a2)) +* Update dependencies.sh to not break on mac ([#421](https://www.github.com/googleapis/java-bigqueryreservation/issues/421)) ([04571a4](https://www.github.com/googleapis/java-bigqueryreservation/commit/04571a44cb882a570a2b28ae81aa97541e6eeab2)) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#427](https://www.github.com/googleapis/java-bigqueryreservation/issues/427)) ([b98b37d](https://www.github.com/googleapis/java-bigqueryreservation/commit/b98b37dde1d735006c38216d0c234b81b96eff81)) + ### [1.2.1](https://www.github.com/googleapis/java-bigqueryreservation/compare/v1.2.0...v1.2.1) (2021-06-04) diff --git a/README.md b/README.md index d7f3ecb2..91a4e4b0 100644 --- a/README.md +++ b/README.md @@ -17,18 +17,18 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-bigqueryreservation - 1.2.0 + 1.2.1 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-bigqueryreservation:1.2.0' +compile 'com.google.cloud:google-cloud-bigqueryreservation:1.2.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-bigqueryreservation" % "1.2.0" +libraryDependencies += "com.google.cloud" % "google-cloud-bigqueryreservation" % "1.2.1" ``` ## Authentication diff --git a/google-cloud-bigqueryreservation-bom/pom.xml b/google-cloud-bigqueryreservation-bom/pom.xml index ae00e7ce..ea584c3a 100644 --- a/google-cloud-bigqueryreservation-bom/pom.xml +++ b/google-cloud-bigqueryreservation-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigqueryreservation-bom - 1.2.1 + 1.2.2 pom com.google.cloud @@ -63,17 +63,17 @@ com.google.cloud google-cloud-bigqueryreservation - 1.2.1 + 1.2.2 com.google.api.grpc proto-google-cloud-bigqueryreservation-v1 - 1.2.1 + 1.2.2 com.google.api.grpc grpc-google-cloud-bigqueryreservation-v1 - 1.2.1 + 1.2.2 diff --git a/google-cloud-bigqueryreservation/pom.xml b/google-cloud-bigqueryreservation/pom.xml index 7f91b4d2..2155c46d 100644 --- a/google-cloud-bigqueryreservation/pom.xml +++ b/google-cloud-bigqueryreservation/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-bigqueryreservation - 1.2.1 + 1.2.2 jar Google Cloud BigQuery Reservations https://github.com/googleapis/java-bigqueryreservation @@ -11,7 +11,7 @@ com.google.cloud google-cloud-bigqueryreservation-parent - 1.2.1 + 1.2.2 google-cloud-bigqueryreservation diff --git a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/ReservationServiceStubSettings.java b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/ReservationServiceStubSettings.java index 7d90a5c8..262942d7 100644 --- a/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/ReservationServiceStubSettings.java +++ b/google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/stub/ReservationServiceStubSettings.java @@ -543,6 +543,11 @@ public static String getDefaultEndpoint() { return "bigqueryreservation.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "bigqueryreservation.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -808,6 +813,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-bigqueryreservation/src/test/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClientTest.java b/google-cloud-bigqueryreservation/src/test/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClientTest.java index 9ad33643..76377120 100644 --- a/google-cloud-bigqueryreservation/src/test/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClientTest.java +++ b/google-cloud-bigqueryreservation/src/test/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClientTest.java @@ -52,8 +52,8 @@ public class ReservationServiceClientTest { private static MockReservationService mockReservationService; private static MockServiceHelper mockServiceHelper; - private ReservationServiceClient client; private LocalChannelProvider channelProvider; + private ReservationServiceClient client; @BeforeClass public static void startStaticServer() { diff --git a/grpc-google-cloud-bigqueryreservation-v1/pom.xml b/grpc-google-cloud-bigqueryreservation-v1/pom.xml index 86a5ec8e..818874c7 100644 --- a/grpc-google-cloud-bigqueryreservation-v1/pom.xml +++ b/grpc-google-cloud-bigqueryreservation-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-bigqueryreservation-v1 - 1.2.1 + 1.2.2 grpc-google-cloud-bigqueryreservation-v1 GRPC library for grpc-google-cloud-bigqueryreservation-v1 com.google.cloud google-cloud-bigqueryreservation-parent - 1.2.1 + 1.2.2 diff --git a/pom.xml b/pom.xml index 6412d214..bbae5db3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bigqueryreservation-parent pom - 1.2.1 + 1.2.2 Google Cloud BigQuery Reservations Parent https://github.com/googleapis/java-bigqueryreservation @@ -70,23 +70,23 @@ com.google.cloud google-cloud-bigqueryreservation - 1.2.1 + 1.2.2 com.google.api.grpc proto-google-cloud-bigqueryreservation-v1 - 1.2.1 + 1.2.2 com.google.api.grpc grpc-google-cloud-bigqueryreservation-v1 - 1.2.1 + 1.2.2 com.google.cloud google-cloud-shared-dependencies - 1.3.0 + 1.4.0 pom import diff --git a/proto-google-cloud-bigqueryreservation-v1/pom.xml b/proto-google-cloud-bigqueryreservation-v1/pom.xml index 0f6da8e9..2537fe02 100644 --- a/proto-google-cloud-bigqueryreservation-v1/pom.xml +++ b/proto-google-cloud-bigqueryreservation-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-bigqueryreservation-v1 - 1.2.1 + 1.2.2 proto-google-cloud-bigqueryreservation-v1 PROTO library for proto-google-cloud-bigqueryreservation-v1 com.google.cloud google-cloud-bigqueryreservation-parent - 1.2.1 + 1.2.2 diff --git a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/AssignmentName.java b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/AssignmentName.java index ea3c3139..7ed1d662 100644 --- a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/AssignmentName.java +++ b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/AssignmentName.java @@ -256,10 +256,10 @@ public Builder setAssignment(String assignment) { } private Builder(AssignmentName assignmentName) { - project = assignmentName.project; - location = assignmentName.location; - reservation = assignmentName.reservation; - assignment = assignmentName.assignment; + this.project = assignmentName.project; + this.location = assignmentName.location; + this.reservation = assignmentName.reservation; + this.assignment = assignmentName.assignment; } public AssignmentName build() { diff --git a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/BiReservationName.java b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/BiReservationName.java index 6385ca71..dd101e49 100644 --- a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/BiReservationName.java +++ b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/BiReservationName.java @@ -182,8 +182,8 @@ public Builder setLocation(String location) { } private Builder(BiReservationName biReservationName) { - project = biReservationName.project; - location = biReservationName.location; + this.project = biReservationName.project; + this.location = biReservationName.location; } public BiReservationName build() { diff --git a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/CapacityCommitmentName.java b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/CapacityCommitmentName.java index 6c08d297..458d1e44 100644 --- a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/CapacityCommitmentName.java +++ b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/CapacityCommitmentName.java @@ -219,9 +219,9 @@ public Builder setCapacityCommitment(String capacityCommitment) { } private Builder(CapacityCommitmentName capacityCommitmentName) { - project = capacityCommitmentName.project; - location = capacityCommitmentName.location; - capacityCommitment = capacityCommitmentName.capacityCommitment; + this.project = capacityCommitmentName.project; + this.location = capacityCommitmentName.location; + this.capacityCommitment = capacityCommitmentName.capacityCommitment; } public CapacityCommitmentName build() { diff --git a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/LocationName.java b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/LocationName.java index 7289fa03..ad6f8ba8 100644 --- a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/LocationName.java +++ b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/LocationName.java @@ -181,8 +181,8 @@ public Builder setLocation(String location) { } private Builder(LocationName locationName) { - project = locationName.project; - location = locationName.location; + this.project = locationName.project; + this.location = locationName.location; } public LocationName build() { diff --git a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationName.java b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationName.java index fa7554f6..fc033607 100644 --- a/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationName.java +++ b/proto-google-cloud-bigqueryreservation-v1/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationName.java @@ -215,9 +215,9 @@ public Builder setReservation(String reservation) { } private Builder(ReservationName reservationName) { - project = reservationName.project; - location = reservationName.location; - reservation = reservationName.reservation; + this.project = reservationName.project; + this.location = reservationName.location; + this.reservation = reservationName.reservation; } public ReservationName build() { diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 997b911c..417c2fa9 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.22 + 1.0.23 @@ -29,7 +29,7 @@ com.google.cloud google-cloud-bigqueryreservation - 1.2.0 + 1.2.1 diff --git a/samples/pom.xml b/samples/pom.xml index c16d0b60..7403e2e9 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -18,7 +18,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 1ef34d63..77926af3 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 @@ -28,7 +28,7 @@ com.google.cloud google-cloud-bigqueryreservation - 1.2.0 + 1.2.1 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 45f5f7e0..f83a367f 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -14,7 +14,7 @@ com.google.cloud.samples shared-configuration - 1.0.22 + 1.0.23 @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 20.5.0 + 20.7.0 pom import @@ -41,7 +41,7 @@ com.google.cloud google-cloud-bigqueryreservation - 1.2.0 + 1.2.1 diff --git a/synth.metadata b/synth.metadata index fa98ebc7..fa65d172 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigqueryreservation.git", - "sha": "1da4140424532f8735a8252eba226ed3e52df66f" + "sha": "24d1c46d2557c28d4bdf3eac49d57aba6112a2ff" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "a5f96d06ef57e325761bad010f460d0c5dbeccda", - "internalRef": "377081269" + "sha": "551681f25e36b11829e87e580281350461f4f3f5", + "internalRef": "379784268" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "8eae0234a16b26c2ff616d305dbd9786c8b10a47" + "sha": "87254ac89a9559864c0a245d6b150406439ce3d8" } } ], @@ -101,6 +101,7 @@ "CODE_OF_CONDUCT.md", "CONTRIBUTING.md", "LICENSE", + "SECURITY.md", "codecov.yaml", "google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceClient.java", "google-cloud-bigqueryreservation/src/main/java/com/google/cloud/bigquery/reservation/v1/ReservationServiceSettings.java", diff --git a/versions.txt b/versions.txt index 2370c04e..3e1371e1 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-bigqueryreservation:1.2.1:1.2.1 -proto-google-cloud-bigqueryreservation-v1:1.2.1:1.2.1 -grpc-google-cloud-bigqueryreservation-v1:1.2.1:1.2.1 +google-cloud-bigqueryreservation:1.2.2:1.2.2 +proto-google-cloud-bigqueryreservation-v1:1.2.2:1.2.2 +grpc-google-cloud-bigqueryreservation-v1:1.2.2:1.2.2