diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index a32a9e04..4679ddcc 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: - digest: sha256:ee698481139bf3df35cd83d2f17f9670ee914d6184f8909a81d672a6abaf0e72 - image: gcr.io/repo-automation-bots/owlbot-java:latest \ No newline at end of file + image: gcr.io/repo-automation-bots/owlbot-java:latest + digest: sha256:177dd09a218f3a4f613685cb775ac1abbb1b0f0269781cbbd825fb3e28ebc410 diff --git a/.github/release-please.yml b/.github/release-please.yml index 8ca7f9ca..7bf58076 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,3 +1,8 @@ bumpMinorPreMajor: true handleGHRelease: true releaseType: java-yoshi +branches: + - bumpMinorPreMajor: true + handleGHRelease: true + releaseType: java-yoshi + branch: java7 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index e100454f..ffd39f6f 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -1,49 +1,44 @@ - -# Whether or not rebase-merging is enabled on this repository. -# Defaults to `true` rebaseMergeAllowed: false - -# Whether or not squash-merging is enabled on this repository. -# Defaults to `true` squashMergeAllowed: true - -# Whether or not PRs are merged with a merge commit on this repository. -# Defaults to `false` mergeCommitAllowed: false - -# Rules for master branch protection branchProtectionRules: -# Identifies the protection rule pattern. Name of the branch to be protected. -# Defaults to `master` -- pattern: master - # Can admins overwrite branch protection. - # Defaults to `true` - isAdminEnforced: true - # Number of approving reviews required to update matching branches. - # Defaults to `1` - requiredApprovingReviewCount: 1 - # Are reviews from code owners required to update matching branches. - # Defaults to `false` - requiresCodeOwnerReviews: true - # Require up to date branches - requiresStrictStatusChecks: false - # List of required status check contexts that must pass for commits to be accepted to matching branches. - requiredStatusCheckContexts: - - "dependencies (8)" - - "dependencies (11)" - - "linkage-monitor" - - "lint" - - "clirr" - - "units (7)" - - "units (8)" - - "units (11)" - - "Kokoro - Test: Integration" - - "cla/google" -# List of explicit permissions to add (additive only) + - pattern: master + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor + - pattern: java7 + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - dependencies (8) + - dependencies (11) + - linkage-monitor + - lint + - clirr + - units (7) + - units (8) + - units (11) + - 'Kokoro - Test: Integration' + - cla/google + - OwlBot Post Processor permissionRules: -- team: yoshi-admins - permission: admin -- team: yoshi-java-admins - permission: admin -- team: yoshi-java - permission: push + - team: yoshi-admins + permission: admin + - team: yoshi-java-admins + permission: admin + - team: yoshi-java + permission: push 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 187a3894..331cacb5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,33 @@ # Changelog +## [0.2.0](https://www.github.com/googleapis/java-binary-authorization/compare/v0.1.1...v0.2.0) (2021-08-09) + + +### ⚠ BREAKING CHANGES + +* release gapic-generator-java v2.0.0 (#47) + +### Features + +* release gapic-generator-java v2.0.0 ([#47](https://www.github.com/googleapis/java-binary-authorization/issues/47)) ([6e8fd4b](https://www.github.com/googleapis/java-binary-authorization/commit/6e8fd4b1fb93b8075af8c2536655e7d213c1622a)) + + +### Bug Fixes + +* Add `shopt -s nullglob` to dependencies script ([#1130](https://www.github.com/googleapis/java-binary-authorization/issues/1130)) ([#26](https://www.github.com/googleapis/java-binary-authorization/issues/26)) ([0b7ea96](https://www.github.com/googleapis/java-binary-authorization/commit/0b7ea968aedb1824a84e1a9abd35feae17ee3b3b)) +* owlbot post-processor should generate README ([#1154](https://www.github.com/googleapis/java-binary-authorization/issues/1154)) ([#31](https://www.github.com/googleapis/java-binary-authorization/issues/31)) ([d40ffa2](https://www.github.com/googleapis/java-binary-authorization/commit/d40ffa289be02aa3e6bcfe9c50d688e2905addd1)), closes [#1146](https://www.github.com/googleapis/java-binary-authorization/issues/1146) [#1147](https://www.github.com/googleapis/java-binary-authorization/issues/1147) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v1.4.0 ([#28](https://www.github.com/googleapis/java-binary-authorization/issues/28)) ([4dda105](https://www.github.com/googleapis/java-binary-authorization/commit/4dda105fe56704810a5157afd17af47aadb4e67e)) +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2 ([#48](https://www.github.com/googleapis/java-binary-authorization/issues/48)) ([c069652](https://www.github.com/googleapis/java-binary-authorization/commit/c06965200207f3784ff1517c8e5da7275649d254)) + + +### Documentation + +* Replace "global policy" with "system policy" in Binary Authorization documentation ([#45](https://www.github.com/googleapis/java-binary-authorization/issues/45)) ([7ee7f88](https://www.github.com/googleapis/java-binary-authorization/commit/7ee7f88b06bd51c018f7e43b28b415b069d92ccd)) + ### [0.1.1](https://www.github.com/googleapis/java-binary-authorization/compare/v0.1.0...v0.1.1) (2021-06-09) diff --git a/README.md b/README.md index e07c8d04..84191b0d 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Binary Authorization Client for Java +# Google Binary Authorization Client for Java Java idiomatic client for [Binary Authorization][product-docs]. @@ -20,18 +20,18 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-binary-authorization - 0.0.0 + 0.1.1 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -compile 'com.google.cloud:google-cloud-binary-authorization:0.0.0' +compile 'com.google.cloud:google-cloud-binary-authorization:0.1.1' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-binary-authorization" % "0.0.0" +libraryDependencies += "com.google.cloud" % "google-cloud-binary-authorization" % "0.1.1" ``` ## Authentication @@ -43,7 +43,7 @@ See the [Authentication][authentication] section in the base directory's README. ### Prerequisites You will need a [Google Cloud Platform Console][developer-console] project with the Binary Authorization [API enabled][enable-api]. -You will need to [enable billing][enable-billing] to use Binary Authorization. +You will need to [enable billing][enable-billing] to use Google Binary Authorization. [Follow these instructions][create-project] to get your project set up. You will also need to set up the local development environment by [installing the Google Cloud SDK][cloud-sdk] and running the following commands in command line: `gcloud auth login` and `gcloud config set project [YOUR PROJECT ID]`. @@ -56,12 +56,16 @@ to add `google-cloud-binary-authorization` as a dependency in your code. ## About Binary Authorization -[Binary Authorization][product-docs] is a service on Google Cloud that provides centralized software supply-chain security for applications that run on Google Kubernetes Engine (GKE) and Anthos clusters on VMware. - +[Binary Authorization][product-docs] is a service on Google Cloud that provides centralized software supply-chain security for applications that run on Google Kubernetes Engine (GKE) and Anthos clusters on VMware See the [Binary Authorization client library docs][javadocs] to learn how to use this Binary Authorization Client Library. + + + + + ## Troubleshooting To get help, follow the instructions in the [shared Troubleshooting document][troubleshooting]. @@ -70,10 +74,50 @@ To get help, follow the instructions in the [shared Troubleshooting document][tr Binary Authorization uses gRPC for the transport layer. -## Java Versions +## Supported Java Versions Java 7 or above is required for using this client. +Google's Java client libraries, +[Google Cloud Client Libraries][cloudlibs] +and +[Google Cloud API Libraries][apilibs], +follow the +[Oracle Java SE support roadmap][oracle] +(see the Oracle Java SE Product Releases section). + +### For new development + +In general, new feature development occurs with support for the lowest Java +LTS version covered by Oracle's Premier Support (which typically lasts 5 years +from initial General Availability). If the minimum required JVM for a given +library is changed, it is accompanied by a [semver][semver] major release. + +Java 11 and (in September 2021) Java 17 are the best choices for new +development. + +### Keeping production systems current + +Google tests its client libraries with all current LTS versions covered by +Oracle's Extended Support (which typically lasts 8 years from initial +General Availability). + +#### Legacy support + +Google's client libraries support legacy versions of Java runtimes with long +term stable libraries that don't receive feature updates on a best efforts basis +as it may not be possible to backport all patches. + +Google provides updates on a best efforts basis to apps that continue to use +Java 7, though apps might need to upgrade to current versions of the library +that supports their JVM. + +#### Where to find specific information + +The latest versions and the supported Java versions are identified on +the individual GitHub repository `github.com/GoogleAPIs/java-SERVICENAME` +and on [google-cloud-java][g-c-j]. + ## Versioning @@ -110,7 +154,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/binary-authorization/docs/ +[product-docs]: https://cloud.google.com/binary-authorization/docs [javadocs]: https://googleapis.dev/java/google-cloud-binary-authorization/latest/index.html [kokoro-badge-image-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-binary-authorization/java7.svg [kokoro-badge-link-1]: http://storage.googleapis.com/cloud-devrel-public/java/badges/java-binary-authorization/java7.html @@ -136,4 +180,10 @@ Java is a registered trademark of Oracle and/or its affiliates. [enable-billing]: https://cloud.google.com/apis/docs/getting-started#enabling_billing [enable-api]: https://console.cloud.google.com/flows/enableapi?apiid=binary-authorization.googleapis.com [libraries-bom]: https://github.com/GoogleCloudPlatform/cloud-opensource-java/wiki/The-Google-Cloud-Platform-Libraries-BOM -[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png \ No newline at end of file +[shell_img]: https://gstatic.com/cloudssh/images/open-btn.png + +[semver]: https://semver.org/ +[cloudlibs]: https://cloud.google.com/apis/docs/client-libraries-explained +[apilibs]: https://cloud.google.com/apis/docs/client-libraries-explained#google_api_client_libraries +[oracle]: https://www.oracle.com/java/technologies/java-se-support-roadmap.html +[g-c-j]: http://github.com/googleapis/google-cloud-java diff --git a/google-cloud-binary-authorization-bom/pom.xml b/google-cloud-binary-authorization-bom/pom.xml index 8f716206..7f20e72d 100644 --- a/google-cloud-binary-authorization-bom/pom.xml +++ b/google-cloud-binary-authorization-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-binary-authorization-bom - 0.1.1 + 0.2.0 pom com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 Google Binary Authorization BOM @@ -56,17 +56,17 @@ com.google.cloud google-cloud-binary-authorization - 0.1.1 + 0.2.0 com.google.api.grpc grpc-google-cloud-binary-authorization-v1beta1 - 0.1.1 + 0.2.0 com.google.api.grpc proto-google-cloud-binary-authorization-v1beta1 - 0.1.1 + 0.2.0 diff --git a/google-cloud-binary-authorization/pom.xml b/google-cloud-binary-authorization/pom.xml index 98202ed3..39d566b7 100644 --- a/google-cloud-binary-authorization/pom.xml +++ b/google-cloud-binary-authorization/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-binary-authorization - 0.1.1 + 0.2.0 jar Google Binary Authorization https://github.com/googleapis/java-binary-authorization @@ -11,7 +11,7 @@ com.google.cloud google-cloud-binary-authorization-parent - 0.1.1 + 0.2.0 google-cloud-binary-authorization diff --git a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Client.java b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Client.java index 3eeb3e63..99b13ea5 100644 --- a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Client.java +++ b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Client.java @@ -16,7 +16,6 @@ package com.google.cloud.binaryauthorization.v1beta1; -import com.google.api.core.ApiFunction; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.api.core.BetaApi; @@ -981,12 +980,7 @@ public static ApiFuture createAsync( ListAttestorsPage.createEmptyPage().createPageAsync(context, futureResponse); return ApiFutures.transform( futurePage, - new ApiFunction() { - @Override - public ListAttestorsPagedResponse apply(ListAttestorsPage input) { - return new ListAttestorsPagedResponse(input); - } - }, + input -> new ListAttestorsPagedResponse(input), MoreExecutors.directExecutor()); } diff --git a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Settings.java b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Settings.java index 58888917..a088c822 100644 --- a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Settings.java +++ b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1Settings.java @@ -202,14 +202,13 @@ public BinauthzManagementServiceV1Beta1StubSettings.Builder getStubSettingsBuild return ((BinauthzManagementServiceV1Beta1StubSettings.Builder) getStubSettings()); } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods( getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); return this; diff --git a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/BinauthzManagementServiceV1Beta1StubSettings.java b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/BinauthzManagementServiceV1Beta1StubSettings.java index 17415033..c7ff00a5 100644 --- a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/BinauthzManagementServiceV1Beta1StubSettings.java +++ b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/BinauthzManagementServiceV1Beta1StubSettings.java @@ -224,6 +224,11 @@ public static String getDefaultEndpoint() { return "binaryauthorization.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "binaryauthorization.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -394,6 +399,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); } @@ -437,14 +444,13 @@ private static Builder initDefaults(Builder builder) { return builder; } - // NEXT_MAJOR_VER: remove 'throws Exception'. /** * Applies the given settings updater function to all of the unary API methods in this service. * *

