feat: add env to ContainerSpec in aiplatform v1beta1 custom_job.proto

Google APIs · copybara-github · commit a95a55f584fa · 2022-06-08T11:52:15.000-07:00
PiperOrigin-RevId: 453732998
diff --git a/google/cloud/aiplatform/v1beta1/BUILD.bazel b/google/cloud/aiplatform/v1beta1/BUILD.bazel
@@ -118,6 +118,8 @@ proto_library_with_info(
     deps = [
         ":aiplatform_proto",
         "//google/cloud:common_resources_proto",
+        "//google/cloud/location:location_proto",
+        "//google/iam/v1:iam_policy_proto",
     ] + _PROTO_SUBPACKAGE_DEPS,
 )
 
@@ -161,13 +163,19 @@ java_grpc_library(
 java_gapic_library(
     name = "aiplatform_java_gapic",
     srcs = [":aiplatform_proto_with_info"],
+    gapic_yaml = None,
     grpc_service_config = "aiplatform_grpc_service_config.json",
+    service_yaml = "aiplatform_v1beta1.yaml",
     test_deps = [
         ":aiplatform_java_grpc",
+        "//google/cloud/location:location_java_grpc",
+        "//google/iam/v1:iam_java_grpc",
     ] + _JAVA_GRPC_SUBPACKAGE_DEPS,
     deps = [
         ":aiplatform_java_proto",
         "//google/api:api_java_proto",
+        "//google/cloud/location:location_java_proto",
+        "//google/iam/v1:iam_java_proto",
     ] + _JAVA_PROTO_SUBPACKAGE_DEPS,
 )
 
@@ -176,12 +184,18 @@ java_gapic_test(
     test_classes = [
         "com.google.cloud.aiplatform.v1beta1.DatasetServiceClientTest",
         "com.google.cloud.aiplatform.v1beta1.EndpointServiceClientTest",
+        "com.google.cloud.aiplatform.v1beta1.FeaturestoreOnlineServingServiceClientTest",
+        "com.google.cloud.aiplatform.v1beta1.FeaturestoreServiceClientTest",
+        "com.google.cloud.aiplatform.v1beta1.IndexEndpointServiceClientTest",
+        "com.google.cloud.aiplatform.v1beta1.IndexServiceClientTest",
         "com.google.cloud.aiplatform.v1beta1.JobServiceClientTest",
+        "com.google.cloud.aiplatform.v1beta1.MetadataServiceClientTest",
         "com.google.cloud.aiplatform.v1beta1.MigrationServiceClientTest",
         "com.google.cloud.aiplatform.v1beta1.ModelServiceClientTest",
         "com.google.cloud.aiplatform.v1beta1.PipelineServiceClientTest",
         "com.google.cloud.aiplatform.v1beta1.PredictionServiceClientTest",
         "com.google.cloud.aiplatform.v1beta1.SpecialistPoolServiceClientTest",
+        "com.google.cloud.aiplatform.v1beta1.TensorboardServiceClientTest",
         "com.google.cloud.aiplatform.v1beta1.VizierServiceClientTest",
     ],
     runtime_deps = [":aiplatform_java_gapic_test"],
@@ -233,6 +247,8 @@ go_gapic_library(
     deps = [
         ":aiplatform_go_proto",
         "//google/api:httpbody_go_proto",
+        "//google/cloud/location:location_go_proto",
+        "//google/iam/v1:iam_go_proto",
         "//google/longrunning:longrunning_go_proto",
         "@com_google_cloud_go//longrunning:go_default_library",
         "@com_google_cloud_go//longrunning/autogen:go_default_library",
@@ -279,6 +295,7 @@ py_gapic_library(
     name = "aiplatform_py_gapic",
     srcs = [":aiplatform_proto"],
     grpc_service_config = "aiplatform_grpc_service_config.json",
+    service_yaml = "aiplatform_v1beta1.yaml",
 )
 
 # Open Source Packages
@@ -434,6 +451,7 @@ csharp_grpc_library(
 #     srcs = [":aiplatform_proto_with_info"],
 #     common_resources_config = "@gax_dotnet//:Google.Api.Gax/ResourceNames/CommonResourcesConfig.json",
 #     grpc_service_config = "aiplatform_grpc_service_config.json",
+#     service_yaml = "aiplatform_v1beta1.yaml",
 #     deps = [
 #         ":aiplatform_csharp_grpc",
 #         ":aiplatform_csharp_proto",
@@ -451,6 +469,7 @@ csharp_grpc_library(
 # )
 ################################
 
+
 ##############################################################################
 # C++
 ##############################################################################
diff --git a/google/cloud/aiplatform/v1beta1/aiplatform_v1beta1.yaml b/google/cloud/aiplatform/v1beta1/aiplatform_v1beta1.yaml
@@ -19,6 +19,9 @@ apis:
 - name: google.cloud.aiplatform.v1beta1.SpecialistPoolService
 - name: google.cloud.aiplatform.v1beta1.TensorboardService
 - name: google.cloud.aiplatform.v1beta1.VizierService
+- name: google.cloud.location.Locations
+- name: google.iam.v1.IAMPolicy
+- name: google.longrunning.Operations
 
 types:
 - name: google.cloud.aiplatform.v1beta1.BatchCreateFeaturesOperationMetadata
diff --git a/google/cloud/aiplatform/v1beta1/custom_job.proto b/google/cloud/aiplatform/v1beta1/custom_job.proto
@@ -19,6 +19,7 @@ package google.cloud.aiplatform.v1beta1;
 import "google/api/field_behavior.proto";
 import "google/api/resource.proto";
 import "google/cloud/aiplatform/v1beta1/encryption_spec.proto";
+import "google/cloud/aiplatform/v1beta1/env_var.proto";
 import "google/cloud/aiplatform/v1beta1/io.proto";
 import "google/cloud/aiplatform/v1beta1/job_state.proto";
 import "google/cloud/aiplatform/v1beta1/machine_resources.proto";
@@ -232,6 +233,10 @@ message ContainerSpec {
 
   // The arguments to be passed when starting the container.
   repeated string args = 3;
+
+  // Environment variables to be passed to the container.
+  // Maximum limit is 100.
+  repeated EnvVar env = 4;
 }
 
 // The spec of a Python packaged code.
@@ -254,6 +259,10 @@ message PythonPackageSpec {
 
   // Command line arguments to be passed to the Python task.
   repeated string args = 4;
+
+  // Environment variables to be passed to the python module.
+  // Maximum limit is 100.
+  repeated EnvVar env = 5;
 }
 
 // All parameters related to queuing and scheduling of custom jobs.
diff --git a/google/cloud/aiplatform/v1beta1/featurestore_service.proto b/google/cloud/aiplatform/v1beta1/featurestore_service.proto
@@ -418,6 +418,7 @@ message UpdateFeaturestoreRequest {
   //
   //   * `labels`
   //   * `online_serving_config.fixed_node_count`
+  //   * `online_serving_config.scaling`
   google.protobuf.FieldMask update_mask = 2;
 }
 
diff --git a/google/cloud/aiplatform/v1beta1/model_deployment_monitoring_job.proto b/google/cloud/aiplatform/v1beta1/model_deployment_monitoring_job.proto
@@ -270,7 +270,7 @@ message ModelDeploymentMonitoringScheduleConfig {
   // The time window of the prediction data being included in each prediction
   // dataset. This window specifies how long the data should be collected from
   // historical model results for each run. If not set,
-  // [ModelDeploymentMonitoringScheduleConfig.monitor_interval][google.cloud.aiplatform.v1.ModelDeploymentMonitoringScheduleConfig.monitor_interval] will be used.
+  // [ModelDeploymentMonitoringScheduleConfig.monitor_interval][google.cloud.aiplatform.v1beta1.ModelDeploymentMonitoringScheduleConfig.monitor_interval] will be used.
   // e.g. If currently the cutoff time is 2022-01-08 14:30:00 and the
   // monitor_window is set to be 3600, then data from 2022-01-08 13:30:00
   // to 2022-01-08 14:30:00 will be retrieved and aggregated to calculate the

Original file line number	Diff line number	Diff line change
`@@ -418,6 +418,7 @@ message UpdateFeaturestoreRequest {`
`418`	`418`	`//`
`419`	`419`	// * `labels`
`420`	`420`	// * `online_serving_config.fixed_node_count`
	`421`	+ // * `online_serving_config.scaling`
`421`	`422`	`google.protobuf.FieldMask update_mask = 2;`
`422`	`423`	`}`
`423`	`424`