fix!: Updates pre-release Cloud Run v2 Preview client libraries to work with the latest API revision

Google APIs · copybara-github · commit 185ba8a93af7 · 2022-05-07T04:52:24.000-07:00
PiperOrigin-RevId: 447174265
diff --git a/google/cloud/run/v2/BUILD.bazel b/google/cloud/run/v2/BUILD.bazel
@@ -35,11 +35,11 @@ proto_library(
         "//google/api:field_behavior_proto",
         "//google/api:launch_stage_proto",
         "//google/api:resource_proto",
+        "//google/api:routing_proto",
         "//google/iam/v1:iam_policy_proto",
         "//google/iam/v1:policy_proto",
         "//google/longrunning:operations_proto",
         "@com_google_protobuf//:duration_proto",
-        "@com_google_protobuf//:field_mask_proto",
         "@com_google_protobuf//:timestamp_proto",
     ],
 )
@@ -131,6 +131,7 @@ go_proto_library(
     deps = [
         "//google/api:annotations_go_proto",
         "//google/api:api_go_proto",
+        "//google/api:routing_go_proto",
         "//google/iam/v1:iam_go_proto",
         "//google/longrunning:longrunning_go_proto",
     ],
@@ -141,14 +142,14 @@ go_gapic_library(
     srcs = [":run_proto_with_info"],
     grpc_service_config = "run_grpc_service_config.json",
     importpath = "cloud.google.com/go/run/apiv2;run",
-    service_yaml = "run_v2.yaml",
     metadata = True,
+    service_yaml = "run_v2.yaml",
     deps = [
         ":run_go_proto",
         "//google/iam/v1:iam_go_proto",
         "//google/longrunning:longrunning_go_proto",
-        "@com_google_cloud_go//longrunning/autogen:go_default_library",
         "@com_google_cloud_go//longrunning:go_default_library",
+        "@com_google_cloud_go//longrunning/autogen:go_default_library",
         "@io_bazel_rules_go//proto/wkt:duration_go_proto",
     ],
 )
@@ -165,8 +166,8 @@ go_gapic_assembly_pkg(
     name = "gapi-cloud-run-v2-go",
     deps = [
         ":run_go_gapic",
-        ":run_go_gapic_srcjar-test.srcjar",
         ":run_go_gapic_srcjar-metadata.srcjar",
+        ":run_go_gapic_srcjar-test.srcjar",
         ":run_go_proto",
     ],
 )
@@ -184,6 +185,7 @@ py_gapic_library(
     name = "run_py_gapic",
     srcs = [":run_proto"],
     grpc_service_config = "run_grpc_service_config.json",
+    service_yaml = "run_v2.yaml",
 )
 
 # Open Source Packages
@@ -270,8 +272,8 @@ nodejs_gapic_assembly_pkg(
 ##############################################################################
 load(
     "@com_google_googleapis_imports//:imports.bzl",
-    "ruby_gapic_assembly_pkg",
     "ruby_cloud_gapic_library",
+    "ruby_gapic_assembly_pkg",
     "ruby_grpc_library",
     "ruby_proto_library",
 )
@@ -291,10 +293,10 @@ ruby_cloud_gapic_library(
     name = "run_ruby_gapic",
     srcs = [":run_proto_with_info"],
     extra_protoc_parameters = [
-        "ruby-cloud-gem-name=google-cloud-run-v2",
-        "ruby-cloud-product-url=https://cloud.google.com/run/",
         "ruby-cloud-api-id=run.googleapis.com",
         "ruby-cloud-api-shortname=run",
+        "ruby-cloud-gem-name=google-cloud-run-v2",
+        "ruby-cloud-product-url=https://cloud.google.com/run/",
     ],
     grpc_service_config = "run_grpc_service_config.json",
     ruby_cloud_description = "Cloud Run deploys and manages user provided container images that scale automatically based on incoming requests.",
diff --git a/google/cloud/run/v2/condition.proto b/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/google/cloud/run/v2/k8s.min.proto b/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/google/cloud/run/v2/revision.proto b/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/google/cloud/run/v2/revision_template.proto b/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/google/cloud/run/v2/service.proto b/google/cloud/run/v2/service.proto
@@ -21,14 +21,14 @@ 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";
 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/google/cloud/run/v2/vendor_settings.proto b/google/cloud/run/v2/vendor_settings.proto