Note: This method does not support applying settings to streaming methods. */ public Builder applyToAllUnaryMethods( - ApiFunction, Void> settingsUpdater) throws Exception { + ApiFunction, Void> settingsUpdater) { super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater); return this; } diff --git a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/GrpcBinauthzManagementServiceV1Beta1Stub.java b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/GrpcBinauthzManagementServiceV1Beta1Stub.java index 9d6d8f6c..1a27b55a 100644 --- a/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/GrpcBinauthzManagementServiceV1Beta1Stub.java +++ b/google-cloud-binary-authorization/src/main/java/com/google/cloud/binaryauthorization/v1beta1/stub/GrpcBinauthzManagementServiceV1Beta1Stub.java @@ -24,7 +24,6 @@ import com.google.api.gax.grpc.GrpcCallSettings; import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; -import com.google.api.gax.rpc.RequestParamsExtractor; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.binaryauthorization.v1beta1.Attestor; import com.google.cloud.binaryauthorization.v1beta1.CreateAttestorRequest; @@ -42,7 +41,6 @@ import io.grpc.MethodDescriptor; import io.grpc.protobuf.ProtoUtils; import java.io.IOException; -import java.util.Map; import java.util.concurrent.TimeUnit; import javax.annotation.Generated; @@ -188,91 +186,70 @@ protected GrpcBinauthzManagementServiceV1Beta1Stub( GrpcCallSettings.newBuilder() .setMethodDescriptor(getPolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetPolicyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updatePolicyTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updatePolicyMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdatePolicyRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("policy.name", String.valueOf(request.getPolicy().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("policy.name", String.valueOf(request.getPolicy().getName())); + return params.build(); }) .build(); GrpcCallSettings createAttestorTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(createAttestorMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(CreateAttestorRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings getAttestorTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(getAttestorMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(GetAttestorRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); GrpcCallSettings updateAttestorTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(updateAttestorMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(UpdateAttestorRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("attestor.name", String.valueOf(request.getAttestor().getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("attestor.name", String.valueOf(request.getAttestor().getName())); + return params.build(); }) .build(); GrpcCallSettings listAttestorsTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(listAttestorsMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(ListAttestorsRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("parent", String.valueOf(request.getParent())); + return params.build(); }) .build(); GrpcCallSettings deleteAttestorTransportSettings = GrpcCallSettings.newBuilder() .setMethodDescriptor(deleteAttestorMethodDescriptor) .setParamsExtractor( - new RequestParamsExtractor() { - @Override - public Map extract(DeleteAttestorRequest request) { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); - } + request -> { + ImmutableMap.Builder params = ImmutableMap.builder(); + params.put("name", String.valueOf(request.getName())); + return params.build(); }) .build(); @@ -352,7 +329,13 @@ public UnaryCallable deleteAttestorCallable() { @Override public final void close() { - shutdown(); + try { + backgroundResources.close(); + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { + throw new IllegalStateException("Failed to close resource", e); + } } @Override diff --git a/google-cloud-binary-authorization/src/test/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1ClientTest.java b/google-cloud-binary-authorization/src/test/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1ClientTest.java index c7877052..6f97d6db 100644 --- a/google-cloud-binary-authorization/src/test/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1ClientTest.java +++ b/google-cloud-binary-authorization/src/test/java/com/google/cloud/binaryauthorization/v1beta1/BinauthzManagementServiceV1Beta1ClientTest.java @@ -48,8 +48,8 @@ public class BinauthzManagementServiceV1Beta1ClientTest { private static MockBinauthzManagementServiceV1Beta1 mockBinauthzManagementServiceV1Beta1; private static MockServiceHelper mockServiceHelper; - private BinauthzManagementServiceV1Beta1Client client; private LocalChannelProvider channelProvider; + private BinauthzManagementServiceV1Beta1Client client; @BeforeClass public static void startStaticServer() { diff --git a/grpc-google-cloud-binary-authorization-v1beta1/pom.xml b/grpc-google-cloud-binary-authorization-v1beta1/pom.xml index cebe0498..87dc081c 100644 --- a/grpc-google-cloud-binary-authorization-v1beta1/pom.xml +++ b/grpc-google-cloud-binary-authorization-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-binary-authorization-v1beta1 - 0.1.1 + 0.2.0 grpc-google-cloud-binary-authorization-v1beta1 GRPC library for google-cloud-binary-authorization com.google.cloud google-cloud-binary-authorization-parent - 0.1.1 + 0.2.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/pom.xml b/pom.xml index 92cec48a..b061c912 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-binary-authorization-parent pom - 0.1.1 + 0.2.0 Google Binary Authorization Parent https://github.com/googleapis/java-binary-authorization @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 0.12.0 + 1.0.0 @@ -60,23 +60,23 @@ com.google.cloud google-cloud-binary-authorization - 0.1.1 + 0.2.0 com.google.api.grpc grpc-google-cloud-binary-authorization-v1beta1 - 0.1.1 + 0.2.0 com.google.api.grpc proto-google-cloud-binary-authorization-v1beta1 - 0.1.1 + 0.2.0 com.google.cloud google-cloud-shared-dependencies - 1.3.0 + 2.0.0 pom import diff --git a/proto-google-cloud-binary-authorization-v1beta1/pom.xml b/proto-google-cloud-binary-authorization-v1beta1/pom.xml index 31f3635b..1d0106f3 100644 --- a/proto-google-cloud-binary-authorization-v1beta1/pom.xml +++ b/proto-google-cloud-binary-authorization-v1beta1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-binary-authorization-v1beta1 - 0.1.1 + 0.2.0 proto-google-cloud-binary-authorization-v1beta1 Proto library for google-cloud-binary-authorization com.google.cloud google-cloud-binary-authorization-parent - 0.1.1 + 0.2.0 diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AttestorName.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AttestorName.java index c5356a3d..450da7b8 100644 --- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AttestorName.java +++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/AttestorName.java @@ -181,8 +181,8 @@ public Builder setAttestor(String attestor) { } private Builder(AttestorName attestorName) { - project = attestorName.project; - attestor = attestorName.attestor; + this.project = attestorName.project; + this.attestor = attestorName.attestor; } public AttestorName build() { diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java index bf0c612f..c8e61918 100644 --- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java +++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/Policy.java @@ -230,7 +230,7 @@ public enum GlobalPolicyEvaluationMode implements com.google.protobuf.ProtocolMe * * *

-     * Enables global policy evaluation.
+     * Enables system policy evaluation.
      * 
* * ENABLE = 1; @@ -240,7 +240,7 @@ public enum GlobalPolicyEvaluationMode implements com.google.protobuf.ProtocolMe * * *
-     * Disables global policy evaluation.
+     * Disables system policy evaluation.
      * 
* * DISABLE = 2; @@ -263,7 +263,7 @@ public enum GlobalPolicyEvaluationMode implements com.google.protobuf.ProtocolMe * * *
-     * Enables global policy evaluation.
+     * Enables system policy evaluation.
      * 
* * ENABLE = 1; @@ -273,7 +273,7 @@ public enum GlobalPolicyEvaluationMode implements com.google.protobuf.ProtocolMe * * *
-     * Disables global policy evaluation.
+     * Disables system policy evaluation.
      * 
* * DISABLE = 2; diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PolicyName.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PolicyName.java index aedfaefb..80c0bb2a 100644 --- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PolicyName.java +++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/PolicyName.java @@ -158,7 +158,7 @@ public Builder setProject(String project) { } private Builder(PolicyName policyName) { - project = policyName.project; + this.project = policyName.project; } public PolicyName build() { diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ProjectName.java b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ProjectName.java index 74860388..657e1a23 100644 --- a/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ProjectName.java +++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/java/com/google/cloud/binaryauthorization/v1beta1/ProjectName.java @@ -158,7 +158,7 @@ public Builder setProject(String project) { } private Builder(ProjectName projectName) { - project = projectName.project; + this.project = projectName.project; } public ProjectName build() { diff --git a/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/resources.proto b/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/resources.proto index ea674a7c..b596df9b 100644 --- a/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/resources.proto +++ b/proto-google-cloud-binary-authorization-v1beta1/src/main/proto/google/cloud/binaryauthorization/v1beta1/resources.proto @@ -43,10 +43,10 @@ message Policy { // Not specified: DISABLE is assumed. GLOBAL_POLICY_EVALUATION_MODE_UNSPECIFIED = 0; - // Enables global policy evaluation. + // Enables system policy evaluation. ENABLE = 1; - // Disables global policy evaluation. + // Disables system policy evaluation. DISABLE = 2; } diff --git a/renovate.json b/renovate.json index 91da438b..8f1535f2 100644 --- a/renovate.json +++ b/renovate.json @@ -69,5 +69,8 @@ } ], "semanticCommits": true, - "masterIssue": true + "dependencyDashboard": true, + "dependencyDashboardLabels": [ + "type: process" + ] } diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index aec34f73..565a891d 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-binary-authorization - 0.1.0 + 0.1.1 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 8684feb2..10db73d1 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-binary-authorization - 0.1.0 + 0.1.1 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 18c127f4..1a1401ff 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-binary-authorization - 0.1.0 + 0.1.1 diff --git a/versions.txt b/versions.txt index 038952a1..3cfcbb02 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-binary-authorization:0.1.1:0.1.1 -grpc-google-cloud-binary-authorization-v1beta1:0.1.1:0.1.1 -proto-google-cloud-binary-authorization-v1beta1:0.1.1:0.1.1 +google-cloud-binary-authorization:0.2.0:0.2.0 +grpc-google-cloud-binary-authorization-v1beta1:0.2.0:0.2.0 +proto-google-cloud-binary-authorization-v1beta1:0.2.0:0.2.0