diff --git a/.github/.OwlBot.yaml b/.github/.OwlBot.yaml index 1b01ecd..690d1ca 100644 --- a/.github/.OwlBot.yaml +++ b/.github/.OwlBot.yaml @@ -16,6 +16,7 @@ docker: image: "gcr.io/cloud-devrel-public-resources/owlbot-java:latest" deep-remove-regex: +- "/samples/snippets/generated" - "/grpc-google-.*/src" - "/proto-google-.*/src" - "/google-.*/src" @@ -30,3 +31,5 @@ deep-copy-regex: dest: "/owl-bot-staging/$1/grpc-google-cloud-run-$1/src" - source: "/google/cloud/run/(v.*)/.*-java/gapic-google-.*/src" dest: "/owl-bot-staging/$1/google-cloud-run/src" +- source: "/google/cloud/run/(v.*)/.*-java/samples/snippets/generated" + dest: "/owl-bot-staging/$1/samples/snippets/generated" diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d4b2f7..2bc1e37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.2.1](https://github.com/googleapis/java-run/compare/v0.2.0...v0.2.1) (2022-06-23) + + +### Dependencies + +* update dependency com.google.cloud:google-cloud-shared-dependencies to v2.13.0 ([#43](https://github.com/googleapis/java-run/issues/43)) ([230cb26](https://github.com/googleapis/java-run/commit/230cb26b1e2b257b403849d896aa566332af63ca)) + ## [0.2.0](https://github.com/googleapis/java-run/compare/v0.1.2...v0.2.0) (2022-05-19) diff --git a/README.md b/README.md index 91e98c0..3937952 100644 --- a/README.md +++ b/README.md @@ -22,20 +22,20 @@ If you are using Maven, add this to your pom.xml file: com.google.cloud google-cloud-run - 0.1.2 + 0.2.0 ``` If you are using Gradle without BOM, add this to your dependencies ```Groovy -implementation 'com.google.cloud:google-cloud-run:0.1.2' +implementation 'com.google.cloud:google-cloud-run:0.2.0' ``` If you are using SBT, add this to your dependencies ```Scala -libraryDependencies += "com.google.cloud" % "google-cloud-run" % "0.1.2" +libraryDependencies += "com.google.cloud" % "google-cloud-run" % "0.2.0" ``` ## Authentication diff --git a/google-cloud-run-bom/pom.xml b/google-cloud-run-bom/pom.xml index c6faa27..28c6201 100644 --- a/google-cloud-run-bom/pom.xml +++ b/google-cloud-run-bom/pom.xml @@ -3,12 +3,12 @@ 4.0.0 com.google.cloud google-cloud-run-bom - 0.2.0 + 0.2.1 pom com.google.cloud google-cloud-shared-config - 1.4.0 + 1.5.0 Google Cloud Run BOM @@ -65,17 +65,17 @@ com.google.cloud google-cloud-run - 0.2.0 + 0.2.1 com.google.api.grpc grpc-google-cloud-run-v2 - 0.2.0 + 0.2.1 com.google.api.grpc proto-google-cloud-run-v2 - 0.2.0 + 0.2.1 diff --git a/google-cloud-run/clirr-ignored-differences.xml b/google-cloud-run/clirr-ignored-differences.xml new file mode 100644 index 0000000..29473fe --- /dev/null +++ b/google-cloud-run/clirr-ignored-differences.xml @@ -0,0 +1,10 @@ + + + + + 7004 + com/google/cloud/run/v2/ServicesClient + * updateServiceAsync*(*) + * *(*) + + \ No newline at end of file diff --git a/google-cloud-run/pom.xml b/google-cloud-run/pom.xml index 53ffab0..1f69974 100644 --- a/google-cloud-run/pom.xml +++ b/google-cloud-run/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-run - 0.2.0 + 0.2.1 jar Google Cloud Run https://github.com/googleapis/java-run @@ -11,7 +11,7 @@ com.google.cloud google-cloud-run-parent - 0.2.0 + 0.2.1 google-cloud-run diff --git a/google-cloud-run/src/main/java/com/google/cloud/run/v2/RevisionsClient.java b/google-cloud-run/src/main/java/com/google/cloud/run/v2/RevisionsClient.java index 212ba33..a2f96dc 100644 --- a/google-cloud-run/src/main/java/com/google/cloud/run/v2/RevisionsClient.java +++ b/google-cloud-run/src/main/java/com/google/cloud/run/v2/RevisionsClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.longrunning.OperationFuture; import com.google.api.gax.paging.AbstractFixedSizeCollection; @@ -126,7 +125,6 @@ public static final RevisionsClient create(RevisionsSettings settings) throws IO * Constructs an instance of RevisionsClient, using the given stub for making calls. This is for * advanced usage - prefer using create(RevisionsSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final RevisionsClient create(RevisionsStub stub) { return new RevisionsClient(stub); } @@ -141,7 +139,6 @@ protected RevisionsClient(RevisionsSettings settings) throws IOException { this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected RevisionsClient(RevisionsStub stub) { this.settings = null; this.stub = stub; @@ -152,7 +149,6 @@ public final RevisionsSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public RevisionsStub getStub() { return stub; } @@ -402,7 +398,7 @@ public final ListRevisionsPagedResponse listRevisions(ListRevisionsRequest reque * .build(); * while (true) { * ListRevisionsResponse response = revisionsClient.listRevisionsCallable().call(request); - * for (Revision element : response.getResponsesList()) { + * for (Revision element : response.getRevisionsList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); diff --git a/google-cloud-run/src/main/java/com/google/cloud/run/v2/ServicesClient.java b/google-cloud-run/src/main/java/com/google/cloud/run/v2/ServicesClient.java index 2ef05bf..0b771f6 100644 --- a/google-cloud-run/src/main/java/com/google/cloud/run/v2/ServicesClient.java +++ b/google-cloud-run/src/main/java/com/google/cloud/run/v2/ServicesClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.longrunning.OperationFuture; import com.google.api.gax.paging.AbstractFixedSizeCollection; @@ -37,7 +36,6 @@ import com.google.iam.v1.TestIamPermissionsResponse; import com.google.longrunning.Operation; import com.google.longrunning.OperationsClient; -import com.google.protobuf.FieldMask; import java.io.IOException; import java.util.List; import java.util.concurrent.TimeUnit; @@ -132,7 +130,6 @@ public static final ServicesClient create(ServicesSettings settings) throws IOEx * Constructs an instance of ServicesClient, using the given stub for making calls. This is for * advanced usage - prefer using create(ServicesSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final ServicesClient create(ServicesStub stub) { return new ServicesClient(stub); } @@ -147,7 +144,6 @@ protected ServicesClient(ServicesSettings settings) throws IOException { this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected ServicesClient(ServicesStub stub) { this.settings = null; this.stub = stub; @@ -158,7 +154,6 @@ public final ServicesSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public ServicesStub getStub() { return stub; } @@ -559,7 +554,7 @@ public final ListServicesPagedResponse listServices(ListServicesRequest request) * .build(); * while (true) { * ListServicesResponse response = servicesClient.listServicesCallable().call(request); - * for (Service element : response.getResponsesList()) { + * for (Service element : response.getServicesList()) { * // doThingsWith(element); * } * String nextPageToken = response.getNextPageToken(); @@ -587,19 +582,15 @@ public final UnaryCallable listServic * // It may require modifications to work in your environment. * try (ServicesClient servicesClient = ServicesClient.create()) { * Service service = Service.newBuilder().build(); - * FieldMask updateMask = FieldMask.newBuilder().build(); - * Service response = servicesClient.updateServiceAsync(service, updateMask).get(); + * Service response = servicesClient.updateServiceAsync(service).get(); * } * } * * @param service Required. The Service to be updated. - * @param updateMask The list of fields to be updated. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ - public final OperationFuture updateServiceAsync( - Service service, FieldMask updateMask) { - UpdateServiceRequest request = - UpdateServiceRequest.newBuilder().setService(service).setUpdateMask(updateMask).build(); + public final OperationFuture updateServiceAsync(Service service) { + UpdateServiceRequest request = UpdateServiceRequest.newBuilder().setService(service).build(); return updateServiceAsync(request); } @@ -616,7 +607,6 @@ public final OperationFuture updateServiceAsync( * UpdateServiceRequest request = * UpdateServiceRequest.newBuilder() * .setService(Service.newBuilder().build()) - * .setUpdateMask(FieldMask.newBuilder().build()) * .setValidateOnly(true) * .setAllowMissing(true) * .build(); @@ -644,7 +634,6 @@ public final OperationFuture updateServiceAsync(UpdateServiceR * UpdateServiceRequest request = * UpdateServiceRequest.newBuilder() * .setService(Service.newBuilder().build()) - * .setUpdateMask(FieldMask.newBuilder().build()) * .setValidateOnly(true) * .setAllowMissing(true) * .build(); @@ -673,7 +662,6 @@ public final OperationFuture updateServiceAsync(UpdateServiceR * UpdateServiceRequest request = * UpdateServiceRequest.newBuilder() * .setService(Service.newBuilder().build()) - * .setUpdateMask(FieldMask.newBuilder().build()) * .setValidateOnly(true) * .setAllowMissing(true) * .build(); @@ -835,7 +823,7 @@ public final UnaryCallable deleteServiceCallabl * try (ServicesClient servicesClient = ServicesClient.create()) { * GetIamPolicyRequest request = * GetIamPolicyRequest.newBuilder() - * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + * .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) * .setOptions(GetPolicyOptions.newBuilder().build()) * .build(); * Policy response = servicesClient.getIamPolicy(request); @@ -862,7 +850,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) { * try (ServicesClient servicesClient = ServicesClient.create()) { * GetIamPolicyRequest request = * GetIamPolicyRequest.newBuilder() - * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + * .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) * .setOptions(GetPolicyOptions.newBuilder().build()) * .build(); * ApiFuture future = servicesClient.getIamPolicyCallable().futureCall(request); @@ -887,7 +875,7 @@ public final UnaryCallable getIamPolicyCallable() { * try (ServicesClient servicesClient = ServicesClient.create()) { * SetIamPolicyRequest request = * SetIamPolicyRequest.newBuilder() - * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + * .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) * .setPolicy(Policy.newBuilder().build()) * .setUpdateMask(FieldMask.newBuilder().build()) * .build(); @@ -914,7 +902,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) { * try (ServicesClient servicesClient = ServicesClient.create()) { * SetIamPolicyRequest request = * SetIamPolicyRequest.newBuilder() - * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + * .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) * .setPolicy(Policy.newBuilder().build()) * .setUpdateMask(FieldMask.newBuilder().build()) * .build(); @@ -942,7 +930,7 @@ public final UnaryCallable setIamPolicyCallable() { * try (ServicesClient servicesClient = ServicesClient.create()) { * TestIamPermissionsRequest request = * TestIamPermissionsRequest.newBuilder() - * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + * .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) * .addAllPermissions(new ArrayList()) * .build(); * TestIamPermissionsResponse response = servicesClient.testIamPermissions(request); @@ -970,7 +958,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq * try (ServicesClient servicesClient = ServicesClient.create()) { * TestIamPermissionsRequest request = * TestIamPermissionsRequest.newBuilder() - * .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + * .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) * .addAllPermissions(new ArrayList()) * .build(); * ApiFuture future = diff --git a/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/GrpcRevisionsStub.java b/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/GrpcRevisionsStub.java index fa9d08a..6f89f0c 100644 --- a/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/GrpcRevisionsStub.java +++ b/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/GrpcRevisionsStub.java @@ -24,13 +24,14 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.run.v2.DeleteRevisionRequest; import com.google.cloud.run.v2.GetRevisionRequest; import com.google.cloud.run.v2.ListRevisionsRequest; import com.google.cloud.run.v2.ListRevisionsResponse; import com.google.cloud.run.v2.Revision; -import com.google.common.collect.ImmutableMap; import com.google.longrunning.Operation; import com.google.longrunning.stub.GrpcOperationsStub; import io.grpc.MethodDescriptor; @@ -88,6 +89,13 @@ public class GrpcRevisionsStub extends RevisionsStub { private final GrpcOperationsStub operationsStub; private final GrpcStubCallableFactory callableFactory; + private static final PathTemplate GET_REVISION_0_PATH_TEMPLATE = + PathTemplate.create("projects/*/locations/{location=*}/**"); + private static final PathTemplate LIST_REVISIONS_0_PATH_TEMPLATE = + PathTemplate.create("projects/*/locations/{location=*}/**"); + private static final PathTemplate DELETE_REVISION_0_PATH_TEMPLATE = + PathTemplate.create("projects/*/locations/{location=*}/**"); + public static final GrpcRevisionsStub create(RevisionsStubSettings settings) throws IOException { return new GrpcRevisionsStub(settings, ClientContext.create(settings)); } @@ -130,9 +138,9 @@ protected GrpcRevisionsStub( .setMethodDescriptor(getRevisionMethodDescriptor) .setParamsExtractor( request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getName(), "location", GET_REVISION_0_PATH_TEMPLATE); + return builder.build(); }) .build(); GrpcCallSettings listRevisionsTransportSettings = @@ -140,9 +148,9 @@ protected GrpcRevisionsStub( .setMethodDescriptor(listRevisionsMethodDescriptor) .setParamsExtractor( request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getParent(), "location", LIST_REVISIONS_0_PATH_TEMPLATE); + return builder.build(); }) .build(); GrpcCallSettings deleteRevisionTransportSettings = @@ -150,9 +158,9 @@ protected GrpcRevisionsStub( .setMethodDescriptor(deleteRevisionMethodDescriptor) .setParamsExtractor( request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getName(), "location", DELETE_REVISION_0_PATH_TEMPLATE); + return builder.build(); }) .build(); diff --git a/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/GrpcServicesStub.java b/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/GrpcServicesStub.java index db38682..f2fe4eb 100644 --- a/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/GrpcServicesStub.java +++ b/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/GrpcServicesStub.java @@ -24,7 +24,9 @@ import com.google.api.gax.grpc.GrpcStubCallableFactory; import com.google.api.gax.rpc.ClientContext; import com.google.api.gax.rpc.OperationCallable; +import com.google.api.gax.rpc.RequestParamsBuilder; import com.google.api.gax.rpc.UnaryCallable; +import com.google.api.pathtemplate.PathTemplate; import com.google.cloud.run.v2.CreateServiceRequest; import com.google.cloud.run.v2.DeleteServiceRequest; import com.google.cloud.run.v2.GetServiceRequest; @@ -151,6 +153,17 @@ public class GrpcServicesStub extends ServicesStub { private final GrpcOperationsStub operationsStub; private final GrpcStubCallableFactory callableFactory; + private static final PathTemplate CREATE_SERVICE_0_PATH_TEMPLATE = + PathTemplate.create("projects/*/locations/{location=*}"); + private static final PathTemplate GET_SERVICE_0_PATH_TEMPLATE = + PathTemplate.create("projects/*/locations/{location=*}/**"); + private static final PathTemplate LIST_SERVICES_0_PATH_TEMPLATE = + PathTemplate.create("projects/*/locations/{location=*}"); + private static final PathTemplate UPDATE_SERVICE_0_PATH_TEMPLATE = + PathTemplate.create("projects/*/locations/{location=*}/**"); + private static final PathTemplate DELETE_SERVICE_0_PATH_TEMPLATE = + PathTemplate.create("projects/*/locations/{location=*}/**"); + public static final GrpcServicesStub create(ServicesStubSettings settings) throws IOException { return new GrpcServicesStub(settings, ClientContext.create(settings)); } @@ -191,9 +204,9 @@ protected GrpcServicesStub( .setMethodDescriptor(createServiceMethodDescriptor) .setParamsExtractor( request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getParent(), "location", CREATE_SERVICE_0_PATH_TEMPLATE); + return builder.build(); }) .build(); GrpcCallSettings getServiceTransportSettings = @@ -201,9 +214,9 @@ protected GrpcServicesStub( .setMethodDescriptor(getServiceMethodDescriptor) .setParamsExtractor( request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getName(), "location", GET_SERVICE_0_PATH_TEMPLATE); + return builder.build(); }) .build(); GrpcCallSettings listServicesTransportSettings = @@ -211,9 +224,9 @@ protected GrpcServicesStub( .setMethodDescriptor(listServicesMethodDescriptor) .setParamsExtractor( request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("parent", String.valueOf(request.getParent())); - return params.build(); + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getParent(), "location", LIST_SERVICES_0_PATH_TEMPLATE); + return builder.build(); }) .build(); GrpcCallSettings updateServiceTransportSettings = @@ -221,9 +234,12 @@ protected GrpcServicesStub( .setMethodDescriptor(updateServiceMethodDescriptor) .setParamsExtractor( request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("service.name", String.valueOf(request.getService().getName())); - return params.build(); + RequestParamsBuilder builder = RequestParamsBuilder.create(); + if (request.getService() != null) { + builder.add( + request.getService().getName(), "location", UPDATE_SERVICE_0_PATH_TEMPLATE); + } + return builder.build(); }) .build(); GrpcCallSettings deleteServiceTransportSettings = @@ -231,9 +247,9 @@ protected GrpcServicesStub( .setMethodDescriptor(deleteServiceMethodDescriptor) .setParamsExtractor( request -> { - ImmutableMap.Builder params = ImmutableMap.builder(); - params.put("name", String.valueOf(request.getName())); - return params.build(); + RequestParamsBuilder builder = RequestParamsBuilder.create(); + builder.add(request.getName(), "location", DELETE_SERVICE_0_PATH_TEMPLATE); + return builder.build(); }) .build(); GrpcCallSettings getIamPolicyTransportSettings = diff --git a/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/RevisionsStubSettings.java b/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/RevisionsStubSettings.java index 6b020d1..7caabae 100644 --- a/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/RevisionsStubSettings.java +++ b/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/RevisionsStubSettings.java @@ -181,7 +181,6 @@ public UnaryCallSettings deleteRevisionSetting return deleteRevisionOperationSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public RevisionsStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/ServicesStubSettings.java b/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/ServicesStubSettings.java index e979419..dba2cba 100644 --- a/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/ServicesStubSettings.java +++ b/google-cloud-run/src/main/java/com/google/cloud/run/v2/stub/ServicesStubSettings.java @@ -236,7 +236,6 @@ public UnaryCallSettings setIamPolicySettings() { return testIamPermissionsSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public ServicesStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/google-cloud-run/src/test/java/com/google/cloud/run/v2/RevisionsClientTest.java b/google-cloud-run/src/test/java/com/google/cloud/run/v2/RevisionsClientTest.java index 49e92d6..9bd5f05 100644 --- a/google-cloud-run/src/test/java/com/google/cloud/run/v2/RevisionsClientTest.java +++ b/google-cloud-run/src/test/java/com/google/cloud/run/v2/RevisionsClientTest.java @@ -105,12 +105,11 @@ public void getRevisionTest() throws Exception { .setService(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .setScaling(RevisionScaling.newBuilder().build()) .setVpcAccess(VpcAccess.newBuilder().build()) - .setContainerConcurrency(-153173803) + .setMaxInstanceRequestConcurrency(117250100) .setTimeout(Duration.newBuilder().build()) .setServiceAccount("serviceAccount1079137720") .addAllContainers(new ArrayList()) .addAllVolumes(new ArrayList()) - .setConfidential(true) .setExecutionEnvironment(ExecutionEnvironment.forNumber(0)) .setEncryptionKey("encryptionKey-36224036") .setReconciling(true) @@ -169,12 +168,11 @@ public void getRevisionTest2() throws Exception { .setService(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .setScaling(RevisionScaling.newBuilder().build()) .setVpcAccess(VpcAccess.newBuilder().build()) - .setContainerConcurrency(-153173803) + .setMaxInstanceRequestConcurrency(117250100) .setTimeout(Duration.newBuilder().build()) .setServiceAccount("serviceAccount1079137720") .addAllContainers(new ArrayList()) .addAllVolumes(new ArrayList()) - .setConfidential(true) .setExecutionEnvironment(ExecutionEnvironment.forNumber(0)) .setEncryptionKey("encryptionKey-36224036") .setReconciling(true) @@ -321,12 +319,11 @@ public void deleteRevisionTest() throws Exception { .setService(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .setScaling(RevisionScaling.newBuilder().build()) .setVpcAccess(VpcAccess.newBuilder().build()) - .setContainerConcurrency(-153173803) + .setMaxInstanceRequestConcurrency(117250100) .setTimeout(Duration.newBuilder().build()) .setServiceAccount("serviceAccount1079137720") .addAllContainers(new ArrayList()) .addAllVolumes(new ArrayList()) - .setConfidential(true) .setExecutionEnvironment(ExecutionEnvironment.forNumber(0)) .setEncryptionKey("encryptionKey-36224036") .setReconciling(true) @@ -393,12 +390,11 @@ public void deleteRevisionTest2() throws Exception { .setService(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .setScaling(RevisionScaling.newBuilder().build()) .setVpcAccess(VpcAccess.newBuilder().build()) - .setContainerConcurrency(-153173803) + .setMaxInstanceRequestConcurrency(117250100) .setTimeout(Duration.newBuilder().build()) .setServiceAccount("serviceAccount1079137720") .addAllContainers(new ArrayList()) .addAllVolumes(new ArrayList()) - .setConfidential(true) .setExecutionEnvironment(ExecutionEnvironment.forNumber(0)) .setEncryptionKey("encryptionKey-36224036") .setReconciling(true) diff --git a/google-cloud-run/src/test/java/com/google/cloud/run/v2/ServicesClientTest.java b/google-cloud-run/src/test/java/com/google/cloud/run/v2/ServicesClientTest.java index dfc5c68..128aca2 100644 --- a/google-cloud-run/src/test/java/com/google/cloud/run/v2/ServicesClientTest.java +++ b/google-cloud-run/src/test/java/com/google/cloud/run/v2/ServicesClientTest.java @@ -524,9 +524,8 @@ public void updateServiceTest() throws Exception { mockServices.addResponse(resultOperation); Service service = Service.newBuilder().build(); - FieldMask updateMask = FieldMask.newBuilder().build(); - Service actualResponse = client.updateServiceAsync(service, updateMask).get(); + Service actualResponse = client.updateServiceAsync(service).get(); Assert.assertEquals(expectedResponse, actualResponse); List actualRequests = mockServices.getRequests(); @@ -534,7 +533,6 @@ public void updateServiceTest() throws Exception { UpdateServiceRequest actualRequest = ((UpdateServiceRequest) actualRequests.get(0)); Assert.assertEquals(service, actualRequest.getService()); - Assert.assertEquals(updateMask, actualRequest.getUpdateMask()); Assert.assertTrue( channelProvider.isHeaderSent( ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), @@ -548,8 +546,7 @@ public void updateServiceExceptionTest() throws Exception { try { Service service = Service.newBuilder().build(); - FieldMask updateMask = FieldMask.newBuilder().build(); - client.updateServiceAsync(service, updateMask).get(); + client.updateServiceAsync(service).get(); Assert.fail("No exception raised"); } catch (ExecutionException e) { Assert.assertEquals(InvalidArgumentException.class, e.getCause().getClass()); @@ -721,7 +718,7 @@ public void getIamPolicyTest() throws Exception { GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder() - .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .setOptions(GetPolicyOptions.newBuilder().build()) .build(); @@ -748,7 +745,7 @@ public void getIamPolicyExceptionTest() throws Exception { try { GetIamPolicyRequest request = GetIamPolicyRequest.newBuilder() - .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .setOptions(GetPolicyOptions.newBuilder().build()) .build(); client.getIamPolicy(request); @@ -771,7 +768,7 @@ public void setIamPolicyTest() throws Exception { SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder() - .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .setPolicy(Policy.newBuilder().build()) .setUpdateMask(FieldMask.newBuilder().build()) .build(); @@ -800,7 +797,7 @@ public void setIamPolicyExceptionTest() throws Exception { try { SetIamPolicyRequest request = SetIamPolicyRequest.newBuilder() - .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .setPolicy(Policy.newBuilder().build()) .setUpdateMask(FieldMask.newBuilder().build()) .build(); @@ -819,7 +816,7 @@ public void testIamPermissionsTest() throws Exception { TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder() - .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .addAllPermissions(new ArrayList()) .build(); @@ -846,7 +843,7 @@ public void testIamPermissionsExceptionTest() throws Exception { try { TestIamPermissionsRequest request = TestIamPermissionsRequest.newBuilder() - .setResource(LocationName.of("[PROJECT]", "[LOCATION]").toString()) + .setResource(ServiceName.of("[PROJECT]", "[LOCATION]", "[SERVICE]").toString()) .addAllPermissions(new ArrayList()) .build(); client.testIamPermissions(request); diff --git a/grpc-google-cloud-run-v2/pom.xml b/grpc-google-cloud-run-v2/pom.xml index 049f092..e9f81f0 100644 --- a/grpc-google-cloud-run-v2/pom.xml +++ b/grpc-google-cloud-run-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-cloud-run-v2 - 0.2.0 + 0.2.1 grpc-google-cloud-run-v2 GRPC library for google-cloud-run com.google.cloud google-cloud-run-parent - 0.2.0 + 0.2.1 diff --git a/pom.xml b/pom.xml index 9cb77e8..3ad81ce 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-run-parent pom - 0.2.0 + 0.2.1 Google Cloud Run Parent https://github.com/googleapis/java-run @@ -14,7 +14,7 @@ com.google.cloud google-cloud-shared-config - 1.4.0 + 1.5.0 @@ -69,23 +69,23 @@ com.google.cloud google-cloud-run - 0.2.0 + 0.2.1 com.google.api.grpc grpc-google-cloud-run-v2 - 0.2.0 + 0.2.1 com.google.api.grpc proto-google-cloud-run-v2 - 0.2.0 + 0.2.1 com.google.cloud google-cloud-shared-dependencies - 2.12.0 + 2.13.0 pom import diff --git a/proto-google-cloud-run-v2/clirr-ignored-differences.xml b/proto-google-cloud-run-v2/clirr-ignored-differences.xml index 050434f..221c258 100644 --- a/proto-google-cloud-run-v2/clirr-ignored-differences.xml +++ b/proto-google-cloud-run-v2/clirr-ignored-differences.xml @@ -16,4 +16,68 @@ com/google/cloud/run/v2/*OrBuilder boolean has*(*) + + 7002 + com/google/cloud/run/v2/CloudSqlInstance* + * *Connections*(*) + + + 7002 + com/google/cloud/run/v2/Condition* + * *Reason*(*) + + + 7002 + com/google/cloud/run/v2/Revision* + * *Confidential*(*) + + + 7002 + com/google/cloud/run/v2/Revision* + * *ContainerConcurrency*(*) + + + 7002 + com/google/cloud/run/v2/UpdateServiceRequest* + * *UpdateMask*(*) + + + 6011 + com/google/cloud/run/v2/* + *_FIELD_NUMBER + + + 6011 + com/google/cloud/run/v2/* + *_VALUE + + + 6001 + com/google/cloud/run/v2/* + BUILD_STEP_FAILED + + + 6001 + com/google/cloud/run/v2/* + ROUTE_MISSING + + + 6001 + com/google/cloud/run/v2/* + DOMAIN_MAPPING_REASON + + + 6001 + com/google/cloud/run/v2/* + INTERNAL_REASON + + + 6001 + com/google/cloud/run/v2/* + EXECUTION_ENVIRONMENT_DEFAULT + + + 8001 + com/google/cloud/run/v2/Condition* + diff --git a/proto-google-cloud-run-v2/pom.xml b/proto-google-cloud-run-v2/pom.xml index 2daa8aa..34ae944 100644 --- a/proto-google-cloud-run-v2/pom.xml +++ b/proto-google-cloud-run-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc proto-google-cloud-run-v2 - 0.2.0 + 0.2.1 proto-google-cloud-run-v2 Proto library for google-cloud-run com.google.cloud google-cloud-run-parent - 0.2.0 + 0.2.1 diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/CloudSqlInstance.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/CloudSqlInstance.java index 157093e..b250b9b 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/CloudSqlInstance.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/CloudSqlInstance.java @@ -38,7 +38,7 @@ private CloudSqlInstance(com.google.protobuf.GeneratedMessageV3.Builder build } private CloudSqlInstance() { - connections_ = com.google.protobuf.LazyStringArrayList.EMPTY; + instances_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @java.lang.Override @@ -75,10 +75,10 @@ private CloudSqlInstance( { java.lang.String s = input.readStringRequireUtf8(); if (!((mutable_bitField0_ & 0x00000001) != 0)) { - connections_ = new com.google.protobuf.LazyStringArrayList(); + instances_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } - connections_.add(s); + instances_.add(s); break; } default: @@ -98,7 +98,7 @@ private CloudSqlInstance( throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { if (((mutable_bitField0_ & 0x00000001) != 0)) { - connections_ = connections_.getUnmodifiableView(); + instances_ = instances_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -120,8 +120,8 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { com.google.cloud.run.v2.CloudSqlInstance.Builder.class); } - public static final int CONNECTIONS_FIELD_NUMBER = 1; - private com.google.protobuf.LazyStringList connections_; + public static final int INSTANCES_FIELD_NUMBER = 1; + private com.google.protobuf.LazyStringList instances_; /** * * @@ -133,12 +133,12 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @return A list containing the connections. + * @return A list containing the instances. */ - public com.google.protobuf.ProtocolStringList getConnectionsList() { - return connections_; + public com.google.protobuf.ProtocolStringList getInstancesList() { + return instances_; } /** * @@ -151,12 +151,12 @@ public com.google.protobuf.ProtocolStringList getConnectionsList() { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @return The count of connections. + * @return The count of instances. */ - public int getConnectionsCount() { - return connections_.size(); + public int getInstancesCount() { + return instances_.size(); } /** * @@ -169,13 +169,13 @@ public int getConnectionsCount() { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * * @param index The index of the element to return. - * @return The connections at the given index. + * @return The instances at the given index. */ - public java.lang.String getConnections(int index) { - return connections_.get(index); + public java.lang.String getInstances(int index) { + return instances_.get(index); } /** * @@ -188,13 +188,13 @@ public java.lang.String getConnections(int index) { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * * @param index The index of the value to return. - * @return The bytes of the connections at the given index. + * @return The bytes of the instances at the given index. */ - public com.google.protobuf.ByteString getConnectionsBytes(int index) { - return connections_.getByteString(index); + public com.google.protobuf.ByteString getInstancesBytes(int index) { + return instances_.getByteString(index); } private byte memoizedIsInitialized = -1; @@ -211,8 +211,8 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - for (int i = 0; i < connections_.size(); i++) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, connections_.getRaw(i)); + for (int i = 0; i < instances_.size(); i++) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, instances_.getRaw(i)); } unknownFields.writeTo(output); } @@ -225,11 +225,11 @@ public int getSerializedSize() { size = 0; { int dataSize = 0; - for (int i = 0; i < connections_.size(); i++) { - dataSize += computeStringSizeNoTag(connections_.getRaw(i)); + for (int i = 0; i < instances_.size(); i++) { + dataSize += computeStringSizeNoTag(instances_.getRaw(i)); } size += dataSize; - size += 1 * getConnectionsList().size(); + size += 1 * getInstancesList().size(); } size += unknownFields.getSerializedSize(); memoizedSize = size; @@ -246,7 +246,7 @@ public boolean equals(final java.lang.Object obj) { } com.google.cloud.run.v2.CloudSqlInstance other = (com.google.cloud.run.v2.CloudSqlInstance) obj; - if (!getConnectionsList().equals(other.getConnectionsList())) return false; + if (!getInstancesList().equals(other.getInstancesList())) return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -258,9 +258,9 @@ public int hashCode() { } int hash = 41; hash = (19 * hash) + getDescriptor().hashCode(); - if (getConnectionsCount() > 0) { - hash = (37 * hash) + CONNECTIONS_FIELD_NUMBER; - hash = (53 * hash) + getConnectionsList().hashCode(); + if (getInstancesCount() > 0) { + hash = (37 * hash) + INSTANCES_FIELD_NUMBER; + hash = (53 * hash) + getInstancesList().hashCode(); } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; @@ -407,7 +407,7 @@ private void maybeForceBuilderInitialization() { @java.lang.Override public Builder clear() { super.clear(); - connections_ = com.google.protobuf.LazyStringArrayList.EMPTY; + instances_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); return this; } @@ -438,10 +438,10 @@ public com.google.cloud.run.v2.CloudSqlInstance buildPartial() { new com.google.cloud.run.v2.CloudSqlInstance(this); int from_bitField0_ = bitField0_; if (((bitField0_ & 0x00000001) != 0)) { - connections_ = connections_.getUnmodifiableView(); + instances_ = instances_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } - result.connections_ = connections_; + result.instances_ = instances_; onBuilt(); return result; } @@ -491,13 +491,13 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(com.google.cloud.run.v2.CloudSqlInstance other) { if (other == com.google.cloud.run.v2.CloudSqlInstance.getDefaultInstance()) return this; - if (!other.connections_.isEmpty()) { - if (connections_.isEmpty()) { - connections_ = other.connections_; + if (!other.instances_.isEmpty()) { + if (instances_.isEmpty()) { + instances_ = other.instances_; bitField0_ = (bitField0_ & ~0x00000001); } else { - ensureConnectionsIsMutable(); - connections_.addAll(other.connections_); + ensureInstancesIsMutable(); + instances_.addAll(other.instances_); } onChanged(); } @@ -532,12 +532,12 @@ public Builder mergeFrom( private int bitField0_; - private com.google.protobuf.LazyStringList connections_ = + private com.google.protobuf.LazyStringList instances_ = com.google.protobuf.LazyStringArrayList.EMPTY; - private void ensureConnectionsIsMutable() { + private void ensureInstancesIsMutable() { if (!((bitField0_ & 0x00000001) != 0)) { - connections_ = new com.google.protobuf.LazyStringArrayList(connections_); + instances_ = new com.google.protobuf.LazyStringArrayList(instances_); bitField0_ |= 0x00000001; } } @@ -552,12 +552,12 @@ private void ensureConnectionsIsMutable() { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @return A list containing the connections. + * @return A list containing the instances. */ - public com.google.protobuf.ProtocolStringList getConnectionsList() { - return connections_.getUnmodifiableView(); + public com.google.protobuf.ProtocolStringList getInstancesList() { + return instances_.getUnmodifiableView(); } /** * @@ -570,12 +570,12 @@ public com.google.protobuf.ProtocolStringList getConnectionsList() { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @return The count of connections. + * @return The count of instances. */ - public int getConnectionsCount() { - return connections_.size(); + public int getInstancesCount() { + return instances_.size(); } /** * @@ -588,13 +588,13 @@ public int getConnectionsCount() { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * * @param index The index of the element to return. - * @return The connections at the given index. + * @return The instances at the given index. */ - public java.lang.String getConnections(int index) { - return connections_.get(index); + public java.lang.String getInstances(int index) { + return instances_.get(index); } /** * @@ -607,13 +607,13 @@ public java.lang.String getConnections(int index) { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * * @param index The index of the value to return. - * @return The bytes of the connections at the given index. + * @return The bytes of the instances at the given index. */ - public com.google.protobuf.ByteString getConnectionsBytes(int index) { - return connections_.getByteString(index); + public com.google.protobuf.ByteString getInstancesBytes(int index) { + return instances_.getByteString(index); } /** * @@ -626,18 +626,18 @@ public com.google.protobuf.ByteString getConnectionsBytes(int index) { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * * @param index The index to set the value at. - * @param value The connections to set. + * @param value The instances to set. * @return This builder for chaining. */ - public Builder setConnections(int index, java.lang.String value) { + public Builder setInstances(int index, java.lang.String value) { if (value == null) { throw new NullPointerException(); } - ensureConnectionsIsMutable(); - connections_.set(index, value); + ensureInstancesIsMutable(); + instances_.set(index, value); onChanged(); return this; } @@ -652,17 +652,17 @@ public Builder setConnections(int index, java.lang.String value) { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @param value The connections to add. + * @param value The instances to add. * @return This builder for chaining. */ - public Builder addConnections(java.lang.String value) { + public Builder addInstances(java.lang.String value) { if (value == null) { throw new NullPointerException(); } - ensureConnectionsIsMutable(); - connections_.add(value); + ensureInstancesIsMutable(); + instances_.add(value); onChanged(); return this; } @@ -677,14 +677,14 @@ public Builder addConnections(java.lang.String value) { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @param values The connections to add. + * @param values The instances to add. * @return This builder for chaining. */ - public Builder addAllConnections(java.lang.Iterable values) { - ensureConnectionsIsMutable(); - com.google.protobuf.AbstractMessageLite.Builder.addAll(values, connections_); + public Builder addAllInstances(java.lang.Iterable values) { + ensureInstancesIsMutable(); + com.google.protobuf.AbstractMessageLite.Builder.addAll(values, instances_); onChanged(); return this; } @@ -699,12 +699,12 @@ public Builder addAllConnections(java.lang.Iterable values) { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * * @return This builder for chaining. */ - public Builder clearConnections() { - connections_ = com.google.protobuf.LazyStringArrayList.EMPTY; + public Builder clearInstances() { + instances_ = com.google.protobuf.LazyStringArrayList.EMPTY; bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; @@ -720,18 +720,18 @@ public Builder clearConnections() { * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @param value The bytes of the connections to add. + * @param value The bytes of the instances to add. * @return This builder for chaining. */ - public Builder addConnectionsBytes(com.google.protobuf.ByteString value) { + public Builder addInstancesBytes(com.google.protobuf.ByteString value) { if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - ensureConnectionsIsMutable(); - connections_.add(value); + ensureInstancesIsMutable(); + instances_.add(value); onChanged(); return this; } diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/CloudSqlInstanceOrBuilder.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/CloudSqlInstanceOrBuilder.java index 262b0b0..e3e803e 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/CloudSqlInstanceOrBuilder.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/CloudSqlInstanceOrBuilder.java @@ -34,11 +34,11 @@ public interface CloudSqlInstanceOrBuilder * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @return A list containing the connections. + * @return A list containing the instances. */ - java.util.List getConnectionsList(); + java.util.List getInstancesList(); /** * * @@ -50,11 +50,11 @@ public interface CloudSqlInstanceOrBuilder * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * - * @return The count of connections. + * @return The count of instances. */ - int getConnectionsCount(); + int getInstancesCount(); /** * * @@ -66,12 +66,12 @@ public interface CloudSqlInstanceOrBuilder * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * * @param index The index of the element to return. - * @return The connections at the given index. + * @return The instances at the given index. */ - java.lang.String getConnections(int index); + java.lang.String getInstances(int index); /** * * @@ -83,10 +83,10 @@ public interface CloudSqlInstanceOrBuilder * {project}:{location}:{instance} * * - * repeated string connections = 1; + * repeated string instances = 1; * * @param index The index of the value to return. - * @return The bytes of the connections at the given index. + * @return The bytes of the instances at the given index. */ - com.google.protobuf.ByteString getConnectionsBytes(int index); + com.google.protobuf.ByteString getInstancesBytes(int index); } diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Condition.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Condition.java index 2c0522d..da24e6f 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Condition.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Condition.java @@ -123,20 +123,6 @@ private Condition( reasons_ = rawValue; break; } - case 56: - { - int rawValue = input.readEnum(); - reasonsCase_ = 7; - reasons_ = rawValue; - break; - } - case 64: - { - int rawValue = input.readEnum(); - reasonsCase_ = 8; - reasons_ = rawValue; - break; - } case 72: { int rawValue = input.readEnum(); @@ -597,16 +583,6 @@ public enum CommonReason implements com.google.protobuf.ProtocolMessageEnum { * UNKNOWN = 1; */ UNKNOWN(1), - /** - * - * - *
-     * The internal route is missing.
-     * 
- * - * ROUTE_MISSING = 2; - */ - ROUTE_MISSING(2), /** * * @@ -627,16 +603,6 @@ public enum CommonReason implements com.google.protobuf.ProtocolMessageEnum { * PROGRESS_DEADLINE_EXCEEDED = 4; */ PROGRESS_DEADLINE_EXCEEDED(4), - /** - * - * - *
-     * There was a build error.
-     * 
- * - * BUILD_STEP_FAILED = 5; - */ - BUILD_STEP_FAILED(5), /** * * @@ -737,6 +703,16 @@ public enum CommonReason implements com.google.protobuf.ProtocolMessageEnum { * POSTPONED_RETRY = 15; */ POSTPONED_RETRY(15), + /** + * + * + *
+     * An internal error occurred. Further information may be in the message.
+     * 
+ * + * INTERNAL = 16; + */ + INTERNAL(16), UNRECOGNIZED(-1), ; @@ -760,16 +736,6 @@ public enum CommonReason implements com.google.protobuf.ProtocolMessageEnum { * UNKNOWN = 1; */ public static final int UNKNOWN_VALUE = 1; - /** - * - * - *
-     * The internal route is missing.
-     * 
- * - * ROUTE_MISSING = 2; - */ - public static final int ROUTE_MISSING_VALUE = 2; /** * * @@ -790,16 +756,6 @@ public enum CommonReason implements com.google.protobuf.ProtocolMessageEnum { * PROGRESS_DEADLINE_EXCEEDED = 4; */ public static final int PROGRESS_DEADLINE_EXCEEDED_VALUE = 4; - /** - * - * - *
-     * There was a build error.
-     * 
- * - * BUILD_STEP_FAILED = 5; - */ - public static final int BUILD_STEP_FAILED_VALUE = 5; /** * * @@ -900,6 +856,16 @@ public enum CommonReason implements com.google.protobuf.ProtocolMessageEnum { * POSTPONED_RETRY = 15; */ public static final int POSTPONED_RETRY_VALUE = 15; + /** + * + * + *
+     * An internal error occurred. Further information may be in the message.
+     * 
+ * + * INTERNAL = 16; + */ + public static final int INTERNAL_VALUE = 16; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -929,14 +895,10 @@ public static CommonReason forNumber(int value) { return COMMON_REASON_UNDEFINED; case 1: return UNKNOWN; - case 2: - return ROUTE_MISSING; case 3: return REVISION_FAILED; case 4: return PROGRESS_DEADLINE_EXCEEDED; - case 5: - return BUILD_STEP_FAILED; case 6: return CONTAINER_MISSING; case 7: @@ -957,6 +919,8 @@ public static CommonReason forNumber(int value) { return IMMEDIATE_RETRY; case 15: return POSTPONED_RETRY; + case 16: + return INTERNAL; default: return null; } @@ -1010,522 +974,6 @@ private CommonReason(int value) { // @@protoc_insertion_point(enum_scope:google.cloud.run.v2.Condition.CommonReason) } - /** - * - * - *
-   * Reasons applicable to internal resources not exposed to users. These will
-   * surface in Service.conditions, and could be useful for further diagnosis.
-   * 
- * - * Protobuf enum {@code google.cloud.run.v2.Condition.InternalReason} - */ - public enum InternalReason implements com.google.protobuf.ProtocolMessageEnum { - /** - * - * - *
-     * Default value.
-     * 
- * - * INTERNAL_REASON_UNDEFINED = 0; - */ - INTERNAL_REASON_UNDEFINED(0), - /** - * - * - *
-     * The revision name provided conflicts with an existing one.
-     * 
- * - * CONFLICTING_REVISION_NAME = 1; - */ - CONFLICTING_REVISION_NAME(1), - /** - * - * - *
-     * Revision is missing; this is usually a transient reason.
-     * 
- * - * REVISION_MISSING = 2; - */ - REVISION_MISSING(2), - /** - * - * - *
-     * Internal configuration is missing; this is usually a transient reason.
-     * 
- * - * CONFIGURATION_MISSING = 3; - */ - CONFIGURATION_MISSING(3), - /** - * - * - *
-     * Assigning traffic; this is a transient reason.
-     * 
- * - * ASSIGNING_TRAFFIC = 4; - */ - ASSIGNING_TRAFFIC(4), - /** - * - * - *
-     * Updating ingress traffic settings; this is a transient reason.
-     * 
- * - * UPDATING_INGRESS_TRAFFIC_ALLOWED = 5; - */ - UPDATING_INGRESS_TRAFFIC_ALLOWED(5), - /** - * - * - *
-     * The revision can't be created because it violates an org policy setting.
-     * 
- * - * REVISION_ORG_POLICY_VIOLATION = 6; - */ - REVISION_ORG_POLICY_VIOLATION(6), - /** - * - * - *
-     * Enabling GCFv2 URI support; this is a transient reason.
-     * 
- * - * ENABLING_GCFV2_URI_SUPPORT = 7; - */ - ENABLING_GCFV2_URI_SUPPORT(7), - UNRECOGNIZED(-1), - ; - - /** - * - * - *
-     * Default value.
-     * 
- * - * INTERNAL_REASON_UNDEFINED = 0; - */ - public static final int INTERNAL_REASON_UNDEFINED_VALUE = 0; - /** - * - * - *
-     * The revision name provided conflicts with an existing one.
-     * 
- * - * CONFLICTING_REVISION_NAME = 1; - */ - public static final int CONFLICTING_REVISION_NAME_VALUE = 1; - /** - * - * - *
-     * Revision is missing; this is usually a transient reason.
-     * 
- * - * REVISION_MISSING = 2; - */ - public static final int REVISION_MISSING_VALUE = 2; - /** - * - * - *
-     * Internal configuration is missing; this is usually a transient reason.
-     * 
- * - * CONFIGURATION_MISSING = 3; - */ - public static final int CONFIGURATION_MISSING_VALUE = 3; - /** - * - * - *
-     * Assigning traffic; this is a transient reason.
-     * 
- * - * ASSIGNING_TRAFFIC = 4; - */ - public static final int ASSIGNING_TRAFFIC_VALUE = 4; - /** - * - * - *
-     * Updating ingress traffic settings; this is a transient reason.
-     * 
- * - * UPDATING_INGRESS_TRAFFIC_ALLOWED = 5; - */ - public static final int UPDATING_INGRESS_TRAFFIC_ALLOWED_VALUE = 5; - /** - * - * - *
-     * The revision can't be created because it violates an org policy setting.
-     * 
- * - * REVISION_ORG_POLICY_VIOLATION = 6; - */ - public static final int REVISION_ORG_POLICY_VIOLATION_VALUE = 6; - /** - * - * - *
-     * Enabling GCFv2 URI support; this is a transient reason.
-     * 
- * - * ENABLING_GCFV2_URI_SUPPORT = 7; - */ - public static final int ENABLING_GCFV2_URI_SUPPORT_VALUE = 7; - - public final int getNumber() { - if (this == UNRECOGNIZED) { - throw new java.lang.IllegalArgumentException( - "Can't get the number of an unknown enum value."); - } - return value; - } - - /** - * @param value The numeric wire value of the corresponding enum entry. - * @return The enum associated with the given numeric wire value. - * @deprecated Use {@link #forNumber(int)} instead. - */ - @java.lang.Deprecated - public static InternalReason valueOf(int value) { - return forNumber(value); - } - - /** - * @param value The numeric wire value of the corresponding enum entry. - * @return The enum associated with the given numeric wire value. - */ - public static InternalReason forNumber(int value) { - switch (value) { - case 0: - return INTERNAL_REASON_UNDEFINED; - case 1: - return CONFLICTING_REVISION_NAME; - case 2: - return REVISION_MISSING; - case 3: - return CONFIGURATION_MISSING; - case 4: - return ASSIGNING_TRAFFIC; - case 5: - return UPDATING_INGRESS_TRAFFIC_ALLOWED; - case 6: - return REVISION_ORG_POLICY_VIOLATION; - case 7: - return ENABLING_GCFV2_URI_SUPPORT; - default: - return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { - return internalValueMap; - } - - private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public InternalReason findValueByNumber(int number) { - return InternalReason.forNumber(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { - if (this == UNRECOGNIZED) { - throw new java.lang.IllegalStateException( - "Can't get the descriptor of an unrecognized enum value."); - } - return getDescriptor().getValues().get(ordinal()); - } - - public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { - return getDescriptor(); - } - - public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.google.cloud.run.v2.Condition.getDescriptor().getEnumTypes().get(3); - } - - private static final InternalReason[] VALUES = values(); - - public static InternalReason valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type."); - } - if (desc.getIndex() == -1) { - return UNRECOGNIZED; - } - return VALUES[desc.getIndex()]; - } - - private final int value; - - private InternalReason(int value) { - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:google.cloud.run.v2.Condition.InternalReason) - } - - /** - * - * - *
-   * Reasons specific to DomainMapping resource.
-   * 
- * - * Protobuf enum {@code google.cloud.run.v2.Condition.DomainMappingReason} - */ - public enum DomainMappingReason implements com.google.protobuf.ProtocolMessageEnum { - /** - * - * - *
-     * Default value.
-     * 
- * - * DOMAIN_MAPPING_REASON_UNDEFINED = 0; - */ - DOMAIN_MAPPING_REASON_UNDEFINED(0), - /** - * - * - *
-     * Internal route is not yet ready.
-     * 
- * - * ROUTE_NOT_READY = 1; - */ - ROUTE_NOT_READY(1), - /** - * - * - *
-     * Insufficient permissions.
-     * 
- * - * PERMISSION_DENIED = 2; - */ - PERMISSION_DENIED(2), - /** - * - * - *
-     * Certificate already exists.
-     * 
- * - * CERTIFICATE_ALREADY_EXISTS = 3; - */ - CERTIFICATE_ALREADY_EXISTS(3), - /** - * - * - *
-     * Mapping already exists.
-     * 
- * - * MAPPING_ALREADY_EXISTS = 4; - */ - MAPPING_ALREADY_EXISTS(4), - /** - * - * - *
-     * Certificate issuance pending.
-     * 
- * - * CERTIFICATE_PENDING = 5; - */ - CERTIFICATE_PENDING(5), - /** - * - * - *
-     * Certificate issuance failed.
-     * 
- * - * CERTIFICATE_FAILED = 6; - */ - CERTIFICATE_FAILED(6), - UNRECOGNIZED(-1), - ; - - /** - * - * - *
-     * Default value.
-     * 
- * - * DOMAIN_MAPPING_REASON_UNDEFINED = 0; - */ - public static final int DOMAIN_MAPPING_REASON_UNDEFINED_VALUE = 0; - /** - * - * - *
-     * Internal route is not yet ready.
-     * 
- * - * ROUTE_NOT_READY = 1; - */ - public static final int ROUTE_NOT_READY_VALUE = 1; - /** - * - * - *
-     * Insufficient permissions.
-     * 
- * - * PERMISSION_DENIED = 2; - */ - public static final int PERMISSION_DENIED_VALUE = 2; - /** - * - * - *
-     * Certificate already exists.
-     * 
- * - * CERTIFICATE_ALREADY_EXISTS = 3; - */ - public static final int CERTIFICATE_ALREADY_EXISTS_VALUE = 3; - /** - * - * - *
-     * Mapping already exists.
-     * 
- * - * MAPPING_ALREADY_EXISTS = 4; - */ - public static final int MAPPING_ALREADY_EXISTS_VALUE = 4; - /** - * - * - *
-     * Certificate issuance pending.
-     * 
- * - * CERTIFICATE_PENDING = 5; - */ - public static final int CERTIFICATE_PENDING_VALUE = 5; - /** - * - * - *
-     * Certificate issuance failed.
-     * 
- * - * CERTIFICATE_FAILED = 6; - */ - public static final int CERTIFICATE_FAILED_VALUE = 6; - - public final int getNumber() { - if (this == UNRECOGNIZED) { - throw new java.lang.IllegalArgumentException( - "Can't get the number of an unknown enum value."); - } - return value; - } - - /** - * @param value The numeric wire value of the corresponding enum entry. - * @return The enum associated with the given numeric wire value. - * @deprecated Use {@link #forNumber(int)} instead. - */ - @java.lang.Deprecated - public static DomainMappingReason valueOf(int value) { - return forNumber(value); - } - - /** - * @param value The numeric wire value of the corresponding enum entry. - * @return The enum associated with the given numeric wire value. - */ - public static DomainMappingReason forNumber(int value) { - switch (value) { - case 0: - return DOMAIN_MAPPING_REASON_UNDEFINED; - case 1: - return ROUTE_NOT_READY; - case 2: - return PERMISSION_DENIED; - case 3: - return CERTIFICATE_ALREADY_EXISTS; - case 4: - return MAPPING_ALREADY_EXISTS; - case 5: - return CERTIFICATE_PENDING; - case 6: - return CERTIFICATE_FAILED; - default: - return null; - } - } - - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { - return internalValueMap; - } - - private static final com.google.protobuf.Internal.EnumLiteMap - internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public DomainMappingReason findValueByNumber(int number) { - return DomainMappingReason.forNumber(number); - } - }; - - public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { - if (this == UNRECOGNIZED) { - throw new java.lang.IllegalStateException( - "Can't get the descriptor of an unrecognized enum value."); - } - return getDescriptor().getValues().get(ordinal()); - } - - public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { - return getDescriptor(); - } - - public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.google.cloud.run.v2.Condition.getDescriptor().getEnumTypes().get(4); - } - - private static final DomainMappingReason[] VALUES = values(); - - public static DomainMappingReason valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { - if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type."); - } - if (desc.getIndex() == -1) { - return UNRECOGNIZED; - } - return VALUES[desc.getIndex()]; - } - - private final int value; - - private DomainMappingReason(int value) { - this.value = value; - } - - // @@protoc_insertion_point(enum_scope:google.cloud.run.v2.Condition.DomainMappingReason) - } - /** * * @@ -1869,7 +1317,7 @@ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.google.cloud.run.v2.Condition.getDescriptor().getEnumTypes().get(5); + return com.google.cloud.run.v2.Condition.getDescriptor().getEnumTypes().get(3); } private static final RevisionReason[] VALUES = values(); @@ -2029,7 +1477,7 @@ public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType } public static final com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { - return com.google.cloud.run.v2.Condition.getDescriptor().getEnumTypes().get(6); + return com.google.cloud.run.v2.Condition.getDescriptor().getEnumTypes().get(4); } private static final ExecutionReason[] VALUES = values(); @@ -2062,8 +1510,6 @@ public enum ReasonsCase com.google.protobuf.Internal.EnumLite, com.google.protobuf.AbstractMessage.InternalOneOfEnum { REASON(6), - INTERNAL_REASON(7), - DOMAIN_MAPPING_REASON(8), REVISION_REASON(9), EXECUTION_REASON(11), REASONS_NOT_SET(0); @@ -2086,10 +1532,6 @@ public static ReasonsCase forNumber(int value) { switch (value) { case 6: return REASON; - case 7: - return INTERNAL_REASON; - case 8: - return DOMAIN_MAPPING_REASON; case 9: return REVISION_REASON; case 11: @@ -2389,117 +1831,6 @@ public com.google.cloud.run.v2.Condition.CommonReason getReason() { return com.google.cloud.run.v2.Condition.CommonReason.COMMON_REASON_UNDEFINED; } - public static final int INTERNAL_REASON_FIELD_NUMBER = 7; - /** - * - * - *
-   * A reason for the internal condition.
-   * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return Whether the internalReason field is set. - */ - public boolean hasInternalReason() { - return reasonsCase_ == 7; - } - /** - * - * - *
-   * A reason for the internal condition.
-   * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return The enum numeric value on the wire for internalReason. - */ - public int getInternalReasonValue() { - if (reasonsCase_ == 7) { - return (java.lang.Integer) reasons_; - } - return 0; - } - /** - * - * - *
-   * A reason for the internal condition.
-   * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return The internalReason. - */ - public com.google.cloud.run.v2.Condition.InternalReason getInternalReason() { - if (reasonsCase_ == 7) { - @SuppressWarnings("deprecation") - com.google.cloud.run.v2.Condition.InternalReason result = - com.google.cloud.run.v2.Condition.InternalReason.valueOf((java.lang.Integer) reasons_); - return result == null - ? com.google.cloud.run.v2.Condition.InternalReason.UNRECOGNIZED - : result; - } - return com.google.cloud.run.v2.Condition.InternalReason.INTERNAL_REASON_UNDEFINED; - } - - public static final int DOMAIN_MAPPING_REASON_FIELD_NUMBER = 8; - /** - * - * - *
-   * A reason for the domain mapping condition.
-   * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return Whether the domainMappingReason field is set. - */ - public boolean hasDomainMappingReason() { - return reasonsCase_ == 8; - } - /** - * - * - *
-   * A reason for the domain mapping condition.
-   * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return The enum numeric value on the wire for domainMappingReason. - */ - public int getDomainMappingReasonValue() { - if (reasonsCase_ == 8) { - return (java.lang.Integer) reasons_; - } - return 0; - } - /** - * - * - *
-   * A reason for the domain mapping condition.
-   * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return The domainMappingReason. - */ - public com.google.cloud.run.v2.Condition.DomainMappingReason getDomainMappingReason() { - if (reasonsCase_ == 8) { - @SuppressWarnings("deprecation") - com.google.cloud.run.v2.Condition.DomainMappingReason result = - com.google.cloud.run.v2.Condition.DomainMappingReason.valueOf( - (java.lang.Integer) reasons_); - return result == null - ? com.google.cloud.run.v2.Condition.DomainMappingReason.UNRECOGNIZED - : result; - } - return com.google.cloud.run.v2.Condition.DomainMappingReason.DOMAIN_MAPPING_REASON_UNDEFINED; - } - public static final int REVISION_REASON_FIELD_NUMBER = 9; /** * @@ -2642,12 +1973,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (reasonsCase_ == 6) { output.writeEnum(6, ((java.lang.Integer) reasons_)); } - if (reasonsCase_ == 7) { - output.writeEnum(7, ((java.lang.Integer) reasons_)); - } - if (reasonsCase_ == 8) { - output.writeEnum(8, ((java.lang.Integer) reasons_)); - } if (reasonsCase_ == 9) { output.writeEnum(9, ((java.lang.Integer) reasons_)); } @@ -2682,14 +2007,6 @@ public int getSerializedSize() { size += com.google.protobuf.CodedOutputStream.computeEnumSize(6, ((java.lang.Integer) reasons_)); } - if (reasonsCase_ == 7) { - size += - com.google.protobuf.CodedOutputStream.computeEnumSize(7, ((java.lang.Integer) reasons_)); - } - if (reasonsCase_ == 8) { - size += - com.google.protobuf.CodedOutputStream.computeEnumSize(8, ((java.lang.Integer) reasons_)); - } if (reasonsCase_ == 9) { size += com.google.protobuf.CodedOutputStream.computeEnumSize(9, ((java.lang.Integer) reasons_)); @@ -2726,12 +2043,6 @@ public boolean equals(final java.lang.Object obj) { case 6: if (getReasonValue() != other.getReasonValue()) return false; break; - case 7: - if (getInternalReasonValue() != other.getInternalReasonValue()) return false; - break; - case 8: - if (getDomainMappingReasonValue() != other.getDomainMappingReasonValue()) return false; - break; case 9: if (getRevisionReasonValue() != other.getRevisionReasonValue()) return false; break; @@ -2769,14 +2080,6 @@ public int hashCode() { hash = (37 * hash) + REASON_FIELD_NUMBER; hash = (53 * hash) + getReasonValue(); break; - case 7: - hash = (37 * hash) + INTERNAL_REASON_FIELD_NUMBER; - hash = (53 * hash) + getInternalReasonValue(); - break; - case 8: - hash = (37 * hash) + DOMAIN_MAPPING_REASON_FIELD_NUMBER; - hash = (53 * hash) + getDomainMappingReasonValue(); - break; case 9: hash = (37 * hash) + REVISION_REASON_FIELD_NUMBER; hash = (53 * hash) + getRevisionReasonValue(); @@ -2986,12 +2289,6 @@ public com.google.cloud.run.v2.Condition buildPartial() { if (reasonsCase_ == 6) { result.reasons_ = reasons_; } - if (reasonsCase_ == 7) { - result.reasons_ = reasons_; - } - if (reasonsCase_ == 8) { - result.reasons_ = reasons_; - } if (reasonsCase_ == 9) { result.reasons_ = reasons_; } @@ -3071,16 +2368,6 @@ public Builder mergeFrom(com.google.cloud.run.v2.Condition other) { setReasonValue(other.getReasonValue()); break; } - case INTERNAL_REASON: - { - setInternalReasonValue(other.getInternalReasonValue()); - break; - } - case DOMAIN_MAPPING_REASON: - { - setDomainMappingReasonValue(other.getDomainMappingReasonValue()); - break; - } case REVISION_REASON: { setRevisionReasonValue(other.getRevisionReasonValue()); @@ -3853,238 +3140,6 @@ public Builder clearReason() { return this; } - /** - * - * - *
-     * A reason for the internal condition.
-     * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return Whether the internalReason field is set. - */ - @java.lang.Override - public boolean hasInternalReason() { - return reasonsCase_ == 7; - } - /** - * - * - *
-     * A reason for the internal condition.
-     * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return The enum numeric value on the wire for internalReason. - */ - @java.lang.Override - public int getInternalReasonValue() { - if (reasonsCase_ == 7) { - return ((java.lang.Integer) reasons_).intValue(); - } - return 0; - } - /** - * - * - *
-     * A reason for the internal condition.
-     * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @param value The enum numeric value on the wire for internalReason to set. - * @return This builder for chaining. - */ - public Builder setInternalReasonValue(int value) { - reasonsCase_ = 7; - reasons_ = value; - onChanged(); - return this; - } - /** - * - * - *
-     * A reason for the internal condition.
-     * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return The internalReason. - */ - @java.lang.Override - public com.google.cloud.run.v2.Condition.InternalReason getInternalReason() { - if (reasonsCase_ == 7) { - @SuppressWarnings("deprecation") - com.google.cloud.run.v2.Condition.InternalReason result = - com.google.cloud.run.v2.Condition.InternalReason.valueOf((java.lang.Integer) reasons_); - return result == null - ? com.google.cloud.run.v2.Condition.InternalReason.UNRECOGNIZED - : result; - } - return com.google.cloud.run.v2.Condition.InternalReason.INTERNAL_REASON_UNDEFINED; - } - /** - * - * - *
-     * A reason for the internal condition.
-     * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @param value The internalReason to set. - * @return This builder for chaining. - */ - public Builder setInternalReason(com.google.cloud.run.v2.Condition.InternalReason value) { - if (value == null) { - throw new NullPointerException(); - } - reasonsCase_ = 7; - reasons_ = value.getNumber(); - onChanged(); - return this; - } - /** - * - * - *
-     * A reason for the internal condition.
-     * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return This builder for chaining. - */ - public Builder clearInternalReason() { - if (reasonsCase_ == 7) { - reasonsCase_ = 0; - reasons_ = null; - onChanged(); - } - return this; - } - - /** - * - * - *
-     * A reason for the domain mapping condition.
-     * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return Whether the domainMappingReason field is set. - */ - @java.lang.Override - public boolean hasDomainMappingReason() { - return reasonsCase_ == 8; - } - /** - * - * - *
-     * A reason for the domain mapping condition.
-     * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return The enum numeric value on the wire for domainMappingReason. - */ - @java.lang.Override - public int getDomainMappingReasonValue() { - if (reasonsCase_ == 8) { - return ((java.lang.Integer) reasons_).intValue(); - } - return 0; - } - /** - * - * - *
-     * A reason for the domain mapping condition.
-     * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @param value The enum numeric value on the wire for domainMappingReason to set. - * @return This builder for chaining. - */ - public Builder setDomainMappingReasonValue(int value) { - reasonsCase_ = 8; - reasons_ = value; - onChanged(); - return this; - } - /** - * - * - *
-     * A reason for the domain mapping condition.
-     * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return The domainMappingReason. - */ - @java.lang.Override - public com.google.cloud.run.v2.Condition.DomainMappingReason getDomainMappingReason() { - if (reasonsCase_ == 8) { - @SuppressWarnings("deprecation") - com.google.cloud.run.v2.Condition.DomainMappingReason result = - com.google.cloud.run.v2.Condition.DomainMappingReason.valueOf( - (java.lang.Integer) reasons_); - return result == null - ? com.google.cloud.run.v2.Condition.DomainMappingReason.UNRECOGNIZED - : result; - } - return com.google.cloud.run.v2.Condition.DomainMappingReason.DOMAIN_MAPPING_REASON_UNDEFINED; - } - /** - * - * - *
-     * A reason for the domain mapping condition.
-     * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @param value The domainMappingReason to set. - * @return This builder for chaining. - */ - public Builder setDomainMappingReason( - com.google.cloud.run.v2.Condition.DomainMappingReason value) { - if (value == null) { - throw new NullPointerException(); - } - reasonsCase_ = 8; - reasons_ = value.getNumber(); - onChanged(); - return this; - } - /** - * - * - *
-     * A reason for the domain mapping condition.
-     * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return This builder for chaining. - */ - public Builder clearDomainMappingReason() { - if (reasonsCase_ == 8) { - reasonsCase_ = 0; - reasons_ = null; - onChanged(); - } - return this; - } - /** * * diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ConditionOrBuilder.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ConditionOrBuilder.java index 43ca148..9449505 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ConditionOrBuilder.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ConditionOrBuilder.java @@ -203,80 +203,6 @@ public interface ConditionOrBuilder */ com.google.cloud.run.v2.Condition.CommonReason getReason(); - /** - * - * - *
-   * A reason for the internal condition.
-   * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return Whether the internalReason field is set. - */ - boolean hasInternalReason(); - /** - * - * - *
-   * A reason for the internal condition.
-   * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return The enum numeric value on the wire for internalReason. - */ - int getInternalReasonValue(); - /** - * - * - *
-   * A reason for the internal condition.
-   * 
- * - * .google.cloud.run.v2.Condition.InternalReason internal_reason = 7; - * - * @return The internalReason. - */ - com.google.cloud.run.v2.Condition.InternalReason getInternalReason(); - - /** - * - * - *
-   * A reason for the domain mapping condition.
-   * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return Whether the domainMappingReason field is set. - */ - boolean hasDomainMappingReason(); - /** - * - * - *
-   * A reason for the domain mapping condition.
-   * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return The enum numeric value on the wire for domainMappingReason. - */ - int getDomainMappingReasonValue(); - /** - * - * - *
-   * A reason for the domain mapping condition.
-   * 
- * - * .google.cloud.run.v2.Condition.DomainMappingReason domain_mapping_reason = 8; - * - * @return The domainMappingReason. - */ - com.google.cloud.run.v2.Condition.DomainMappingReason getDomainMappingReason(); - /** * * diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ConditionProto.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ConditionProto.java index 498ac89..32b3c8a 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ConditionProto.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ConditionProto.java @@ -42,63 +42,47 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { java.lang.String[] descriptorData = { "\n#google/cloud/run/v2/condition.proto\022\023g" + "oogle.cloud.run.v2\032\037google/protobuf/time" - + "stamp.proto\"\350\020\n\tCondition\022\014\n\004type\030\001 \001(\t\022" + + "stamp.proto\"\325\013\n\tCondition\022\014\n\004type\030\001 \001(\t\022" + "3\n\005state\030\002 \001(\0162$.google.cloud.run.v2.Con" + "dition.State\022\017\n\007message\030\003 \001(\t\0228\n\024last_tr" + "ansition_time\030\004 \001(\0132\032.google.protobuf.Ti" + "mestamp\0229\n\010severity\030\005 \001(\0162\'.google.cloud" + ".run.v2.Condition.Severity\022=\n\006reason\030\006 \001" + "(\0162+.google.cloud.run.v2.Condition.Commo" - + "nReasonH\000\022H\n\017internal_reason\030\007 \001(\0162-.goo" - + "gle.cloud.run.v2.Condition.InternalReaso" - + "nH\000\022S\n\025domain_mapping_reason\030\010 \001(\01622.goo" - + "gle.cloud.run.v2.Condition.DomainMapping" - + "ReasonH\000\022H\n\017revision_reason\030\t \001(\0162-.goog" - + "le.cloud.run.v2.Condition.RevisionReason" - + "H\000\022J\n\020execution_reason\030\013 \001(\0162..google.cl" - + "oud.run.v2.Condition.ExecutionReasonH\000\"\177" - + "\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\025\n\021CONDIT" - + "ION_PENDING\020\001\022\031\n\025CONDITION_RECONCILING\020\002" - + "\022\024\n\020CONDITION_FAILED\020\003\022\027\n\023CONDITION_SUCC" - + "EEDED\020\004\"F\n\010Severity\022\030\n\024SEVERITY_UNSPECIF" - + "IED\020\000\022\t\n\005ERROR\020\001\022\013\n\007WARNING\020\002\022\010\n\004INFO\020\003\"" - + "\316\003\n\014CommonReason\022\033\n\027COMMON_REASON_UNDEFI" - + "NED\020\000\022\013\n\007UNKNOWN\020\001\022\021\n\rROUTE_MISSING\020\002\022\023\n" - + "\017REVISION_FAILED\020\003\022\036\n\032PROGRESS_DEADLINE_" - + "EXCEEDED\020\004\022\025\n\021BUILD_STEP_FAILED\020\005\022\025\n\021CON" - + "TAINER_MISSING\020\006\022\037\n\033CONTAINER_PERMISSION" - + "_DENIED\020\007\022 \n\034CONTAINER_IMAGE_UNAUTHORIZE" - + "D\020\010\022.\n*CONTAINER_IMAGE_AUTHORIZATION_CHE" - + "CK_FAILED\020\t\022$\n ENCRYPTION_KEY_PERMISSION" - + "_DENIED\020\n\022\037\n\033ENCRYPTION_KEY_CHECK_FAILED" - + "\020\013\022\037\n\033SECRETS_ACCESS_CHECK_FAILED\020\014\022\031\n\025W" - + "AITING_FOR_OPERATION\020\r\022\023\n\017IMMEDIATE_RETR" - + "Y\020\016\022\023\n\017POSTPONED_RETRY\020\017\"\377\001\n\016InternalRea" - + "son\022\035\n\031INTERNAL_REASON_UNDEFINED\020\000\022\035\n\031CO" - + "NFLICTING_REVISION_NAME\020\001\022\024\n\020REVISION_MI" - + "SSING\020\002\022\031\n\025CONFIGURATION_MISSING\020\003\022\025\n\021AS" - + "SIGNING_TRAFFIC\020\004\022$\n UPDATING_INGRESS_TR" - + "AFFIC_ALLOWED\020\005\022!\n\035REVISION_ORG_POLICY_V" - + "IOLATION\020\006\022\036\n\032ENABLING_GCFV2_URI_SUPPORT" - + "\020\007\"\323\001\n\023DomainMappingReason\022#\n\037DOMAIN_MAP" - + "PING_REASON_UNDEFINED\020\000\022\023\n\017ROUTE_NOT_REA" - + "DY\020\001\022\025\n\021PERMISSION_DENIED\020\002\022\036\n\032CERTIFICA" - + "TE_ALREADY_EXISTS\020\003\022\032\n\026MAPPING_ALREADY_E" - + "XISTS\020\004\022\027\n\023CERTIFICATE_PENDING\020\005\022\026\n\022CERT" - + "IFICATE_FAILED\020\006\"\257\002\n\016RevisionReason\022\035\n\031R" - + "EVISION_REASON_UNDEFINED\020\000\022\013\n\007PENDING\020\001\022" - + "\013\n\007RESERVE\020\002\022\013\n\007RETIRED\020\003\022\014\n\010RETIRING\020\004\022" - + "\016\n\nRECREATING\020\005\022 \n\034HEALTH_CHECK_CONTAINE" - + "R_ERROR\020\006\022$\n CUSTOMIZED_PATH_RESPONSE_PE" - + "NDING\020\007\022!\n\035MIN_INSTANCES_NOT_PROVISIONED" - + "\020\010\022!\n\035ACTIVE_REVISION_LIMIT_REACHED\020\t\022\021\n" - + "\rNO_DEPLOYMENT\020\n\022\030\n\024HEALTH_CHECK_SKIPPED" - + "\020\013\"o\n\017ExecutionReason\022\036\n\032EXECUTION_REASO" - + "N_UNDEFINED\020\000\022$\n JOB_STATUS_SERVICE_POLL" - + "ING_ERROR\020\001\022\026\n\022NON_ZERO_EXIT_CODE\020\002B\t\n\007r" - + "easonsBc\n\027com.google.cloud.run.v2B\016Condi" - + "tionProtoP\001Z6google.golang.org/genproto/" - + "googleapis/cloud/run/v2;runb\006proto3" + + "nReasonH\000\022H\n\017revision_reason\030\t \001(\0162-.goo" + + "gle.cloud.run.v2.Condition.RevisionReaso" + + "nH\000\022J\n\020execution_reason\030\013 \001(\0162..google.c" + + "loud.run.v2.Condition.ExecutionReasonH\000\"" + + "\177\n\005State\022\025\n\021STATE_UNSPECIFIED\020\000\022\025\n\021CONDI" + + "TION_PENDING\020\001\022\031\n\025CONDITION_RECONCILING\020" + + "\002\022\024\n\020CONDITION_FAILED\020\003\022\027\n\023CONDITION_SUC" + + "CEEDED\020\004\"F\n\010Severity\022\030\n\024SEVERITY_UNSPECI" + + "FIED\020\000\022\t\n\005ERROR\020\001\022\013\n\007WARNING\020\002\022\010\n\004INFO\020\003" + + "\"\262\003\n\014CommonReason\022\033\n\027COMMON_REASON_UNDEF" + + "INED\020\000\022\013\n\007UNKNOWN\020\001\022\023\n\017REVISION_FAILED\020\003" + + "\022\036\n\032PROGRESS_DEADLINE_EXCEEDED\020\004\022\025\n\021CONT" + + "AINER_MISSING\020\006\022\037\n\033CONTAINER_PERMISSION_" + + "DENIED\020\007\022 \n\034CONTAINER_IMAGE_UNAUTHORIZED" + + "\020\010\022.\n*CONTAINER_IMAGE_AUTHORIZATION_CHEC" + + "K_FAILED\020\t\022$\n ENCRYPTION_KEY_PERMISSION_" + + "DENIED\020\n\022\037\n\033ENCRYPTION_KEY_CHECK_FAILED\020" + + "\013\022\037\n\033SECRETS_ACCESS_CHECK_FAILED\020\014\022\031\n\025WA" + + "ITING_FOR_OPERATION\020\r\022\023\n\017IMMEDIATE_RETRY" + + "\020\016\022\023\n\017POSTPONED_RETRY\020\017\022\014\n\010INTERNAL\020\020\"\257\002" + + "\n\016RevisionReason\022\035\n\031REVISION_REASON_UNDE" + + "FINED\020\000\022\013\n\007PENDING\020\001\022\013\n\007RESERVE\020\002\022\013\n\007RET" + + "IRED\020\003\022\014\n\010RETIRING\020\004\022\016\n\nRECREATING\020\005\022 \n\034" + + "HEALTH_CHECK_CONTAINER_ERROR\020\006\022$\n CUSTOM" + + "IZED_PATH_RESPONSE_PENDING\020\007\022!\n\035MIN_INST" + + "ANCES_NOT_PROVISIONED\020\010\022!\n\035ACTIVE_REVISI" + + "ON_LIMIT_REACHED\020\t\022\021\n\rNO_DEPLOYMENT\020\n\022\030\n" + + "\024HEALTH_CHECK_SKIPPED\020\013\"o\n\017ExecutionReas" + + "on\022\036\n\032EXECUTION_REASON_UNDEFINED\020\000\022$\n JO" + + "B_STATUS_SERVICE_POLLING_ERROR\020\001\022\026\n\022NON_" + + "ZERO_EXIT_CODE\020\002B\t\n\007reasonsBc\n\027com.googl" + + "e.cloud.run.v2B\016ConditionProtoP\001Z6google" + + ".golang.org/genproto/googleapis/cloud/ru" + + "n/v2;runb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -118,8 +102,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "LastTransitionTime", "Severity", "Reason", - "InternalReason", - "DomainMappingReason", "RevisionReason", "ExecutionReason", "Reasons", diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Container.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Container.java index 4be21a7..1390135 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Container.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Container.java @@ -269,8 +269,8 @@ public com.google.protobuf.ByteString getNameBytes() { * * *
-   * Required. URL of the Container image in Google Container Registry or Docker
-   * More info: https://kubernetes.io/docs/concepts/containers/images
+   * Required. URL of the Container image in Google Container Registry or Google Artifact
+   * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
    * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; @@ -293,8 +293,8 @@ public java.lang.String getImage() { * * *
-   * Required. URL of the Container image in Google Container Registry or Docker
-   * More info: https://kubernetes.io/docs/concepts/containers/images
+   * Required. URL of the Container image in Google Container Registry or Google Artifact
+   * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
    * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; @@ -1484,8 +1484,8 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { * * *
-     * Required. URL of the Container image in Google Container Registry or Docker
-     * More info: https://kubernetes.io/docs/concepts/containers/images
+     * Required. URL of the Container image in Google Container Registry or Google Artifact
+     * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
      * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; @@ -1507,8 +1507,8 @@ public java.lang.String getImage() { * * *
-     * Required. URL of the Container image in Google Container Registry or Docker
-     * More info: https://kubernetes.io/docs/concepts/containers/images
+     * Required. URL of the Container image in Google Container Registry or Google Artifact
+     * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
      * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; @@ -1530,8 +1530,8 @@ public com.google.protobuf.ByteString getImageBytes() { * * *
-     * Required. URL of the Container image in Google Container Registry or Docker
-     * More info: https://kubernetes.io/docs/concepts/containers/images
+     * Required. URL of the Container image in Google Container Registry or Google Artifact
+     * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
      * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; @@ -1552,8 +1552,8 @@ public Builder setImage(java.lang.String value) { * * *
-     * Required. URL of the Container image in Google Container Registry or Docker
-     * More info: https://kubernetes.io/docs/concepts/containers/images
+     * Required. URL of the Container image in Google Container Registry or Google Artifact
+     * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
      * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; @@ -1570,8 +1570,8 @@ public Builder clearImage() { * * *
-     * Required. URL of the Container image in Google Container Registry or Docker
-     * More info: https://kubernetes.io/docs/concepts/containers/images
+     * Required. URL of the Container image in Google Container Registry or Google Artifact
+     * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
      * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ContainerOrBuilder.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ContainerOrBuilder.java index d1b3382..893005e 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ContainerOrBuilder.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ContainerOrBuilder.java @@ -52,8 +52,8 @@ public interface ContainerOrBuilder * * *
-   * Required. URL of the Container image in Google Container Registry or Docker
-   * More info: https://kubernetes.io/docs/concepts/containers/images
+   * Required. URL of the Container image in Google Container Registry or Google Artifact
+   * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
    * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; @@ -65,8 +65,8 @@ public interface ContainerOrBuilder * * *
-   * Required. URL of the Container image in Google Container Registry or Docker
-   * More info: https://kubernetes.io/docs/concepts/containers/images
+   * Required. URL of the Container image in Google Container Registry or Google Artifact
+   * Registry. More info: https://kubernetes.io/docs/concepts/containers/images
    * 
* * string image = 2 [(.google.api.field_behavior) = REQUIRED]; diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ExecutionEnvironment.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ExecutionEnvironment.java index b9e959e..f2d5273 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ExecutionEnvironment.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ExecutionEnvironment.java @@ -42,12 +42,12 @@ public enum ExecutionEnvironment implements com.google.protobuf.ProtocolMessageE * * *
-   * Uses the Google-default environment.
+   * Uses the First Generation environment.
    * 
* - * EXECUTION_ENVIRONMENT_DEFAULT = 1; + * EXECUTION_ENVIRONMENT_GEN1 = 1; */ - EXECUTION_ENVIRONMENT_DEFAULT(1), + EXECUTION_ENVIRONMENT_GEN1(1), /** * * @@ -75,12 +75,12 @@ public enum ExecutionEnvironment implements com.google.protobuf.ProtocolMessageE * * *
-   * Uses the Google-default environment.
+   * Uses the First Generation environment.
    * 
* - * EXECUTION_ENVIRONMENT_DEFAULT = 1; + * EXECUTION_ENVIRONMENT_GEN1 = 1; */ - public static final int EXECUTION_ENVIRONMENT_DEFAULT_VALUE = 1; + public static final int EXECUTION_ENVIRONMENT_GEN1_VALUE = 1; /** * * @@ -119,7 +119,7 @@ public static ExecutionEnvironment forNumber(int value) { case 0: return EXECUTION_ENVIRONMENT_UNSPECIFIED; case 1: - return EXECUTION_ENVIRONMENT_DEFAULT; + return EXECUTION_ENVIRONMENT_GEN1; case 2: return EXECUTION_ENVIRONMENT_GEN2; default: diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/K8sMinProto.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/K8sMinProto.java index 26c60b3..3e563eb 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/K8sMinProto.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/K8sMinProto.java @@ -118,21 +118,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "A\002\0221\n\005items\030\002 \003(\0132\".google.cloud.run.v2." + "VersionToPath\022\024\n\014default_mode\030\003 \001(\005\"A\n\rV" + "ersionToPath\022\021\n\004path\030\001 \001(\tB\003\340A\002\022\017\n\007versi" - + "on\030\002 \001(\t\022\014\n\004mode\030\003 \001(\005\"\'\n\020CloudSqlInstan" - + "ce\022\023\n\013connections\030\001 \003(\tB\366\003\n\027com.google.c" - + "loud.run.v2B\013K8sMinProtoP\001Z6google.golan" - + "g.org/genproto/googleapis/cloud/run/v2;r" - + "un\352Ax\n!cloudkms.googleapis.com/CryptoKey" - + "\022Sprojects/{project}/locations/{location" - + "}/keyRings/{key_ring}/cryptoKeys/{crypto" - + "_key}\352AJ\n#secretmanager.googleapis.com/S" - + "ecret\022#projects/{project}/secrets/{secre" - + "t}\352Ad\n*secretmanager.googleapis.com/Secr" - + "etVersion\0226projects/{project}/secrets/{s" - + "ecret}/versions/{version}\352Ad\n\"vpcaccess." - + "googleapis.com/Connector\022>projects/{proj" - + "ect}/locations/{location}/connectors/{co" - + "nnector}b\006proto3" + + "on\030\002 \001(\t\022\014\n\004mode\030\003 \001(\005\"%\n\020CloudSqlInstan" + + "ce\022\021\n\tinstances\030\001 \003(\tB\366\003\n\027com.google.clo" + + "ud.run.v2B\013K8sMinProtoP\001Z6google.golang." + + "org/genproto/googleapis/cloud/run/v2;run" + + "\352Ax\n!cloudkms.googleapis.com/CryptoKey\022S" + + "projects/{project}/locations/{location}/" + + "keyRings/{key_ring}/cryptoKeys/{crypto_k" + + "ey}\352AJ\n#secretmanager.googleapis.com/Sec" + + "ret\022#projects/{project}/secrets/{secret}" + + "\352Ad\n*secretmanager.googleapis.com/Secret" + + "Version\0226projects/{project}/secrets/{sec" + + "ret}/versions/{version}\352Ad\n\"vpcaccess.go" + + "ogleapis.com/Connector\022>projects/{projec" + + "t}/locations/{location}/connectors/{conn" + + "ector}b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -235,7 +235,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_run_v2_CloudSqlInstance_descriptor, new java.lang.String[] { - "Connections", + "Instances", }); com.google.protobuf.ExtensionRegistry registry = com.google.protobuf.ExtensionRegistry.newInstance(); diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Revision.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Revision.java index 87f9f7d..decd71d 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Revision.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Revision.java @@ -234,11 +234,6 @@ private Revision( vpcAccess_ = subBuilder.buildPartial(); } - break; - } - case 112: - { - containerConcurrency_ = input.readInt32(); break; } case 122: @@ -283,11 +278,6 @@ private Revision( input.readMessage(com.google.cloud.run.v2.Volume.parser(), extensionRegistry)); break; } - case 152: - { - confidential_ = input.readBool(); - break; - } case 160: { int rawValue = input.readEnum(); @@ -329,6 +319,11 @@ private Revision( logUri_ = s; break; } + case 272: + { + maxInstanceRequestConcurrency_ = input.readInt32(); + break; + } case 794: { java.lang.String s = input.readStringRequireUtf8(); @@ -1138,8 +1133,8 @@ public com.google.cloud.run.v2.VpcAccessOrBuilder getVpcAccessOrBuilder() { return getVpcAccess(); } - public static final int CONTAINER_CONCURRENCY_FIELD_NUMBER = 14; - private int containerConcurrency_; + public static final int MAX_INSTANCE_REQUEST_CONCURRENCY_FIELD_NUMBER = 34; + private int maxInstanceRequestConcurrency_; /** * * @@ -1147,13 +1142,13 @@ public com.google.cloud.run.v2.VpcAccessOrBuilder getVpcAccessOrBuilder() { * Sets the maximum number of requests that each serving instance can receive. * * - * int32 container_concurrency = 14; + * int32 max_instance_request_concurrency = 34; * - * @return The containerConcurrency. + * @return The maxInstanceRequestConcurrency. */ @java.lang.Override - public int getContainerConcurrency() { - return containerConcurrency_; + public int getMaxInstanceRequestConcurrency() { + return maxInstanceRequestConcurrency_; } public static final int TIMEOUT_FIELD_NUMBER = 15; @@ -1398,24 +1393,6 @@ public com.google.cloud.run.v2.VolumeOrBuilder getVolumesOrBuilder(int index) { return volumes_.get(index); } - public static final int CONFIDENTIAL_FIELD_NUMBER = 19; - private boolean confidential_; - /** - * - * - *
-   * Indicates whether Confidential Cloud Run is enabled in this Revision.
-   * 
- * - * bool confidential = 19; - * - * @return The confidential. - */ - @java.lang.Override - public boolean getConfidential() { - return confidential_; - } - public static final int EXECUTION_ENVIRONMENT_FIELD_NUMBER = 20; private int executionEnvironment_; /** @@ -1780,9 +1757,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (vpcAccess_ != null) { output.writeMessage(13, getVpcAccess()); } - if (containerConcurrency_ != 0) { - output.writeInt32(14, containerConcurrency_); - } if (timeout_ != null) { output.writeMessage(15, getTimeout()); } @@ -1795,9 +1769,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < volumes_.size(); i++) { output.writeMessage(18, volumes_.get(i)); } - if (confidential_ != false) { - output.writeBool(19, confidential_); - } if (executionEnvironment_ != com.google.cloud.run.v2.ExecutionEnvironment.EXECUTION_ENVIRONMENT_UNSPECIFIED .getNumber()) { @@ -1818,6 +1789,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logUri_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 33, logUri_); } + if (maxInstanceRequestConcurrency_ != 0) { + output.writeInt32(34, maxInstanceRequestConcurrency_); + } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 99, etag_); } @@ -1883,9 +1857,6 @@ public int getSerializedSize() { if (vpcAccess_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(13, getVpcAccess()); } - if (containerConcurrency_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeInt32Size(14, containerConcurrency_); - } if (timeout_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(15, getTimeout()); } @@ -1898,9 +1869,6 @@ public int getSerializedSize() { for (int i = 0; i < volumes_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(18, volumes_.get(i)); } - if (confidential_ != false) { - size += com.google.protobuf.CodedOutputStream.computeBoolSize(19, confidential_); - } if (executionEnvironment_ != com.google.cloud.run.v2.ExecutionEnvironment.EXECUTION_ENVIRONMENT_UNSPECIFIED .getNumber()) { @@ -1921,6 +1889,11 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(logUri_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(33, logUri_); } + if (maxInstanceRequestConcurrency_ != 0) { + size += + com.google.protobuf.CodedOutputStream.computeInt32Size( + 34, maxInstanceRequestConcurrency_); + } if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(etag_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(99, etag_); } @@ -1970,7 +1943,8 @@ public boolean equals(final java.lang.Object obj) { if (hasVpcAccess()) { if (!getVpcAccess().equals(other.getVpcAccess())) return false; } - if (getContainerConcurrency() != other.getContainerConcurrency()) return false; + if (getMaxInstanceRequestConcurrency() != other.getMaxInstanceRequestConcurrency()) + return false; if (hasTimeout() != other.hasTimeout()) return false; if (hasTimeout()) { if (!getTimeout().equals(other.getTimeout())) return false; @@ -1978,7 +1952,6 @@ public boolean equals(final java.lang.Object obj) { if (!getServiceAccount().equals(other.getServiceAccount())) return false; if (!getContainersList().equals(other.getContainersList())) return false; if (!getVolumesList().equals(other.getVolumesList())) return false; - if (getConfidential() != other.getConfidential()) return false; if (executionEnvironment_ != other.executionEnvironment_) return false; if (!getEncryptionKey().equals(other.getEncryptionKey())) return false; if (getReconciling() != other.getReconciling()) return false; @@ -2039,8 +2012,8 @@ public int hashCode() { hash = (37 * hash) + VPC_ACCESS_FIELD_NUMBER; hash = (53 * hash) + getVpcAccess().hashCode(); } - hash = (37 * hash) + CONTAINER_CONCURRENCY_FIELD_NUMBER; - hash = (53 * hash) + getContainerConcurrency(); + hash = (37 * hash) + MAX_INSTANCE_REQUEST_CONCURRENCY_FIELD_NUMBER; + hash = (53 * hash) + getMaxInstanceRequestConcurrency(); if (hasTimeout()) { hash = (37 * hash) + TIMEOUT_FIELD_NUMBER; hash = (53 * hash) + getTimeout().hashCode(); @@ -2055,8 +2028,6 @@ public int hashCode() { hash = (37 * hash) + VOLUMES_FIELD_NUMBER; hash = (53 * hash) + getVolumesList().hashCode(); } - hash = (37 * hash) + CONFIDENTIAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConfidential()); hash = (37 * hash) + EXECUTION_ENVIRONMENT_FIELD_NUMBER; hash = (53 * hash) + executionEnvironment_; hash = (37 * hash) + ENCRYPTION_KEY_FIELD_NUMBER; @@ -2295,7 +2266,7 @@ public Builder clear() { vpcAccess_ = null; vpcAccessBuilder_ = null; } - containerConcurrency_ = 0; + maxInstanceRequestConcurrency_ = 0; if (timeoutBuilder_ == null) { timeout_ = null; @@ -2317,8 +2288,6 @@ public Builder clear() { } else { volumesBuilder_.clear(); } - confidential_ = false; - executionEnvironment_ = 0; encryptionKey_ = ""; @@ -2403,7 +2372,7 @@ public com.google.cloud.run.v2.Revision buildPartial() { } else { result.vpcAccess_ = vpcAccessBuilder_.build(); } - result.containerConcurrency_ = containerConcurrency_; + result.maxInstanceRequestConcurrency_ = maxInstanceRequestConcurrency_; if (timeoutBuilder_ == null) { result.timeout_ = timeout_; } else { @@ -2428,7 +2397,6 @@ public com.google.cloud.run.v2.Revision buildPartial() { } else { result.volumes_ = volumesBuilder_.build(); } - result.confidential_ = confidential_; result.executionEnvironment_ = executionEnvironment_; result.encryptionKey_ = encryptionKey_; result.reconciling_ = reconciling_; @@ -2531,8 +2499,8 @@ public Builder mergeFrom(com.google.cloud.run.v2.Revision other) { if (other.hasVpcAccess()) { mergeVpcAccess(other.getVpcAccess()); } - if (other.getContainerConcurrency() != 0) { - setContainerConcurrency(other.getContainerConcurrency()); + if (other.getMaxInstanceRequestConcurrency() != 0) { + setMaxInstanceRequestConcurrency(other.getMaxInstanceRequestConcurrency()); } if (other.hasTimeout()) { mergeTimeout(other.getTimeout()); @@ -2595,9 +2563,6 @@ public Builder mergeFrom(com.google.cloud.run.v2.Revision other) { } } } - if (other.getConfidential() != false) { - setConfidential(other.getConfidential()); - } if (other.executionEnvironment_ != 0) { setExecutionEnvironmentValue(other.getExecutionEnvironmentValue()); } @@ -4755,7 +4720,7 @@ public com.google.cloud.run.v2.VpcAccessOrBuilder getVpcAccessOrBuilder() { return vpcAccessBuilder_; } - private int containerConcurrency_; + private int maxInstanceRequestConcurrency_; /** * * @@ -4763,13 +4728,13 @@ public com.google.cloud.run.v2.VpcAccessOrBuilder getVpcAccessOrBuilder() { * Sets the maximum number of requests that each serving instance can receive. * * - * int32 container_concurrency = 14; + * int32 max_instance_request_concurrency = 34; * - * @return The containerConcurrency. + * @return The maxInstanceRequestConcurrency. */ @java.lang.Override - public int getContainerConcurrency() { - return containerConcurrency_; + public int getMaxInstanceRequestConcurrency() { + return maxInstanceRequestConcurrency_; } /** * @@ -4778,14 +4743,14 @@ public int getContainerConcurrency() { * Sets the maximum number of requests that each serving instance can receive. * * - * int32 container_concurrency = 14; + * int32 max_instance_request_concurrency = 34; * - * @param value The containerConcurrency to set. + * @param value The maxInstanceRequestConcurrency to set. * @return This builder for chaining. */ - public Builder setContainerConcurrency(int value) { + public Builder setMaxInstanceRequestConcurrency(int value) { - containerConcurrency_ = value; + maxInstanceRequestConcurrency_ = value; onChanged(); return this; } @@ -4796,13 +4761,13 @@ public Builder setContainerConcurrency(int value) { * Sets the maximum number of requests that each serving instance can receive. * * - * int32 container_concurrency = 14; + * int32 max_instance_request_concurrency = 34; * * @return This builder for chaining. */ - public Builder clearContainerConcurrency() { + public Builder clearMaxInstanceRequestConcurrency() { - containerConcurrency_ = 0; + maxInstanceRequestConcurrency_ = 0; onChanged(); return this; } @@ -5814,58 +5779,6 @@ public java.util.List getVolumesBuilderL return volumesBuilder_; } - private boolean confidential_; - /** - * - * - *
-     * Indicates whether Confidential Cloud Run is enabled in this Revision.
-     * 
- * - * bool confidential = 19; - * - * @return The confidential. - */ - @java.lang.Override - public boolean getConfidential() { - return confidential_; - } - /** - * - * - *
-     * Indicates whether Confidential Cloud Run is enabled in this Revision.
-     * 
- * - * bool confidential = 19; - * - * @param value The confidential to set. - * @return This builder for chaining. - */ - public Builder setConfidential(boolean value) { - - confidential_ = value; - onChanged(); - return this; - } - /** - * - * - *
-     * Indicates whether Confidential Cloud Run is enabled in this Revision.
-     * 
- * - * bool confidential = 19; - * - * @return This builder for chaining. - */ - public Builder clearConfidential() { - - confidential_ = false; - onChanged(); - return this; - } - private int executionEnvironment_ = 0; /** * diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionOrBuilder.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionOrBuilder.java index 43ea534..1ebeb9a 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionOrBuilder.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionOrBuilder.java @@ -548,11 +548,11 @@ java.lang.String getAnnotationsOrDefault( * Sets the maximum number of requests that each serving instance can receive. * * - * int32 container_concurrency = 14; + * int32 max_instance_request_concurrency = 34; * - * @return The containerConcurrency. + * @return The maxInstanceRequestConcurrency. */ - int getContainerConcurrency(); + int getMaxInstanceRequestConcurrency(); /** * @@ -725,19 +725,6 @@ java.lang.String getAnnotationsOrDefault( */ com.google.cloud.run.v2.VolumeOrBuilder getVolumesOrBuilder(int index); - /** - * - * - *
-   * Indicates whether Confidential Cloud Run is enabled in this Revision.
-   * 
- * - * bool confidential = 19; - * - * @return The confidential. - */ - boolean getConfidential(); - /** * * diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionProto.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionProto.java index 6cc1aad..9e62e90 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionProto.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionProto.java @@ -69,75 +69,79 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "s.proto\032\027google/api/client.proto\032\037google" + "/api/field_behavior.proto\032\035google/api/la" + "unch_stage.proto\032\031google/api/resource.pr" - + "oto\032#google/cloud/run/v2/condition.proto" - + "\032!google/cloud/run/v2/k8s.min.proto\032)goo" - + "gle/cloud/run/v2/vendor_settings.proto\032#" - + "google/longrunning/operations.proto\032\036goo" - + "gle/protobuf/duration.proto\032\037google/prot" - + "obuf/timestamp.proto\"G\n\022GetRevisionReque" - + "st\0221\n\004name\030\001 \001(\tB#\340A\002\372A\035\n\033run.googleapis" - + ".com/Revision\"\210\001\n\024ListRevisionsRequest\0223" - + "\n\006parent\030\001 \001(\tB#\340A\002\372A\035\022\033run.googleapis.c" - + "om/Revision\022\021\n\tpage_size\030\002 \001(\005\022\022\n\npage_t" - + "oken\030\003 \001(\t\022\024\n\014show_deleted\030\004 \001(\010\"b\n\025List" - + "RevisionsResponse\0220\n\trevisions\030\001 \003(\0132\035.g" - + "oogle.cloud.run.v2.Revision\022\027\n\017next_page" - + "_token\030\002 \001(\t\"o\n\025DeleteRevisionRequest\0221\n" - + "\004name\030\001 \001(\tB#\340A\002\372A\035\n\033run.googleapis.com/" - + "Revision\022\025\n\rvalidate_only\030\002 \001(\010\022\014\n\004etag\030" - + "\003 \001(\t\"\314\n\n\010Revision\022\021\n\004name\030\001 \001(\tB\003\340A\003\022\020\n" - + "\003uid\030\002 \001(\tB\003\340A\003\022\027\n\ngeneration\030\003 \001(\003B\003\340A\003" - + "\0229\n\006labels\030\004 \003(\0132).google.cloud.run.v2.R" - + "evision.LabelsEntry\022C\n\013annotations\030\005 \003(\013" - + "2..google.cloud.run.v2.Revision.Annotati" - + "onsEntry\0224\n\013create_time\030\006 \001(\0132\032.google.p" - + "rotobuf.TimestampB\003\340A\003\0224\n\013update_time\030\007 " + + "oto\032\030google/api/routing.proto\032#google/cl" + + "oud/run/v2/condition.proto\032!google/cloud" + + "/run/v2/k8s.min.proto\032)google/cloud/run/" + + "v2/vendor_settings.proto\032#google/longrun" + + "ning/operations.proto\032\036google/protobuf/d" + + "uration.proto\032\037google/protobuf/timestamp" + + ".proto\"G\n\022GetRevisionRequest\0221\n\004name\030\001 \001" + + "(\tB#\340A\002\372A\035\n\033run.googleapis.com/Revision\"" + + "\210\001\n\024ListRevisionsRequest\0223\n\006parent\030\001 \001(\t" + + "B#\340A\002\372A\035\022\033run.googleapis.com/Revision\022\021\n" + + "\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022\024\n\014" + + "show_deleted\030\004 \001(\010\"b\n\025ListRevisionsRespo" + + "nse\0220\n\trevisions\030\001 \003(\0132\035.google.cloud.ru" + + "n.v2.Revision\022\027\n\017next_page_token\030\002 \001(\t\"o" + + "\n\025DeleteRevisionRequest\0221\n\004name\030\001 \001(\tB#\340" + + "A\002\372A\035\n\033run.googleapis.com/Revision\022\025\n\rva" + + "lidate_only\030\002 \001(\010\022\014\n\004etag\030\003 \001(\t\"\301\n\n\010Revi" + + "sion\022\021\n\004name\030\001 \001(\tB\003\340A\003\022\020\n\003uid\030\002 \001(\tB\003\340A" + + "\003\022\027\n\ngeneration\030\003 \001(\003B\003\340A\003\0229\n\006labels\030\004 \003" + + "(\0132).google.cloud.run.v2.Revision.Labels" + + "Entry\022C\n\013annotations\030\005 \003(\0132..google.clou" + + "d.run.v2.Revision.AnnotationsEntry\0224\n\013cr" + + "eate_time\030\006 \001(\0132\032.google.protobuf.Timest" + + "ampB\003\340A\003\0224\n\013update_time\030\007 \001(\0132\032.google.p" + + "rotobuf.TimestampB\003\340A\003\0224\n\013delete_time\030\010 " + "\001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n\013" - + "delete_time\030\010 \001(\0132\032.google.protobuf.Time" - + "stampB\003\340A\003\0224\n\013expire_time\030\t \001(\0132\032.google" - + ".protobuf.TimestampB\003\340A\003\022-\n\014launch_stage" - + "\030\n \001(\0162\027.google.api.LaunchStage\0223\n\007servi" - + "ce\030\013 \001(\tB\"\340A\003\372A\034\n\032run.googleapis.com/Ser" - + "vice\0225\n\007scaling\030\014 \001(\0132$.google.cloud.run" - + ".v2.RevisionScaling\0222\n\nvpc_access\030\r \001(\0132" - + "\036.google.cloud.run.v2.VpcAccess\022\035\n\025conta" - + "iner_concurrency\030\016 \001(\005\022*\n\007timeout\030\017 \001(\0132" - + "\031.google.protobuf.Duration\022\027\n\017service_ac" - + "count\030\020 \001(\t\0222\n\ncontainers\030\021 \003(\0132\036.google" - + ".cloud.run.v2.Container\022,\n\007volumes\030\022 \003(\013" - + "2\033.google.cloud.run.v2.Volume\022\024\n\014confide" - + "ntial\030\023 \001(\010\022H\n\025execution_environment\030\024 \001" - + "(\0162).google.cloud.run.v2.ExecutionEnviro" - + "nment\022>\n\016encryption_key\030\025 \001(\tB&\372A#\n!clou" - + "dkms.googleapis.com/CryptoKey\022\030\n\013reconci" - + "ling\030\036 \001(\010B\003\340A\003\0227\n\nconditions\030\037 \003(\0132\036.go" - + "ogle.cloud.run.v2.ConditionB\003\340A\003\022 \n\023obse" - + "rved_generation\030 \001(\003B\003\340A\003\022\024\n\007log_uri\030! " - + "\001(\tB\003\340A\003\022\021\n\004etag\030c \001(\tB\003\340A\003\032-\n\013LabelsEnt" - + "ry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020An" - + "notationsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001" - + "(\t:\0028\001:t\352Aq\n\033run.googleapis.com/Revision" - + "\022Oprojects/{project}/locations/{location" - + "}/services/{service}/revisions/{revision" - + "}R\001\0012\346\004\n\tRevisions\022\236\001\n\013GetRevision\022\'.goo" - + "gle.cloud.run.v2.GetRevisionRequest\032\035.go" - + "ogle.cloud.run.v2.Revision\"G\202\323\344\223\002:\0228/v2/" - + "{name=projects/*/locations/*/services/*/" - + "revisions/*}\332A\004name\022\261\001\n\rListRevisions\022)." - + "google.cloud.run.v2.ListRevisionsRequest" - + "\032*.google.cloud.run.v2.ListRevisionsResp" - + "onse\"I\202\323\344\223\002:\0228/v2/{parent=projects/*/loc" - + "ations/*/services/*}/revisions\332A\006parent\022" - + "\273\001\n\016DeleteRevision\022*.google.cloud.run.v2" - + ".DeleteRevisionRequest\032\035.google.longrunn" - + "ing.Operation\"^\202\323\344\223\002:*8/v2/{name=project" - + "s/*/locations/*/services/*/revisions/*}\332" - + "A\004name\312A\024\n\010Revision\022\010Revision\032F\312A\022run.go" - + "ogleapis.com\322A.https://www.googleapis.co" - + "m/auth/cloud-platformBb\n\027com.google.clou" - + "d.run.v2B\rRevisionProtoP\001Z6google.golang" - + ".org/genproto/googleapis/cloud/run/v2;ru" - + "nb\006proto3" + + "expire_time\030\t \001(\0132\032.google.protobuf.Time" + + "stampB\003\340A\003\022-\n\014launch_stage\030\n \001(\0162\027.googl" + + "e.api.LaunchStage\0223\n\007service\030\013 \001(\tB\"\340A\003\372" + + "A\034\n\032run.googleapis.com/Service\0225\n\007scalin" + + "g\030\014 \001(\0132$.google.cloud.run.v2.RevisionSc" + + "aling\0222\n\nvpc_access\030\r \001(\0132\036.google.cloud" + + ".run.v2.VpcAccess\022(\n max_instance_reques" + + "t_concurrency\030\" \001(\005\022*\n\007timeout\030\017 \001(\0132\031.g" + + "oogle.protobuf.Duration\022\027\n\017service_accou" + + "nt\030\020 \001(\t\0222\n\ncontainers\030\021 \003(\0132\036.google.cl" + + "oud.run.v2.Container\022,\n\007volumes\030\022 \003(\0132\033." + + "google.cloud.run.v2.Volume\022H\n\025execution_" + + "environment\030\024 \001(\0162).google.cloud.run.v2." + + "ExecutionEnvironment\022>\n\016encryption_key\030\025" + + " \001(\tB&\372A#\n!cloudkms.googleapis.com/Crypt" + + "oKey\022\030\n\013reconciling\030\036 \001(\010B\003\340A\003\0227\n\ncondit" + + "ions\030\037 \003(\0132\036.google.cloud.run.v2.Conditi" + + "onB\003\340A\003\022 \n\023observed_generation\030 \001(\003B\003\340A" + + "\003\022\024\n\007log_uri\030! \001(\tB\003\340A\003\022\021\n\004etag\030c \001(\tB\003\340" + + "A\003\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030" + + "\002 \001(\t:\0028\001\0322\n\020AnnotationsEntry\022\013\n\003key\030\001 \001" + + "(\t\022\r\n\005value\030\002 \001(\t:\0028\001:t\352Aq\n\033run.googleap" + + "is.com/Revision\022Oprojects/{project}/loca" + + "tions/{location}/services/{service}/revi" + + "sions/{revision}R\001\0012\205\006\n\tRevisions\022\322\001\n\013Ge" + + "tRevision\022\'.google.cloud.run.v2.GetRevis" + + "ionRequest\032\035.google.cloud.run.v2.Revisio" + + "n\"{\202\323\344\223\002:\0228/v2/{name=projects/*/location" + + "s/*/services/*/revisions/*}\212\323\344\223\002.\022,\n\004nam" + + "e\022$projects/*/locations/{location=*}/**\332" + + "A\004name\022\347\001\n\rListRevisions\022).google.cloud." + + "run.v2.ListRevisionsRequest\032*.google.clo" + + "ud.run.v2.ListRevisionsResponse\"\177\202\323\344\223\002:\022" + + "8/v2/{parent=projects/*/locations/*/serv" + + "ices/*}/revisions\212\323\344\223\0020\022.\n\006parent\022$proje" + + "cts/*/locations/{location=*}/**\332A\006parent" + + "\022\360\001\n\016DeleteRevision\022*.google.cloud.run.v" + + "2.DeleteRevisionRequest\032\035.google.longrun" + + "ning.Operation\"\222\001\202\323\344\223\002:*8/v2/{name=proje" + + "cts/*/locations/*/services/*/revisions/*" + + "}\212\323\344\223\002.\022,\n\004name\022$projects/*/locations/{l" + + "ocation=*}/**\332A\004name\312A\024\n\010Revision\022\010Revis" + + "ion\032F\312A\022run.googleapis.com\322A.https://www" + + ".googleapis.com/auth/cloud-platformBb\n\027c" + + "om.google.cloud.run.v2B\rRevisionProtoP\001Z" + + "6google.golang.org/genproto/googleapis/c" + + "loud/run/v2;runb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -148,6 +152,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.api.FieldBehaviorProto.getDescriptor(), com.google.api.LaunchStageProto.getDescriptor(), com.google.api.ResourceProto.getDescriptor(), + com.google.api.RoutingProto.getDescriptor(), com.google.cloud.run.v2.ConditionProto.getDescriptor(), com.google.cloud.run.v2.K8sMinProto.getDescriptor(), com.google.cloud.run.v2.VendorSettingsProto.getDescriptor(), @@ -206,12 +211,11 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Service", "Scaling", "VpcAccess", - "ContainerConcurrency", + "MaxInstanceRequestConcurrency", "Timeout", "ServiceAccount", "Containers", "Volumes", - "Confidential", "ExecutionEnvironment", "EncryptionKey", "Reconciling", @@ -245,6 +249,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.ClientProto.oauthScopes); registry.add(com.google.api.ResourceProto.resource); registry.add(com.google.api.ResourceProto.resourceReference); + registry.add(com.google.api.RoutingProto.routing); registry.add(com.google.longrunning.OperationsProto.operationInfo); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); @@ -253,6 +258,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.api.FieldBehaviorProto.getDescriptor(); com.google.api.LaunchStageProto.getDescriptor(); com.google.api.ResourceProto.getDescriptor(); + com.google.api.RoutingProto.getDescriptor(); com.google.cloud.run.v2.ConditionProto.getDescriptor(); com.google.cloud.run.v2.K8sMinProto.getDescriptor(); com.google.cloud.run.v2.VendorSettingsProto.getDescriptor(); diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplate.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplate.java index c7901af..7f9d624 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplate.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplate.java @@ -141,11 +141,6 @@ private RevisionTemplate( vpcAccess_ = subBuilder.buildPartial(); } - break; - } - case 56: - { - containerConcurrency_ = input.readInt32(); break; } case 66: @@ -190,11 +185,6 @@ private RevisionTemplate( input.readMessage(com.google.cloud.run.v2.Volume.parser(), extensionRegistry)); break; } - case 96: - { - confidential_ = input.readBool(); - break; - } case 104: { int rawValue = input.readEnum(); @@ -209,6 +199,11 @@ private RevisionTemplate( encryptionKey_ = s; break; } + case 120: + { + maxInstanceRequestConcurrency_ = input.readInt32(); + break; + } default: { if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { @@ -610,24 +605,6 @@ public com.google.cloud.run.v2.VpcAccessOrBuilder getVpcAccessOrBuilder() { return getVpcAccess(); } - public static final int CONTAINER_CONCURRENCY_FIELD_NUMBER = 7; - private int containerConcurrency_; - /** - * - * - *
-   * Sets the maximum number of requests that each serving instance can receive.
-   * 
- * - * int32 container_concurrency = 7; - * - * @return The containerConcurrency. - */ - @java.lang.Override - public int getContainerConcurrency() { - return containerConcurrency_; - } - public static final int TIMEOUT_FIELD_NUMBER = 8; private com.google.protobuf.Duration timeout_; /** @@ -872,24 +849,6 @@ public com.google.cloud.run.v2.VolumeOrBuilder getVolumesOrBuilder(int index) { return volumes_.get(index); } - public static final int CONFIDENTIAL_FIELD_NUMBER = 12; - private boolean confidential_; - /** - * - * - *
-   * Enables Confidential Cloud Run in Revisions created using this template.
-   * 
- * - * bool confidential = 12; - * - * @return The confidential. - */ - @java.lang.Override - public boolean getConfidential() { - return confidential_; - } - public static final int EXECUTION_ENVIRONMENT_FIELD_NUMBER = 13; private int executionEnvironment_; /** @@ -979,6 +938,24 @@ public com.google.protobuf.ByteString getEncryptionKeyBytes() { } } + public static final int MAX_INSTANCE_REQUEST_CONCURRENCY_FIELD_NUMBER = 15; + private int maxInstanceRequestConcurrency_; + /** + * + * + *
+   * Sets the maximum number of requests that each serving instance can receive.
+   * 
+ * + * int32 max_instance_request_concurrency = 15; + * + * @return The maxInstanceRequestConcurrency. + */ + @java.lang.Override + public int getMaxInstanceRequestConcurrency() { + return maxInstanceRequestConcurrency_; + } + private byte memoizedIsInitialized = -1; @java.lang.Override @@ -1006,9 +983,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (vpcAccess_ != null) { output.writeMessage(6, getVpcAccess()); } - if (containerConcurrency_ != 0) { - output.writeInt32(7, containerConcurrency_); - } if (timeout_ != null) { output.writeMessage(8, getTimeout()); } @@ -1021,9 +995,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io for (int i = 0; i < volumes_.size(); i++) { output.writeMessage(11, volumes_.get(i)); } - if (confidential_ != false) { - output.writeBool(12, confidential_); - } if (executionEnvironment_ != com.google.cloud.run.v2.ExecutionEnvironment.EXECUTION_ENVIRONMENT_UNSPECIFIED .getNumber()) { @@ -1032,6 +1003,9 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(encryptionKey_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 14, encryptionKey_); } + if (maxInstanceRequestConcurrency_ != 0) { + output.writeInt32(15, maxInstanceRequestConcurrency_); + } unknownFields.writeTo(output); } @@ -1070,9 +1044,6 @@ public int getSerializedSize() { if (vpcAccess_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(6, getVpcAccess()); } - if (containerConcurrency_ != 0) { - size += com.google.protobuf.CodedOutputStream.computeInt32Size(7, containerConcurrency_); - } if (timeout_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(8, getTimeout()); } @@ -1085,9 +1056,6 @@ public int getSerializedSize() { for (int i = 0; i < volumes_.size(); i++) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(11, volumes_.get(i)); } - if (confidential_ != false) { - size += com.google.protobuf.CodedOutputStream.computeBoolSize(12, confidential_); - } if (executionEnvironment_ != com.google.cloud.run.v2.ExecutionEnvironment.EXECUTION_ENVIRONMENT_UNSPECIFIED .getNumber()) { @@ -1096,6 +1064,11 @@ public int getSerializedSize() { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(encryptionKey_)) { size += com.google.protobuf.GeneratedMessageV3.computeStringSize(14, encryptionKey_); } + if (maxInstanceRequestConcurrency_ != 0) { + size += + com.google.protobuf.CodedOutputStream.computeInt32Size( + 15, maxInstanceRequestConcurrency_); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -1122,7 +1095,6 @@ public boolean equals(final java.lang.Object obj) { if (hasVpcAccess()) { if (!getVpcAccess().equals(other.getVpcAccess())) return false; } - if (getContainerConcurrency() != other.getContainerConcurrency()) return false; if (hasTimeout() != other.hasTimeout()) return false; if (hasTimeout()) { if (!getTimeout().equals(other.getTimeout())) return false; @@ -1130,9 +1102,10 @@ public boolean equals(final java.lang.Object obj) { if (!getServiceAccount().equals(other.getServiceAccount())) return false; if (!getContainersList().equals(other.getContainersList())) return false; if (!getVolumesList().equals(other.getVolumesList())) return false; - if (getConfidential() != other.getConfidential()) return false; if (executionEnvironment_ != other.executionEnvironment_) return false; if (!getEncryptionKey().equals(other.getEncryptionKey())) return false; + if (getMaxInstanceRequestConcurrency() != other.getMaxInstanceRequestConcurrency()) + return false; if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -1162,8 +1135,6 @@ public int hashCode() { hash = (37 * hash) + VPC_ACCESS_FIELD_NUMBER; hash = (53 * hash) + getVpcAccess().hashCode(); } - hash = (37 * hash) + CONTAINER_CONCURRENCY_FIELD_NUMBER; - hash = (53 * hash) + getContainerConcurrency(); if (hasTimeout()) { hash = (37 * hash) + TIMEOUT_FIELD_NUMBER; hash = (53 * hash) + getTimeout().hashCode(); @@ -1178,12 +1149,12 @@ public int hashCode() { hash = (37 * hash) + VOLUMES_FIELD_NUMBER; hash = (53 * hash) + getVolumesList().hashCode(); } - hash = (37 * hash) + CONFIDENTIAL_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getConfidential()); hash = (37 * hash) + EXECUTION_ENVIRONMENT_FIELD_NUMBER; hash = (53 * hash) + executionEnvironment_; hash = (37 * hash) + ENCRYPTION_KEY_FIELD_NUMBER; hash = (53 * hash) + getEncryptionKey().hashCode(); + hash = (37 * hash) + MAX_INSTANCE_REQUEST_CONCURRENCY_FIELD_NUMBER; + hash = (53 * hash) + getMaxInstanceRequestConcurrency(); hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -1373,8 +1344,6 @@ public Builder clear() { vpcAccess_ = null; vpcAccessBuilder_ = null; } - containerConcurrency_ = 0; - if (timeoutBuilder_ == null) { timeout_ = null; } else { @@ -1395,12 +1364,12 @@ public Builder clear() { } else { volumesBuilder_.clear(); } - confidential_ = false; - executionEnvironment_ = 0; encryptionKey_ = ""; + maxInstanceRequestConcurrency_ = 0; + return this; } @@ -1444,7 +1413,6 @@ public com.google.cloud.run.v2.RevisionTemplate buildPartial() { } else { result.vpcAccess_ = vpcAccessBuilder_.build(); } - result.containerConcurrency_ = containerConcurrency_; if (timeoutBuilder_ == null) { result.timeout_ = timeout_; } else { @@ -1469,9 +1437,9 @@ public com.google.cloud.run.v2.RevisionTemplate buildPartial() { } else { result.volumes_ = volumesBuilder_.build(); } - result.confidential_ = confidential_; result.executionEnvironment_ = executionEnvironment_; result.encryptionKey_ = encryptionKey_; + result.maxInstanceRequestConcurrency_ = maxInstanceRequestConcurrency_; onBuilt(); return result; } @@ -1533,9 +1501,6 @@ public Builder mergeFrom(com.google.cloud.run.v2.RevisionTemplate other) { if (other.hasVpcAccess()) { mergeVpcAccess(other.getVpcAccess()); } - if (other.getContainerConcurrency() != 0) { - setContainerConcurrency(other.getContainerConcurrency()); - } if (other.hasTimeout()) { mergeTimeout(other.getTimeout()); } @@ -1597,9 +1562,6 @@ public Builder mergeFrom(com.google.cloud.run.v2.RevisionTemplate other) { } } } - if (other.getConfidential() != false) { - setConfidential(other.getConfidential()); - } if (other.executionEnvironment_ != 0) { setExecutionEnvironmentValue(other.getExecutionEnvironmentValue()); } @@ -1607,6 +1569,9 @@ public Builder mergeFrom(com.google.cloud.run.v2.RevisionTemplate other) { encryptionKey_ = other.encryptionKey_; onChanged(); } + if (other.getMaxInstanceRequestConcurrency() != 0) { + setMaxInstanceRequestConcurrency(other.getMaxInstanceRequestConcurrency()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -2447,58 +2412,6 @@ public com.google.cloud.run.v2.VpcAccessOrBuilder getVpcAccessOrBuilder() { return vpcAccessBuilder_; } - private int containerConcurrency_; - /** - * - * - *
-     * Sets the maximum number of requests that each serving instance can receive.
-     * 
- * - * int32 container_concurrency = 7; - * - * @return The containerConcurrency. - */ - @java.lang.Override - public int getContainerConcurrency() { - return containerConcurrency_; - } - /** - * - * - *
-     * Sets the maximum number of requests that each serving instance can receive.
-     * 
- * - * int32 container_concurrency = 7; - * - * @param value The containerConcurrency to set. - * @return This builder for chaining. - */ - public Builder setContainerConcurrency(int value) { - - containerConcurrency_ = value; - onChanged(); - return this; - } - /** - * - * - *
-     * Sets the maximum number of requests that each serving instance can receive.
-     * 
- * - * int32 container_concurrency = 7; - * - * @return This builder for chaining. - */ - public Builder clearContainerConcurrency() { - - containerConcurrency_ = 0; - onChanged(); - return this; - } - private com.google.protobuf.Duration timeout_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, @@ -3511,58 +3424,6 @@ public java.util.List getVolumesBuilderL return volumesBuilder_; } - private boolean confidential_; - /** - * - * - *
-     * Enables Confidential Cloud Run in Revisions created using this template.
-     * 
- * - * bool confidential = 12; - * - * @return The confidential. - */ - @java.lang.Override - public boolean getConfidential() { - return confidential_; - } - /** - * - * - *
-     * Enables Confidential Cloud Run in Revisions created using this template.
-     * 
- * - * bool confidential = 12; - * - * @param value The confidential to set. - * @return This builder for chaining. - */ - public Builder setConfidential(boolean value) { - - confidential_ = value; - onChanged(); - return this; - } - /** - * - * - *
-     * Enables Confidential Cloud Run in Revisions created using this template.
-     * 
- * - * bool confidential = 12; - * - * @return This builder for chaining. - */ - public Builder clearConfidential() { - - confidential_ = false; - onChanged(); - return this; - } - private int executionEnvironment_ = 0; /** * @@ -3770,6 +3631,58 @@ public Builder setEncryptionKeyBytes(com.google.protobuf.ByteString value) { return this; } + private int maxInstanceRequestConcurrency_; + /** + * + * + *
+     * Sets the maximum number of requests that each serving instance can receive.
+     * 
+ * + * int32 max_instance_request_concurrency = 15; + * + * @return The maxInstanceRequestConcurrency. + */ + @java.lang.Override + public int getMaxInstanceRequestConcurrency() { + return maxInstanceRequestConcurrency_; + } + /** + * + * + *
+     * Sets the maximum number of requests that each serving instance can receive.
+     * 
+ * + * int32 max_instance_request_concurrency = 15; + * + * @param value The maxInstanceRequestConcurrency to set. + * @return This builder for chaining. + */ + public Builder setMaxInstanceRequestConcurrency(int value) { + + maxInstanceRequestConcurrency_ = value; + onChanged(); + return this; + } + /** + * + * + *
+     * Sets the maximum number of requests that each serving instance can receive.
+     * 
+ * + * int32 max_instance_request_concurrency = 15; + * + * @return This builder for chaining. + */ + public Builder clearMaxInstanceRequestConcurrency() { + + maxInstanceRequestConcurrency_ = 0; + onChanged(); + return this; + } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplateOrBuilder.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplateOrBuilder.java index b46f561..15f01a2 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplateOrBuilder.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplateOrBuilder.java @@ -241,19 +241,6 @@ java.lang.String getAnnotationsOrDefault( */ com.google.cloud.run.v2.VpcAccessOrBuilder getVpcAccessOrBuilder(); - /** - * - * - *
-   * Sets the maximum number of requests that each serving instance can receive.
-   * 
- * - * int32 container_concurrency = 7; - * - * @return The containerConcurrency. - */ - int getContainerConcurrency(); - /** * * @@ -427,19 +414,6 @@ java.lang.String getAnnotationsOrDefault( */ com.google.cloud.run.v2.VolumeOrBuilder getVolumesOrBuilder(int index); - /** - * - * - *
-   * Enables Confidential Cloud Run in Revisions created using this template.
-   * 
- * - * bool confidential = 12; - * - * @return The confidential. - */ - boolean getConfidential(); - /** * * @@ -493,4 +467,17 @@ java.lang.String getAnnotationsOrDefault( * @return The bytes for encryptionKey. */ com.google.protobuf.ByteString getEncryptionKeyBytes(); + + /** + * + * + *
+   * Sets the maximum number of requests that each serving instance can receive.
+   * 
+ * + * int32 max_instance_request_concurrency = 15; + * + * @return The maxInstanceRequestConcurrency. + */ + int getMaxInstanceRequestConcurrency(); } diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplateProto.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplateProto.java index ef62fbd..b25c319 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplateProto.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/RevisionTemplateProto.java @@ -53,7 +53,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "esource.proto\032!google/cloud/run/v2/k8s.m" + "in.proto\032)google/cloud/run/v2/vendor_set" + "tings.proto\032\036google/protobuf/duration.pr" - + "oto\"\212\006\n\020RevisionTemplate\0222\n\010revision\030\001 \001" + + "oto\"\377\005\n\020RevisionTemplate\0222\n\010revision\030\001 \001" + "(\tB \372A\035\n\033run.googleapis.com/Revision\022A\n\006" + "labels\030\002 \003(\01321.google.cloud.run.v2.Revis" + "ionTemplate.LabelsEntry\022K\n\013annotations\030\003" @@ -61,21 +61,21 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "ate.AnnotationsEntry\0225\n\007scaling\030\004 \001(\0132$." + "google.cloud.run.v2.RevisionScaling\0222\n\nv" + "pc_access\030\006 \001(\0132\036.google.cloud.run.v2.Vp" - + "cAccess\022\035\n\025container_concurrency\030\007 \001(\005\022*" - + "\n\007timeout\030\010 \001(\0132\031.google.protobuf.Durati" - + "on\022\027\n\017service_account\030\t \001(\t\0222\n\ncontainer" - + "s\030\n \003(\0132\036.google.cloud.run.v2.Container\022" - + ",\n\007volumes\030\013 \003(\0132\033.google.cloud.run.v2.V" - + "olume\022\024\n\014confidential\030\014 \001(\010\022H\n\025execution" - + "_environment\030\r \001(\0162).google.cloud.run.v2" - + ".ExecutionEnvironment\022>\n\016encryption_key\030" - + "\016 \001(\tB&\372A#\n!cloudkms.googleapis.com/Cryp" - + "toKey\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005val" - + "ue\030\002 \001(\t:\0028\001\0322\n\020AnnotationsEntry\022\013\n\003key\030" - + "\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001Bj\n\027com.google.c" - + "loud.run.v2B\025RevisionTemplateProtoP\001Z6go" - + "ogle.golang.org/genproto/googleapis/clou" - + "d/run/v2;runb\006proto3" + + "cAccess\022*\n\007timeout\030\010 \001(\0132\031.google.protob" + + "uf.Duration\022\027\n\017service_account\030\t \001(\t\0222\n\n" + + "containers\030\n \003(\0132\036.google.cloud.run.v2.C" + + "ontainer\022,\n\007volumes\030\013 \003(\0132\033.google.cloud" + + ".run.v2.Volume\022H\n\025execution_environment\030" + + "\r \001(\0162).google.cloud.run.v2.ExecutionEnv" + + "ironment\022>\n\016encryption_key\030\016 \001(\tB&\372A#\n!c" + + "loudkms.googleapis.com/CryptoKey\022(\n max_" + + "instance_request_concurrency\030\017 \001(\005\032-\n\013La" + + "belsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028" + + "\001\0322\n\020AnnotationsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005va" + + "lue\030\002 \001(\t:\0028\001Bj\n\027com.google.cloud.run.v2" + + "B\025RevisionTemplateProtoP\001Z6google.golang" + + ".org/genproto/googleapis/cloud/run/v2;ru" + + "nb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -97,14 +97,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { "Annotations", "Scaling", "VpcAccess", - "ContainerConcurrency", "Timeout", "ServiceAccount", "Containers", "Volumes", - "Confidential", "ExecutionEnvironment", "EncryptionKey", + "MaxInstanceRequestConcurrency", }); internal_static_google_cloud_run_v2_RevisionTemplate_LabelsEntry_descriptor = internal_static_google_cloud_run_v2_RevisionTemplate_descriptor.getNestedTypes().get(0); diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Service.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Service.java index 19b8e9e..23e71c3 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Service.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/Service.java @@ -588,6 +588,8 @@ public com.google.protobuf.ByteString getUidBytes() { *
    * Output only. A number that monotonically increases every time the user
    * modifies the desired state.
+   * Please note that unlike v1, this is an int64 value. As with most Google
+   * APIs, its JSON representation will be a `string` instead of an `integer`.
    * 
* * int64 generation = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; @@ -1519,6 +1521,8 @@ public com.google.cloud.run.v2.TrafficTargetOrBuilder getTrafficOrBuilder(int in * Output only. The generation of this Service currently serving traffic. See comments in * `reconciling` for additional information on reconciliation process in Cloud * Run. + * Please note that unlike v1, this is an int64 value. As with most Google + * APIs, its JSON representation will be a `string` instead of an `integer`. * * * int64 observed_generation = 30 [(.google.api.field_behavior) = OUTPUT_ONLY]; @@ -3362,6 +3366,8 @@ public Builder setUidBytes(com.google.protobuf.ByteString value) { *
      * Output only. A number that monotonically increases every time the user
      * modifies the desired state.
+     * Please note that unlike v1, this is an int64 value. As with most Google
+     * APIs, its JSON representation will be a `string` instead of an `integer`.
      * 
* * int64 generation = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; @@ -3378,6 +3384,8 @@ public long getGeneration() { *
      * Output only. A number that monotonically increases every time the user
      * modifies the desired state.
+     * Please note that unlike v1, this is an int64 value. As with most Google
+     * APIs, its JSON representation will be a `string` instead of an `integer`.
      * 
* * int64 generation = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; @@ -3397,6 +3405,8 @@ public Builder setGeneration(long value) { *
      * Output only. A number that monotonically increases every time the user
      * modifies the desired state.
+     * Please note that unlike v1, this is an int64 value. As with most Google
+     * APIs, its JSON representation will be a `string` instead of an `integer`.
      * 
* * int64 generation = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; @@ -6051,6 +6061,8 @@ public java.util.List getTrafficB * Output only. The generation of this Service currently serving traffic. See comments in * `reconciling` for additional information on reconciliation process in Cloud * Run. + * Please note that unlike v1, this is an int64 value. As with most Google + * APIs, its JSON representation will be a `string` instead of an `integer`. * * * int64 observed_generation = 30 [(.google.api.field_behavior) = OUTPUT_ONLY]; @@ -6068,6 +6080,8 @@ public long getObservedGeneration() { * Output only. The generation of this Service currently serving traffic. See comments in * `reconciling` for additional information on reconciliation process in Cloud * Run. + * Please note that unlike v1, this is an int64 value. As with most Google + * APIs, its JSON representation will be a `string` instead of an `integer`. * * * int64 observed_generation = 30 [(.google.api.field_behavior) = OUTPUT_ONLY]; @@ -6088,6 +6102,8 @@ public Builder setObservedGeneration(long value) { * Output only. The generation of this Service currently serving traffic. See comments in * `reconciling` for additional information on reconciliation process in Cloud * Run. + * Please note that unlike v1, this is an int64 value. As with most Google + * APIs, its JSON representation will be a `string` instead of an `integer`. * * * int64 observed_generation = 30 [(.google.api.field_behavior) = OUTPUT_ONLY]; diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ServiceOrBuilder.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ServiceOrBuilder.java index ddd5c53..d8cc384 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ServiceOrBuilder.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ServiceOrBuilder.java @@ -116,6 +116,8 @@ public interface ServiceOrBuilder *
    * Output only. A number that monotonically increases every time the user
    * modifies the desired state.
+   * Please note that unlike v1, this is an int64 value. As with most Google
+   * APIs, its JSON representation will be a `string` instead of an `integer`.
    * 
* * int64 generation = 4 [(.google.api.field_behavior) = OUTPUT_ONLY]; @@ -772,6 +774,8 @@ java.lang.String getAnnotationsOrDefault( * Output only. The generation of this Service currently serving traffic. See comments in * `reconciling` for additional information on reconciliation process in Cloud * Run. + * Please note that unlike v1, this is an int64 value. As with most Google + * APIs, its JSON representation will be a `string` instead of an `integer`. * * * int64 observed_generation = 30 [(.google.api.field_behavior) = OUTPUT_ONLY]; diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ServiceProto.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ServiceProto.java index b941a5b..1325061 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ServiceProto.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/ServiceProto.java @@ -77,109 +77,114 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + ".proto\032\027google/api/client.proto\032\037google/" + "api/field_behavior.proto\032\035google/api/lau" + "nch_stage.proto\032\031google/api/resource.pro" - + "to\032#google/cloud/run/v2/condition.proto\032" - + "+google/cloud/run/v2/revision_template.p" - + "roto\032(google/cloud/run/v2/traffic_target" - + ".proto\032)google/cloud/run/v2/vendor_setti" - + "ngs.proto\032\036google/iam/v1/iam_policy.prot" - + "o\032\032google/iam/v1/policy.proto\032#google/lo" - + "ngrunning/operations.proto\032 google/proto" - + "buf/field_mask.proto\032\037google/protobuf/ti" - + "mestamp.proto\"\256\001\n\024CreateServiceRequest\0222" - + "\n\006parent\030\001 \001(\tB\"\340A\002\372A\034\022\032run.googleapis.c" - + "om/Service\0222\n\007service\030\002 \001(\0132\034.google.clo" - + "ud.run.v2.ServiceB\003\340A\002\022\027\n\nservice_id\030\003 \001" - + "(\tB\003\340A\002\022\025\n\rvalidate_only\030\004 \001(\010\"\251\001\n\024Updat" - + "eServiceRequest\0222\n\007service\030\001 \001(\0132\034.googl" - + "e.cloud.run.v2.ServiceB\003\340A\002\022/\n\013update_ma" - + "sk\030\002 \001(\0132\032.google.protobuf.FieldMask\022\025\n\r" - + "validate_only\030\003 \001(\010\022\025\n\rallow_missing\030\004 \001" - + "(\010\"\206\001\n\023ListServicesRequest\0222\n\006parent\030\001 \001" - + "(\tB\"\340A\002\372A\034\022\032run.googleapis.com/Service\022\021" - + "\n\tpage_size\030\002 \001(\005\022\022\n\npage_token\030\003 \001(\t\022\024\n" - + "\014show_deleted\030\004 \001(\010\"_\n\024ListServicesRespo" - + "nse\022.\n\010services\030\001 \003(\0132\034.google.cloud.run" - + ".v2.Service\022\027\n\017next_page_token\030\002 \001(\t\"E\n\021" - + "GetServiceRequest\0220\n\004name\030\001 \001(\tB\"\340A\002\372A\034\n" - + "\032run.googleapis.com/Service\"m\n\024DeleteSer" - + "viceRequest\0220\n\004name\030\001 \001(\tB\"\340A\002\372A\034\n\032run.g" - + "oogleapis.com/Service\022\025\n\rvalidate_only\030\002" - + " \001(\010\022\014\n\004etag\030\003 \001(\t\"\230\013\n\007Service\022\014\n\004name\030\001" - + " \001(\t\022\023\n\013description\030\002 \001(\t\022\020\n\003uid\030\003 \001(\tB\003" - + "\340A\003\022\027\n\ngeneration\030\004 \001(\003B\003\340A\003\0228\n\006labels\030\005" - + " \003(\0132(.google.cloud.run.v2.Service.Label" - + "sEntry\022B\n\013annotations\030\006 \003(\0132-.google.clo" - + "ud.run.v2.Service.AnnotationsEntry\0224\n\013cr" - + "eate_time\030\007 \001(\0132\032.google.protobuf.Timest" - + "ampB\003\340A\003\0224\n\013update_time\030\010 \001(\0132\032.google.p" - + "rotobuf.TimestampB\003\340A\003\0224\n\013delete_time\030\t " - + "\001(\0132\032.google.protobuf.TimestampB\003\340A\003\0224\n\013" - + "expire_time\030\n \001(\0132\032.google.protobuf.Time" - + "stampB\003\340A\003\022\024\n\007creator\030\013 \001(\tB\003\340A\003\022\032\n\rlast" - + "_modifier\030\014 \001(\tB\003\340A\003\022\016\n\006client\030\r \001(\t\022\026\n\016" - + "client_version\030\016 \001(\t\0224\n\007ingress\030\017 \001(\0162#." - + "google.cloud.run.v2.IngressTraffic\022-\n\014la" - + "unch_stage\030\020 \001(\0162\027.google.api.LaunchStag" - + "e\022F\n\024binary_authorization\030\021 \001(\0132(.google" - + ".cloud.run.v2.BinaryAuthorization\022<\n\010tem" - + "plate\030\022 \001(\0132%.google.cloud.run.v2.Revisi" - + "onTemplateB\003\340A\002\0223\n\007traffic\030\023 \003(\0132\".googl" - + "e.cloud.run.v2.TrafficTarget\022 \n\023observed" - + "_generation\030\036 \001(\003B\003\340A\003\022?\n\022terminal_condi" - + "tion\030\037 \001(\0132\036.google.cloud.run.v2.Conditi" - + "onB\003\340A\003\0227\n\nconditions\030 \003(\0132\036.google.clo" - + "ud.run.v2.ConditionB\003\340A\003\022B\n\025latest_ready" - + "_revision\030! \001(\tB#\340A\003\372A\035\n\033run.googleapis." - + "com/Revision\022D\n\027latest_created_revision\030" - + "\" \001(\tB#\340A\003\372A\035\n\033run.googleapis.com/Revisi" - + "on\022G\n\020traffic_statuses\030# \003(\0132(.google.cl" - + "oud.run.v2.TrafficTargetStatusB\003\340A\003\022\020\n\003u" - + "ri\030$ \001(\tB\003\340A\003\022\030\n\013reconciling\030b \001(\010B\003\340A\003\022" - + "\021\n\004etag\030c \001(\tB\003\340A\003\032-\n\013LabelsEntry\022\013\n\003key" - + "\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\0322\n\020Annotations" - + "Entry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001:^\352" - + "A[\n\032run.googleapis.com/Service\022:projects" - + "/{project}/locations/{location}/services" - + "/{service}R\001\0012\266\013\n\010Services\022\311\001\n\rCreateSer" - + "vice\022).google.cloud.run.v2.CreateService" - + "Request\032\035.google.longrunning.Operation\"n" - + "\202\323\344\223\0027\",/v2/{parent=projects/*/locations" - + "/*}/services:\007service\332A\031parent,service,s" - + "ervice_id\312A\022\n\007Service\022\007Service\022\217\001\n\nGetSe" - + "rvice\022&.google.cloud.run.v2.GetServiceRe" - + "quest\032\034.google.cloud.run.v2.Service\";\202\323\344" - + "\223\002.\022,/v2/{name=projects/*/locations/*/se" - + "rvices/*}\332A\004name\022\242\001\n\014ListServices\022(.goog" - + "le.cloud.run.v2.ListServicesRequest\032).go" - + "ogle.cloud.run.v2.ListServicesResponse\"=" - + "\202\323\344\223\002.\022,/v2/{parent=projects/*/locations" - + "/*}/services\332A\006parent\022\313\001\n\rUpdateService\022" - + ").google.cloud.run.v2.UpdateServiceReque" - + "st\032\035.google.longrunning.Operation\"p\202\323\344\223\002" - + "?24/v2/{service.name=projects/*/location" - + "s/*/services/*}:\007service\332A\023service,updat" - + "e_mask\312A\022\n\007Service\022\007Service\022\253\001\n\rDeleteSe" - + "rvice\022).google.cloud.run.v2.DeleteServic" - + "eRequest\032\035.google.longrunning.Operation\"" - + "P\202\323\344\223\002.*,/v2/{name=projects/*/locations/" - + "*/services/*}\332A\004name\312A\022\n\007Service\022\007Servic" - + "e\022\220\001\n\014GetIamPolicy\022\".google.iam.v1.GetIa" - + "mPolicyRequest\032\025.google.iam.v1.Policy\"E\202" - + "\323\344\223\002?\022=/v2/{resource=projects/*/location" - + "s/*/services/*}:getIamPolicy\022\223\001\n\014SetIamP" - + "olicy\022\".google.iam.v1.SetIamPolicyReques" - + "t\032\025.google.iam.v1.Policy\"H\202\323\344\223\002B\"=/v2/{r" - + "esource=projects/*/locations/*/services/" - + "*}:setIamPolicy:\001*\022\271\001\n\022TestIamPermission" - + "s\022(.google.iam.v1.TestIamPermissionsRequ" - + "est\032).google.iam.v1.TestIamPermissionsRe" - + "sponse\"N\202\323\344\223\002H\"C/v2/{resource=projects/*" - + "/locations/*/services/*}:testIamPermissi" - + "ons:\001*\032F\312A\022run.googleapis.com\322A.https://" - + "www.googleapis.com/auth/cloud-platformBa" - + "\n\027com.google.cloud.run.v2B\014ServiceProtoP" - + "\001Z6google.golang.org/genproto/googleapis" - + "/cloud/run/v2;runb\006proto3" + + "to\032\030google/api/routing.proto\032#google/clo" + + "ud/run/v2/condition.proto\032+google/cloud/" + + "run/v2/revision_template.proto\032(google/c" + + "loud/run/v2/traffic_target.proto\032)google" + + "/cloud/run/v2/vendor_settings.proto\032\036goo" + + "gle/iam/v1/iam_policy.proto\032\032google/iam/" + + "v1/policy.proto\032#google/longrunning/oper" + + "ations.proto\032\037google/protobuf/timestamp." + + "proto\"\256\001\n\024CreateServiceRequest\0222\n\006parent" + + "\030\001 \001(\tB\"\340A\002\372A\034\022\032run.googleapis.com/Servi" + + "ce\0222\n\007service\030\002 \001(\0132\034.google.cloud.run.v" + + "2.ServiceB\003\340A\002\022\027\n\nservice_id\030\003 \001(\tB\003\340A\002\022" + + "\025\n\rvalidate_only\030\004 \001(\010\"x\n\024UpdateServiceR" + + "equest\0222\n\007service\030\001 \001(\0132\034.google.cloud.r" + + "un.v2.ServiceB\003\340A\002\022\025\n\rvalidate_only\030\003 \001(" + + "\010\022\025\n\rallow_missing\030\004 \001(\010\"\206\001\n\023ListService" + + "sRequest\0222\n\006parent\030\001 \001(\tB\"\340A\002\372A\034\022\032run.go" + + "ogleapis.com/Service\022\021\n\tpage_size\030\002 \001(\005\022" + + "\022\n\npage_token\030\003 \001(\t\022\024\n\014show_deleted\030\004 \001(" + + "\010\"_\n\024ListServicesResponse\022.\n\010services\030\001 " + + "\003(\0132\034.google.cloud.run.v2.Service\022\027\n\017nex" + + "t_page_token\030\002 \001(\t\"E\n\021GetServiceRequest\022" + + "0\n\004name\030\001 \001(\tB\"\340A\002\372A\034\n\032run.googleapis.co" + + "m/Service\"m\n\024DeleteServiceRequest\0220\n\004nam" + + "e\030\001 \001(\tB\"\340A\002\372A\034\n\032run.googleapis.com/Serv" + + "ice\022\025\n\rvalidate_only\030\002 \001(\010\022\014\n\004etag\030\003 \001(\t" + + "\"\230\013\n\007Service\022\014\n\004name\030\001 \001(\t\022\023\n\013descriptio" + + "n\030\002 \001(\t\022\020\n\003uid\030\003 \001(\tB\003\340A\003\022\027\n\ngeneration\030" + + "\004 \001(\003B\003\340A\003\0228\n\006labels\030\005 \003(\0132(.google.clou" + + "d.run.v2.Service.LabelsEntry\022B\n\013annotati" + + "ons\030\006 \003(\0132-.google.cloud.run.v2.Service." + + "AnnotationsEntry\0224\n\013create_time\030\007 \001(\0132\032." + + "google.protobuf.TimestampB\003\340A\003\0224\n\013update" + + "_time\030\010 \001(\0132\032.google.protobuf.TimestampB" + + "\003\340A\003\0224\n\013delete_time\030\t \001(\0132\032.google.proto" + + "buf.TimestampB\003\340A\003\0224\n\013expire_time\030\n \001(\0132" + + "\032.google.protobuf.TimestampB\003\340A\003\022\024\n\007crea" + + "tor\030\013 \001(\tB\003\340A\003\022\032\n\rlast_modifier\030\014 \001(\tB\003\340" + + "A\003\022\016\n\006client\030\r \001(\t\022\026\n\016client_version\030\016 \001" + + "(\t\0224\n\007ingress\030\017 \001(\0162#.google.cloud.run.v" + + "2.IngressTraffic\022-\n\014launch_stage\030\020 \001(\0162\027" + + ".google.api.LaunchStage\022F\n\024binary_author" + + "ization\030\021 \001(\0132(.google.cloud.run.v2.Bina" + + "ryAuthorization\022<\n\010template\030\022 \001(\0132%.goog" + + "le.cloud.run.v2.RevisionTemplateB\003\340A\002\0223\n" + + "\007traffic\030\023 \003(\0132\".google.cloud.run.v2.Tra" + + "fficTarget\022 \n\023observed_generation\030\036 \001(\003B" + + "\003\340A\003\022?\n\022terminal_condition\030\037 \001(\0132\036.googl" + + "e.cloud.run.v2.ConditionB\003\340A\003\0227\n\nconditi" + + "ons\030 \003(\0132\036.google.cloud.run.v2.Conditio" + + "nB\003\340A\003\022B\n\025latest_ready_revision\030! \001(\tB#\340" + + "A\003\372A\035\n\033run.googleapis.com/Revision\022D\n\027la" + + "test_created_revision\030\" \001(\tB#\340A\003\372A\035\n\033run" + + ".googleapis.com/Revision\022G\n\020traffic_stat" + + "uses\030# \003(\0132(.google.cloud.run.v2.Traffic" + + "TargetStatusB\003\340A\003\022\020\n\003uri\030$ \001(\tB\003\340A\003\022\030\n\013r" + + "econciling\030b \001(\010B\003\340A\003\022\021\n\004etag\030c \001(\tB\003\340A\003" + + "\032-\n\013LabelsEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 " + + "\001(\t:\0028\001\0322\n\020AnnotationsEntry\022\013\n\003key\030\001 \001(\t" + + "\022\r\n\005value\030\002 \001(\t:\0028\001:^\352A[\n\032run.googleapis" + + ".com/Service\022:projects/{project}/locatio" + + "ns/{location}/services/{service}R\001\0012\267\r\n\010" + + "Services\022\375\001\n\rCreateService\022).google.clou" + + "d.run.v2.CreateServiceRequest\032\035.google.l" + + "ongrunning.Operation\"\241\001\202\323\344\223\0027\",/v2/{pare" + + "nt=projects/*/locations/*}/services:\007ser" + + "vice\212\323\344\223\002-\022+\n\006parent\022!projects/*/locatio" + + "ns/{location=*}\332A\031parent,service,service" + + "_id\312A\022\n\007Service\022\007Service\022\303\001\n\nGetService\022" + + "&.google.cloud.run.v2.GetServiceRequest\032" + + "\034.google.cloud.run.v2.Service\"o\202\323\344\223\002.\022,/" + + "v2/{name=projects/*/locations/*/services" + + "/*}\212\323\344\223\002.\022,\n\004name\022$projects/*/locations/" + + "{location=*}/**\332A\004name\022\325\001\n\014ListServices\022" + + "(.google.cloud.run.v2.ListServicesReques" + + "t\032).google.cloud.run.v2.ListServicesResp" + + "onse\"p\202\323\344\223\002.\022,/v2/{parent=projects/*/loc" + + "ations/*}/services\212\323\344\223\002-\022+\n\006parent\022!proj" + + "ects/*/locations/{location=*}\332A\006parent\022\374" + + "\001\n\rUpdateService\022).google.cloud.run.v2.U" + + "pdateServiceRequest\032\035.google.longrunning" + + ".Operation\"\240\001\202\323\344\223\002?24/v2/{service.name=p" + + "rojects/*/locations/*/services/*}:\007servi" + + "ce\212\323\344\223\0026\0224\n\014service.name\022$projects/*/loc" + + "ations/{location=*}/**\332A\007service\312A\022\n\007Ser" + + "vice\022\007Service\022\340\001\n\rDeleteService\022).google" + + ".cloud.run.v2.DeleteServiceRequest\032\035.goo" + + "gle.longrunning.Operation\"\204\001\202\323\344\223\002.*,/v2/" + + "{name=projects/*/locations/*/services/*}" + + "\212\323\344\223\002.\022,\n\004name\022$projects/*/locations/{lo" + + "cation=*}/**\332A\004name\312A\022\n\007Service\022\007Service" + + "\022\220\001\n\014GetIamPolicy\022\".google.iam.v1.GetIam" + + "PolicyRequest\032\025.google.iam.v1.Policy\"E\202\323" + + "\344\223\002?\022=/v2/{resource=projects/*/locations" + + "/*/services/*}:getIamPolicy\022\223\001\n\014SetIamPo" + + "licy\022\".google.iam.v1.SetIamPolicyRequest" + + "\032\025.google.iam.v1.Policy\"H\202\323\344\223\002B\"=/v2/{re" + + "source=projects/*/locations/*/services/*" + + "}:setIamPolicy:\001*\022\271\001\n\022TestIamPermissions" + + "\022(.google.iam.v1.TestIamPermissionsReque" + + "st\032).google.iam.v1.TestIamPermissionsRes" + + "ponse\"N\202\323\344\223\002H\"C/v2/{resource=projects/*/" + + "locations/*/services/*}:testIamPermissio" + + "ns:\001*\032F\312A\022run.googleapis.com\322A.https://w" + + "ww.googleapis.com/auth/cloud-platformBa\n" + + "\027com.google.cloud.run.v2B\014ServiceProtoP\001" + + "Z6google.golang.org/genproto/googleapis/" + + "cloud/run/v2;runb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( @@ -190,6 +195,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.api.FieldBehaviorProto.getDescriptor(), com.google.api.LaunchStageProto.getDescriptor(), com.google.api.ResourceProto.getDescriptor(), + com.google.api.RoutingProto.getDescriptor(), com.google.cloud.run.v2.ConditionProto.getDescriptor(), com.google.cloud.run.v2.RevisionTemplateProto.getDescriptor(), com.google.cloud.run.v2.TrafficTargetProto.getDescriptor(), @@ -197,7 +203,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.iam.v1.IamPolicyProto.getDescriptor(), com.google.iam.v1.PolicyProto.getDescriptor(), com.google.longrunning.OperationsProto.getDescriptor(), - com.google.protobuf.FieldMaskProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), }); internal_static_google_cloud_run_v2_CreateServiceRequest_descriptor = @@ -214,7 +219,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_google_cloud_run_v2_UpdateServiceRequest_descriptor, new java.lang.String[] { - "Service", "UpdateMask", "ValidateOnly", "AllowMissing", + "Service", "ValidateOnly", "AllowMissing", }); internal_static_google_cloud_run_v2_ListServicesRequest_descriptor = getDescriptor().getMessageTypes().get(2); @@ -308,6 +313,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { registry.add(com.google.api.ClientProto.oauthScopes); registry.add(com.google.api.ResourceProto.resource); registry.add(com.google.api.ResourceProto.resourceReference); + registry.add(com.google.api.RoutingProto.routing); registry.add(com.google.longrunning.OperationsProto.operationInfo); com.google.protobuf.Descriptors.FileDescriptor.internalUpdateFileDescriptor( descriptor, registry); @@ -316,6 +322,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.api.FieldBehaviorProto.getDescriptor(); com.google.api.LaunchStageProto.getDescriptor(); com.google.api.ResourceProto.getDescriptor(); + com.google.api.RoutingProto.getDescriptor(); com.google.cloud.run.v2.ConditionProto.getDescriptor(); com.google.cloud.run.v2.RevisionTemplateProto.getDescriptor(); com.google.cloud.run.v2.TrafficTargetProto.getDescriptor(); @@ -323,7 +330,6 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { com.google.iam.v1.IamPolicyProto.getDescriptor(); com.google.iam.v1.PolicyProto.getDescriptor(); com.google.longrunning.OperationsProto.getDescriptor(); - com.google.protobuf.FieldMaskProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); } diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/UpdateServiceRequest.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/UpdateServiceRequest.java index 5f13a94..033b881 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/UpdateServiceRequest.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/UpdateServiceRequest.java @@ -81,21 +81,6 @@ private UpdateServiceRequest( service_ = subBuilder.buildPartial(); } - break; - } - case 18: - { - com.google.protobuf.FieldMask.Builder subBuilder = null; - if (updateMask_ != null) { - subBuilder = updateMask_.toBuilder(); - } - updateMask_ = - input.readMessage(com.google.protobuf.FieldMask.parser(), extensionRegistry); - if (subBuilder != null) { - subBuilder.mergeFrom(updateMask_); - updateMask_ = subBuilder.buildPartial(); - } - break; } case 24: @@ -193,52 +178,6 @@ public com.google.cloud.run.v2.ServiceOrBuilder getServiceOrBuilder() { return getService(); } - public static final int UPDATE_MASK_FIELD_NUMBER = 2; - private com.google.protobuf.FieldMask updateMask_; - /** - * - * - *
-   * The list of fields to be updated.
-   * 
- * - * .google.protobuf.FieldMask update_mask = 2; - * - * @return Whether the updateMask field is set. - */ - @java.lang.Override - public boolean hasUpdateMask() { - return updateMask_ != null; - } - /** - * - * - *
-   * The list of fields to be updated.
-   * 
- * - * .google.protobuf.FieldMask update_mask = 2; - * - * @return The updateMask. - */ - @java.lang.Override - public com.google.protobuf.FieldMask getUpdateMask() { - return updateMask_ == null ? com.google.protobuf.FieldMask.getDefaultInstance() : updateMask_; - } - /** - * - * - *
-   * The list of fields to be updated.
-   * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - @java.lang.Override - public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - return getUpdateMask(); - } - public static final int VALIDATE_ONLY_FIELD_NUMBER = 3; private boolean validateOnly_; /** @@ -295,9 +234,6 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io if (service_ != null) { output.writeMessage(1, getService()); } - if (updateMask_ != null) { - output.writeMessage(2, getUpdateMask()); - } if (validateOnly_ != false) { output.writeBool(3, validateOnly_); } @@ -316,9 +252,6 @@ public int getSerializedSize() { if (service_ != null) { size += com.google.protobuf.CodedOutputStream.computeMessageSize(1, getService()); } - if (updateMask_ != null) { - size += com.google.protobuf.CodedOutputStream.computeMessageSize(2, getUpdateMask()); - } if (validateOnly_ != false) { size += com.google.protobuf.CodedOutputStream.computeBoolSize(3, validateOnly_); } @@ -345,10 +278,6 @@ public boolean equals(final java.lang.Object obj) { if (hasService()) { if (!getService().equals(other.getService())) return false; } - if (hasUpdateMask() != other.hasUpdateMask()) return false; - if (hasUpdateMask()) { - if (!getUpdateMask().equals(other.getUpdateMask())) return false; - } if (getValidateOnly() != other.getValidateOnly()) return false; if (getAllowMissing() != other.getAllowMissing()) return false; if (!unknownFields.equals(other.unknownFields)) return false; @@ -366,10 +295,6 @@ public int hashCode() { hash = (37 * hash) + SERVICE_FIELD_NUMBER; hash = (53 * hash) + getService().hashCode(); } - if (hasUpdateMask()) { - hash = (37 * hash) + UPDATE_MASK_FIELD_NUMBER; - hash = (53 * hash) + getUpdateMask().hashCode(); - } hash = (37 * hash) + VALIDATE_ONLY_FIELD_NUMBER; hash = (53 * hash) + com.google.protobuf.Internal.hashBoolean(getValidateOnly()); hash = (37 * hash) + ALLOW_MISSING_FIELD_NUMBER; @@ -525,12 +450,6 @@ public Builder clear() { service_ = null; serviceBuilder_ = null; } - if (updateMaskBuilder_ == null) { - updateMask_ = null; - } else { - updateMask_ = null; - updateMaskBuilder_ = null; - } validateOnly_ = false; allowMissing_ = false; @@ -567,11 +486,6 @@ public com.google.cloud.run.v2.UpdateServiceRequest buildPartial() { } else { result.service_ = serviceBuilder_.build(); } - if (updateMaskBuilder_ == null) { - result.updateMask_ = updateMask_; - } else { - result.updateMask_ = updateMaskBuilder_.build(); - } result.validateOnly_ = validateOnly_; result.allowMissing_ = allowMissing_; onBuilt(); @@ -626,9 +540,6 @@ public Builder mergeFrom(com.google.cloud.run.v2.UpdateServiceRequest other) { if (other.hasService()) { mergeService(other.getService()); } - if (other.hasUpdateMask()) { - mergeUpdateMask(other.getUpdateMask()); - } if (other.getValidateOnly() != false) { setValidateOnly(other.getValidateOnly()); } @@ -852,189 +763,6 @@ public com.google.cloud.run.v2.ServiceOrBuilder getServiceOrBuilder() { return serviceBuilder_; } - private com.google.protobuf.FieldMask updateMask_; - private com.google.protobuf.SingleFieldBuilderV3< - com.google.protobuf.FieldMask, - com.google.protobuf.FieldMask.Builder, - com.google.protobuf.FieldMaskOrBuilder> - updateMaskBuilder_; - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - * - * @return Whether the updateMask field is set. - */ - public boolean hasUpdateMask() { - return updateMaskBuilder_ != null || updateMask_ != null; - } - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - * - * @return The updateMask. - */ - public com.google.protobuf.FieldMask getUpdateMask() { - if (updateMaskBuilder_ == null) { - return updateMask_ == null - ? com.google.protobuf.FieldMask.getDefaultInstance() - : updateMask_; - } else { - return updateMaskBuilder_.getMessage(); - } - } - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - public Builder setUpdateMask(com.google.protobuf.FieldMask value) { - if (updateMaskBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - updateMask_ = value; - onChanged(); - } else { - updateMaskBuilder_.setMessage(value); - } - - return this; - } - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - public Builder setUpdateMask(com.google.protobuf.FieldMask.Builder builderForValue) { - if (updateMaskBuilder_ == null) { - updateMask_ = builderForValue.build(); - onChanged(); - } else { - updateMaskBuilder_.setMessage(builderForValue.build()); - } - - return this; - } - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - public Builder mergeUpdateMask(com.google.protobuf.FieldMask value) { - if (updateMaskBuilder_ == null) { - if (updateMask_ != null) { - updateMask_ = - com.google.protobuf.FieldMask.newBuilder(updateMask_).mergeFrom(value).buildPartial(); - } else { - updateMask_ = value; - } - onChanged(); - } else { - updateMaskBuilder_.mergeFrom(value); - } - - return this; - } - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - public Builder clearUpdateMask() { - if (updateMaskBuilder_ == null) { - updateMask_ = null; - onChanged(); - } else { - updateMask_ = null; - updateMaskBuilder_ = null; - } - - return this; - } - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - public com.google.protobuf.FieldMask.Builder getUpdateMaskBuilder() { - - onChanged(); - return getUpdateMaskFieldBuilder().getBuilder(); - } - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { - if (updateMaskBuilder_ != null) { - return updateMaskBuilder_.getMessageOrBuilder(); - } else { - return updateMask_ == null - ? com.google.protobuf.FieldMask.getDefaultInstance() - : updateMask_; - } - } - /** - * - * - *
-     * The list of fields to be updated.
-     * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - private com.google.protobuf.SingleFieldBuilderV3< - com.google.protobuf.FieldMask, - com.google.protobuf.FieldMask.Builder, - com.google.protobuf.FieldMaskOrBuilder> - getUpdateMaskFieldBuilder() { - if (updateMaskBuilder_ == null) { - updateMaskBuilder_ = - new com.google.protobuf.SingleFieldBuilderV3< - com.google.protobuf.FieldMask, - com.google.protobuf.FieldMask.Builder, - com.google.protobuf.FieldMaskOrBuilder>( - getUpdateMask(), getParentForChildren(), isClean()); - updateMask_ = null; - } - return updateMaskBuilder_; - } - private boolean validateOnly_; /** * diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/UpdateServiceRequestOrBuilder.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/UpdateServiceRequestOrBuilder.java index f58d267..6009b7f 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/UpdateServiceRequestOrBuilder.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/UpdateServiceRequestOrBuilder.java @@ -61,41 +61,6 @@ public interface UpdateServiceRequestOrBuilder */ com.google.cloud.run.v2.ServiceOrBuilder getServiceOrBuilder(); - /** - * - * - *
-   * The list of fields to be updated.
-   * 
- * - * .google.protobuf.FieldMask update_mask = 2; - * - * @return Whether the updateMask field is set. - */ - boolean hasUpdateMask(); - /** - * - * - *
-   * The list of fields to be updated.
-   * 
- * - * .google.protobuf.FieldMask update_mask = 2; - * - * @return The updateMask. - */ - com.google.protobuf.FieldMask getUpdateMask(); - /** - * - * - *
-   * The list of fields to be updated.
-   * 
- * - * .google.protobuf.FieldMask update_mask = 2; - */ - com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder(); - /** * * diff --git a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/VendorSettingsProto.java b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/VendorSettingsProto.java index 7bd1d6a..5bd17cb 100644 --- a/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/VendorSettingsProto.java +++ b/proto-google-cloud-run-v2/src/main/java/com/google/cloud/run/v2/VendorSettingsProto.java @@ -63,14 +63,13 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "*\231\001\n\016IngressTraffic\022\037\n\033INGRESS_TRAFFIC_U" + "NSPECIFIED\020\000\022\027\n\023INGRESS_TRAFFIC_ALL\020\001\022!\n" + "\035INGRESS_TRAFFIC_INTERNAL_ONLY\020\002\022*\n&INGR" - + "ESS_TRAFFIC_INTERNAL_LOAD_BALANCER\020\003*\200\001\n" - + "\024ExecutionEnvironment\022%\n!EXECUTION_ENVIR" - + "ONMENT_UNSPECIFIED\020\000\022!\n\035EXECUTION_ENVIRO" - + "NMENT_DEFAULT\020\001\022\036\n\032EXECUTION_ENVIRONMENT" - + "_GEN2\020\002Bh\n\027com.google.cloud.run.v2B\023Vend" - + "orSettingsProtoP\001Z6google.golang.org/gen" - + "proto/googleapis/cloud/run/v2;runb\006proto" - + "3" + + "ESS_TRAFFIC_INTERNAL_LOAD_BALANCER\020\003*}\n\024" + + "ExecutionEnvironment\022%\n!EXECUTION_ENVIRO" + + "NMENT_UNSPECIFIED\020\000\022\036\n\032EXECUTION_ENVIRON" + + "MENT_GEN1\020\001\022\036\n\032EXECUTION_ENVIRONMENT_GEN" + + "2\020\002Bh\n\027com.google.cloud.run.v2B\023VendorSe" + + "ttingsProtoP\001Z6google.golang.org/genprot" + + "o/googleapis/cloud/run/v2;runb\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( diff --git a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/condition.proto b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/condition.proto index 8fc2127..3e98749 100644 --- a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/condition.proto +++ b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/condition.proto @@ -66,18 +66,12 @@ message Condition { // Reason unknown. Further details will be in message. UNKNOWN = 1; - // The internal route is missing. - ROUTE_MISSING = 2; - // Revision creation process failed. REVISION_FAILED = 3; // Timed out waiting for completion. PROGRESS_DEADLINE_EXCEEDED = 4; - // There was a build error. - BUILD_STEP_FAILED = 5; - // The container image path is incorrect. CONTAINER_MISSING = 6; @@ -107,58 +101,9 @@ message Condition { // System will retry later; current attempt failed. POSTPONED_RETRY = 15; - } - - // Reasons applicable to internal resources not exposed to users. These will - // surface in Service.conditions, and could be useful for further diagnosis. - enum InternalReason { - // Default value. - INTERNAL_REASON_UNDEFINED = 0; - - // The revision name provided conflicts with an existing one. - CONFLICTING_REVISION_NAME = 1; - - // Revision is missing; this is usually a transient reason. - REVISION_MISSING = 2; - - // Internal configuration is missing; this is usually a transient reason. - CONFIGURATION_MISSING = 3; - - // Assigning traffic; this is a transient reason. - ASSIGNING_TRAFFIC = 4; - - // Updating ingress traffic settings; this is a transient reason. - UPDATING_INGRESS_TRAFFIC_ALLOWED = 5; - - // The revision can't be created because it violates an org policy setting. - REVISION_ORG_POLICY_VIOLATION = 6; - // Enabling GCFv2 URI support; this is a transient reason. - ENABLING_GCFV2_URI_SUPPORT = 7; - } - - // Reasons specific to DomainMapping resource. - enum DomainMappingReason { - // Default value. - DOMAIN_MAPPING_REASON_UNDEFINED = 0; - - // Internal route is not yet ready. - ROUTE_NOT_READY = 1; - - // Insufficient permissions. - PERMISSION_DENIED = 2; - - // Certificate already exists. - CERTIFICATE_ALREADY_EXISTS = 3; - - // Mapping already exists. - MAPPING_ALREADY_EXISTS = 4; - - // Certificate issuance pending. - CERTIFICATE_PENDING = 5; - - // Certificate issuance failed. - CERTIFICATE_FAILED = 6; + // An internal error occurred. Further information may be in the message. + INTERNAL = 16; } // Reasons specific to Revision resource. @@ -245,12 +190,6 @@ message Condition { // A common (service-level) reason for this condition. CommonReason reason = 6; - // A reason for the internal condition. - InternalReason internal_reason = 7; - - // A reason for the domain mapping condition. - DomainMappingReason domain_mapping_reason = 8; - // A reason for the revision condition. RevisionReason revision_reason = 9; diff --git a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/k8s.min.proto b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/k8s.min.proto index bbd7edb..328c816 100644 --- a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/k8s.min.proto +++ b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/k8s.min.proto @@ -49,8 +49,8 @@ message Container { // Name of the container specified as a DNS_LABEL. string name = 1; - // Required. URL of the Container image in Google Container Registry or Docker - // More info: https://kubernetes.io/docs/concepts/containers/images + // Required. URL of the Container image in Google Container Registry or Google Artifact + // Registry. More info: https://kubernetes.io/docs/concepts/containers/images string image = 2 [(google.api.field_behavior) = REQUIRED]; // Entrypoint array. Not executed within a shell. @@ -270,5 +270,5 @@ message CloudSqlInstance { // https://cloud.google.com/sql/docs/mysql/connect-run for more information on // how to connect Cloud SQL and Cloud Run. Format: // {project}:{location}:{instance} - repeated string connections = 1; + repeated string instances = 1; } diff --git a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/revision.proto b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/revision.proto index 24539d5..0cb674e 100644 --- a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/revision.proto +++ b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/revision.proto @@ -21,6 +21,7 @@ import "google/api/client.proto"; import "google/api/field_behavior.proto"; import "google/api/launch_stage.proto"; import "google/api/resource.proto"; +import "google/api/routing.proto"; import "google/cloud/run/v2/condition.proto"; import "google/cloud/run/v2/k8s.min.proto"; import "google/cloud/run/v2/vendor_settings.proto"; @@ -43,6 +44,12 @@ service Revisions { option (google.api.http) = { get: "/v2/{name=projects/*/locations/*/services/*/revisions/*}" }; + option (google.api.routing) = { + routing_parameters { + field: "name" + path_template: "projects/*/locations/{location=*}/**" + } + }; option (google.api.method_signature) = "name"; } @@ -51,6 +58,12 @@ service Revisions { option (google.api.http) = { get: "/v2/{parent=projects/*/locations/*/services/*}/revisions" }; + option (google.api.routing) = { + routing_parameters { + field: "parent" + path_template: "projects/*/locations/{location=*}/**" + } + }; option (google.api.method_signature) = "parent"; } @@ -59,6 +72,12 @@ service Revisions { option (google.api.http) = { delete: "/v2/{name=projects/*/locations/*/services/*/revisions/*}" }; + option (google.api.routing) = { + routing_parameters { + field: "name" + path_template: "projects/*/locations/{location=*}/**" + } + }; option (google.api.method_signature) = "name"; option (google.longrunning.operation_info) = { response_type: "Revision" @@ -209,7 +228,7 @@ message Revision { VpcAccess vpc_access = 13; // Sets the maximum number of requests that each serving instance can receive. - int32 container_concurrency = 14; + int32 max_instance_request_concurrency = 34; // Max allowed time for an instance to respond to a request. google.protobuf.Duration timeout = 15; @@ -226,9 +245,6 @@ message Revision { // A list of Volumes to make available to containers. repeated Volume volumes = 18; - // Indicates whether Confidential Cloud Run is enabled in this Revision. - bool confidential = 19; - // The execution environment being used to host this Revision. ExecutionEnvironment execution_environment = 20; diff --git a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/revision_template.proto b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/revision_template.proto index ca63a11..f20fb5e 100644 --- a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/revision_template.proto +++ b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/revision_template.proto @@ -48,9 +48,6 @@ message RevisionTemplate { // visit https://cloud.google.com/run/docs/configuring/connecting-vpc. VpcAccess vpc_access = 6; - // Sets the maximum number of requests that each serving instance can receive. - int32 container_concurrency = 7; - // Max allowed time for an instance to respond to a request. google.protobuf.Duration timeout = 8; @@ -67,9 +64,6 @@ message RevisionTemplate { // A list of Volumes to make available to containers. repeated Volume volumes = 11; - // Enables Confidential Cloud Run in Revisions created using this template. - bool confidential = 12; - // The sandbox environment to host this Revision. ExecutionEnvironment execution_environment = 13; @@ -79,4 +73,7 @@ message RevisionTemplate { string encryption_key = 14 [(google.api.resource_reference) = { type: "cloudkms.googleapis.com/CryptoKey" }]; + + // Sets the maximum number of requests that each serving instance can receive. + int32 max_instance_request_concurrency = 15; } diff --git a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/service.proto b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/service.proto index 46107db..51a29ed 100644 --- a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/service.proto +++ b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/service.proto @@ -21,6 +21,7 @@ import "google/api/client.proto"; import "google/api/field_behavior.proto"; import "google/api/launch_stage.proto"; import "google/api/resource.proto"; +import "google/api/routing.proto"; import "google/cloud/run/v2/condition.proto"; import "google/cloud/run/v2/revision_template.proto"; import "google/cloud/run/v2/traffic_target.proto"; @@ -28,7 +29,6 @@ import "google/cloud/run/v2/vendor_settings.proto"; import "google/iam/v1/iam_policy.proto"; import "google/iam/v1/policy.proto"; import "google/longrunning/operations.proto"; -import "google/protobuf/field_mask.proto"; import "google/protobuf/timestamp.proto"; option go_package = "google.golang.org/genproto/googleapis/cloud/run/v2;run"; @@ -47,6 +47,12 @@ service Services { post: "/v2/{parent=projects/*/locations/*}/services" body: "service" }; + option (google.api.routing) = { + routing_parameters { + field: "parent" + path_template: "projects/*/locations/{location=*}" + } + }; option (google.api.method_signature) = "parent,service,service_id"; option (google.longrunning.operation_info) = { response_type: "Service" @@ -59,6 +65,12 @@ service Services { option (google.api.http) = { get: "/v2/{name=projects/*/locations/*/services/*}" }; + option (google.api.routing) = { + routing_parameters { + field: "name" + path_template: "projects/*/locations/{location=*}/**" + } + }; option (google.api.method_signature) = "name"; } @@ -67,6 +79,12 @@ service Services { option (google.api.http) = { get: "/v2/{parent=projects/*/locations/*}/services" }; + option (google.api.routing) = { + routing_parameters { + field: "parent" + path_template: "projects/*/locations/{location=*}" + } + }; option (google.api.method_signature) = "parent"; } @@ -76,7 +94,13 @@ service Services { patch: "/v2/{service.name=projects/*/locations/*/services/*}" body: "service" }; - option (google.api.method_signature) = "service,update_mask"; + option (google.api.routing) = { + routing_parameters { + field: "service.name" + path_template: "projects/*/locations/{location=*}/**" + } + }; + option (google.api.method_signature) = "service"; option (google.longrunning.operation_info) = { response_type: "Service" metadata_type: "Service" @@ -90,6 +114,12 @@ service Services { option (google.api.http) = { delete: "/v2/{name=projects/*/locations/*/services/*}" }; + option (google.api.routing) = { + routing_parameters { + field: "name" + path_template: "projects/*/locations/{location=*}/**" + } + }; option (google.api.method_signature) = "name"; option (google.longrunning.operation_info) = { response_type: "Service" @@ -153,9 +183,6 @@ message UpdateServiceRequest { // Required. The Service to be updated. Service service = 1 [(google.api.field_behavior) = REQUIRED]; - // The list of fields to be updated. - google.protobuf.FieldMask update_mask = 2; - // Indicates that the request should be validated and default values // populated, without persisting the request or updating any resources. bool validate_only = 3; @@ -261,6 +288,8 @@ message Service { // Output only. A number that monotonically increases every time the user // modifies the desired state. + // Please note that unlike v1, this is an int64 value. As with most Google + // APIs, its JSON representation will be a `string` instead of an `integer`. int64 generation = 4 [(google.api.field_behavior) = OUTPUT_ONLY]; // Map of string keys and values that can be used to organize and categorize @@ -333,6 +362,8 @@ message Service { // Output only. The generation of this Service currently serving traffic. See comments in // `reconciling` for additional information on reconciliation process in Cloud // Run. + // Please note that unlike v1, this is an int64 value. As with most Google + // APIs, its JSON representation will be a `string` instead of an `integer`. int64 observed_generation = 30 [(google.api.field_behavior) = OUTPUT_ONLY]; // Output only. The Condition of this Service, containing its readiness status, and diff --git a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/vendor_settings.proto b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/vendor_settings.proto index 7402075..89748d5 100644 --- a/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/vendor_settings.proto +++ b/proto-google-cloud-run-v2/src/main/proto/google/cloud/run/v2/vendor_settings.proto @@ -94,8 +94,8 @@ enum ExecutionEnvironment { // Unspecified EXECUTION_ENVIRONMENT_UNSPECIFIED = 0; - // Uses the Google-default environment. - EXECUTION_ENVIRONMENT_DEFAULT = 1; + // Uses the First Generation environment. + EXECUTION_ENVIRONMENT_GEN1 = 1; // Uses Second Generation environment. EXECUTION_ENVIRONMENT_GEN2 = 2; diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 3dd157b..377d82f 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.cloud google-cloud-run - 0.1.2 + 0.2.0 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 05efc94..a4267c2 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-run - 0.2.0 + 0.2.1 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index ea8b2b1..78006e9 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -28,7 +28,7 @@ com.google.cloud google-cloud-run - 0.1.2 + 0.2.0 diff --git a/versions.txt b/versions.txt index cec9abf..5c18f95 100644 --- a/versions.txt +++ b/versions.txt @@ -1,6 +1,6 @@ # Format: # module:released-version:current-version -google-cloud-run:0.2.0:0.2.0 -proto-google-cloud-run-v2:0.2.0:0.2.0 -grpc-google-cloud-run-v2:0.2.0:0.2.0 +google-cloud-run:0.2.1:0.2.1 +proto-google-cloud-run-v2:0.2.1:0.2.1 +grpc-google-cloud-run-v2:0.2.1:0.2.1