From 4ede77543c77072a2ac9f78353de2de2f8c4c501 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Tue, 22 Sep 2020 11:39:20 -0700 Subject: [PATCH 1/8] Publish SLM logging proto for documentation PiperOrigin-RevId: 333125205 --- .../management/logs/v1/BUILD.bazel | 162 ++++++++++++++++++ .../logs/v1/saas_instance_payload.proto | 41 +++++ 2 files changed, 203 insertions(+) create mode 100644 google/cloud/saasaccelerator/management/logs/v1/BUILD.bazel create mode 100644 google/cloud/saasaccelerator/management/logs/v1/saas_instance_payload.proto diff --git a/google/cloud/saasaccelerator/management/logs/v1/BUILD.bazel b/google/cloud/saasaccelerator/management/logs/v1/BUILD.bazel new file mode 100644 index 00000000..f73ab404 --- /dev/null +++ b/google/cloud/saasaccelerator/management/logs/v1/BUILD.bazel @@ -0,0 +1,162 @@ +# This file was automatically generated by BuildFileGenerator + +# This is an API workspace, having public visibility by default makes perfect sense. +package(default_visibility = ["//visibility:public"]) + +############################################################################## +# Common +############################################################################## +load("@rules_proto//proto:defs.bzl", "proto_library") + +proto_library( + name = "logs_proto", + srcs = [ + "saas_instance_payload.proto", + ], + deps = [ + + ], +) + +############################################################################## +# Java +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "java_grpc_library", + "java_proto_library", +) + +java_proto_library( + name = "logs_java_proto", + deps = [":logs_proto"], +) + +java_grpc_library( + name = "logs_java_grpc", + srcs = [":logs_proto"], + deps = [":logs_java_proto"], +) + +############################################################################## +# Go +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "go_proto_library", +) + +go_proto_library( + name = "logs_go_proto", + compilers = ["@io_bazel_rules_go//proto:go_grpc"], + importpath = "google.golang.org/genproto/googleapis/cloud/saasaccelerator/management/logs/v1", + protos = [":logs_proto"], + deps = [ + + ], +) + +############################################################################## +# Python +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "moved_proto_library", + "py_grpc_library", + "py_proto_library", +) + +moved_proto_library( + name = "logs_moved_proto", + srcs = [":logs_proto"], + deps = [ + + ], +) + +py_proto_library( + name = "logs_py_proto", + plugin = "@protoc_docs_plugin//:docs_plugin", + deps = [":logs_moved_proto"], +) + +py_grpc_library( + name = "logs_py_grpc", + srcs = [":logs_moved_proto"], + deps = [":logs_py_proto"], +) + +############################################################################## +# PHP +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "php_grpc_library", + "php_proto_library", +) + +php_proto_library( + name = "logs_php_proto", + deps = [":logs_proto"], +) + +php_grpc_library( + name = "logs_php_grpc", + srcs = [":logs_proto"], + deps = [":logs_php_proto"], +) + +############################################################################## +# Node.js +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "nodejs_gapic_assembly_pkg", + "nodejs_gapic_library", +) + + +############################################################################## +# Ruby +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "ruby_grpc_library", + "ruby_proto_library", +) + +ruby_proto_library( + name = "logs_ruby_proto", + deps = [":logs_proto"], +) + +ruby_grpc_library( + name = "logs_ruby_grpc", + srcs = [":logs_proto"], + deps = [":logs_ruby_proto"], +) + +############################################################################## +# C# +############################################################################## +load( + "@com_google_googleapis_imports//:imports.bzl", + "csharp_grpc_library", + "csharp_proto_library", +) + +csharp_proto_library( + name = "logs_csharp_proto", + deps = [":logs_proto"], +) + +csharp_grpc_library( + name = "logs_csharp_grpc", + srcs = [":logs_proto"], + deps = [":logs_csharp_proto"], +) + +############################################################################## +# C++ +############################################################################## +# Put your C++ code here diff --git a/google/cloud/saasaccelerator/management/logs/v1/saas_instance_payload.proto b/google/cloud/saasaccelerator/management/logs/v1/saas_instance_payload.proto new file mode 100644 index 00000000..7d8bc396 --- /dev/null +++ b/google/cloud/saasaccelerator/management/logs/v1/saas_instance_payload.proto @@ -0,0 +1,41 @@ +// Copyright 2020 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +syntax = "proto3"; + +package google.cloud.saasaccelerator.management.logs.v1; + +option go_package = "google.golang.org/genproto/googleapis/cloud/saasaccelerator/management/logs/v1;logs"; +option java_multiple_files = true; +option java_outer_classname = "SaasInstancePayloadProto"; +option java_package = "com.google.cloud.saasaccelerator.management.logs.v1"; + +message InstanceEvent { + // The type of the event, e.g. Create, Update, etc. + string verb = 1; + + // The state of the instance, e.g. "RETRYING_CREATE_INSTANCE". + string stage = 2; + + // A human-readable log message, e.g. "error in stage: CREATING, err: location + // not available". + string msg = 3; + + // The ID to uniquely locate all logs associated with a given request. + string trace_id = 4; + + // The instance node which is the subject of the operation, if known. + // Currently unused as tf actuation does not manage nodes. + string node_id = 5; +} From 470d84e263c833af5280753b8e4188432b8d5b06 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Tue, 22 Sep 2020 12:14:18 -0700 Subject: [PATCH 2/8] docs: update OPTIONAL annotations for some fields. PiperOrigin-RevId: 333132625 --- google/cloud/dialogflow/v2beta1/knowledge_base.proto | 10 +++++----- google/cloud/dialogflow/v2beta1/session.proto | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/google/cloud/dialogflow/v2beta1/knowledge_base.proto b/google/cloud/dialogflow/v2beta1/knowledge_base.proto index 71e72dcc..09b5c61c 100644 --- a/google/cloud/dialogflow/v2beta1/knowledge_base.proto +++ b/google/cloud/dialogflow/v2beta1/knowledge_base.proto @@ -156,12 +156,12 @@ message ListKnowledgeBasesRequest { } ]; - // Optional. The maximum number of items to return in a single page. By + // The maximum number of items to return in a single page. By // default 10 and at most 100. - int32 page_size = 2 [(google.api.field_behavior) = OPTIONAL]; + int32 page_size = 2; - // Optional. The next_page_token value returned from a previous list request. - string page_token = 3 [(google.api.field_behavior) = OPTIONAL]; + // The next_page_token value returned from a previous list request. + string page_token = 3; } // Response message for [KnowledgeBases.ListKnowledgeBases][google.cloud.dialogflow.v2beta1.KnowledgeBases.ListKnowledgeBases]. @@ -214,7 +214,7 @@ message DeleteKnowledgeBaseRequest { // Optional. Force deletes the knowledge base. When set to true, any documents // in the knowledge base are also deleted. - bool force = 2; + bool force = 2 [(google.api.field_behavior) = OPTIONAL]; } // Request message for [KnowledgeBases.UpdateKnowledgeBase][google.cloud.dialogflow.v2beta1.KnowledgeBases.UpdateKnowledgeBase]. diff --git a/google/cloud/dialogflow/v2beta1/session.proto b/google/cloud/dialogflow/v2beta1/session.proto index 2505b676..d38a362e 100644 --- a/google/cloud/dialogflow/v2beta1/session.proto +++ b/google/cloud/dialogflow/v2beta1/session.proto @@ -23,6 +23,7 @@ import "google/api/resource.proto"; import "google/cloud/dialogflow/v2beta1/agent.proto"; import "google/cloud/dialogflow/v2beta1/audio_config.proto"; import "google/cloud/dialogflow/v2beta1/context.proto"; +import "google/cloud/dialogflow/v2beta1/gcs.proto"; import "google/cloud/dialogflow/v2beta1/intent.proto"; import "google/cloud/dialogflow/v2beta1/session_entity_type.proto"; import "google/protobuf/duration.proto"; From 3dbeac0d54125b123c8dfd39c774b37473c36944 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Tue, 22 Sep 2020 14:22:59 -0700 Subject: [PATCH 3/8] Update gapic-generator-python pin to 0.33.4 PiperOrigin-RevId: 333159182 --- WORKSPACE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 52abfca6..4d1257f2 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -224,8 +224,8 @@ pip_repositories() # Change upstream repository once PR is merged http_archive( name = "gapic_generator_python", - urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.33.0.zip"], - strip_prefix = "gapic-generator-python-0.33.0", + urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.33.5.zip"], + strip_prefix = "gapic-generator-python-0.33.5", ) load("@gapic_generator_python//:repositories.bzl", From acd4aabf1c1e3e5bf7db0e81f323003fb317fdaa Mon Sep 17 00:00:00 2001 From: Google APIs Date: Wed, 23 Sep 2020 08:58:22 -0700 Subject: [PATCH 4/8] chore: use Python microgenerator rules for aiplatform PiperOrigin-RevId: 333302099 --- google/cloud/aiplatform/v1beta1/BUILD.bazel | 51 ++------------------- 1 file changed, 5 insertions(+), 46 deletions(-) diff --git a/google/cloud/aiplatform/v1beta1/BUILD.bazel b/google/cloud/aiplatform/v1beta1/BUILD.bazel index 5f12b78a..65a112d5 100644 --- a/google/cloud/aiplatform/v1beta1/BUILD.bazel +++ b/google/cloud/aiplatform/v1beta1/BUILD.bazel @@ -204,57 +204,18 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## +# This library is using Python microgenerator. +# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - "moved_proto_library", - "py_gapic_assembly_pkg", - "py_gapic_library", - "py_grpc_library", - "py_proto_library", -) - -moved_proto_library( - name = "aiplatform_moved_proto", - srcs = [":aiplatform_proto"], - deps = [ - "//google/api:annotations_proto", - "//google/api:client_proto", - "//google/api:field_behavior_proto", - "//google/api:resource_proto", - "//google/longrunning:operations_proto", - "//google/rpc:status_proto", - "//google/type:money_proto", - "@com_google_protobuf//:duration_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:field_mask_proto", - "@com_google_protobuf//:struct_proto", - "@com_google_protobuf//:timestamp_proto", - ], -) - -py_proto_library( - name = "aiplatform_py_proto", - plugin = "@protoc_docs_plugin//:docs_plugin", - deps = [":aiplatform_moved_proto"], -) - -py_grpc_library( - name = "aiplatform_py_grpc", - srcs = [":aiplatform_moved_proto"], - deps = [":aiplatform_py_proto"], + py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", + py_gapic_library = "py_gapic_library2", ) py_gapic_library( name = "aiplatform_py_gapic", - src = ":aiplatform_proto_with_info", - gapic_yaml = "aiplatform_gapic.yaml", + srcs = [":aiplatform_proto"], grpc_service_config = "aiplatform_grpc_service_config.json", - package = "google.cloud.aiplatform.v1beta1", - service_yaml = "aiplatform_v1beta1.yaml", - deps = [ - ":aiplatform_py_grpc", - ":aiplatform_py_proto", - ], ) # Open Source Packages @@ -262,8 +223,6 @@ py_gapic_assembly_pkg( name = "aiplatform-v1beta1-py", deps = [ ":aiplatform_py_gapic", - ":aiplatform_py_grpc", - ":aiplatform_py_proto", ], ) From 7e377ce8f06ced48a79b45d97eebccb8a51f1e28 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Wed, 23 Sep 2020 10:41:17 -0700 Subject: [PATCH 5/8] chore: use gapic-generator-python 0.33.6 PiperOrigin-RevId: 333323660 --- WORKSPACE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 4d1257f2..7be55858 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -224,8 +224,8 @@ pip_repositories() # Change upstream repository once PR is merged http_archive( name = "gapic_generator_python", - urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.33.5.zip"], - strip_prefix = "gapic-generator-python-0.33.5", + urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.33.6.zip"], + strip_prefix = "gapic-generator-python-0.33.6", ) load("@gapic_generator_python//:repositories.bzl", From 0fd468f90d1236193ee4cbdfb22265b674de121f Mon Sep 17 00:00:00 2001 From: Google APIs Date: Wed, 23 Sep 2020 14:23:38 -0700 Subject: [PATCH 6/8] chore: move talent v4 to python microgenerator rules PiperOrigin-RevId: 333372432 --- google/cloud/talent/v4/BUILD.bazel | 40 ++---------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/google/cloud/talent/v4/BUILD.bazel b/google/cloud/talent/v4/BUILD.bazel index 873f7f7b..64822e7f 100644 --- a/google/cloud/talent/v4/BUILD.bazel +++ b/google/cloud/talent/v4/BUILD.bazel @@ -177,38 +177,14 @@ go_gapic_assembly_pkg( ############################################################################## # Python ############################################################################## +# This library is using Python microgenerator. +# DO NOT OVERRIDE this Python section with autogenerated rules. load( "@com_google_googleapis_imports//:imports.bzl", - "moved_proto_library", - "py_grpc_library", - "py_proto_library", py_gapic_assembly_pkg = "py_gapic_assembly_pkg2", py_gapic_library = "py_gapic_library2", ) -moved_proto_library( - name = "talent_moved_proto", - srcs = [":talent_proto"], - deps = [ - "//google/api:annotations_proto", - "//google/api:client_proto", - "//google/api:field_behavior_proto", - "//google/api:resource_proto", - "//google/longrunning:operations_proto", - "//google/rpc:status_proto", - "//google/type:latlng_proto", - "//google/type:money_proto", - "//google/type:postal_address_proto", - "//google/type:timeofday_proto", - "@com_google_protobuf//:any_proto", - "@com_google_protobuf//:duration_proto", - "@com_google_protobuf//:empty_proto", - "@com_google_protobuf//:field_mask_proto", - "@com_google_protobuf//:timestamp_proto", - "@com_google_protobuf//:wrappers_proto", - ], -) - py_gapic_library( name = "talent_py_gapic", srcs = [":talent_proto"], @@ -222,18 +198,6 @@ py_gapic_assembly_pkg( ], ) -py_proto_library( - name = "talent_py_proto", - plugin = "@protoc_docs_plugin//:docs_plugin", - deps = [":talent_moved_proto"], -) - -py_grpc_library( - name = "talent_py_grpc", - srcs = [":talent_moved_proto"], - deps = [":talent_py_proto"], -) - ############################################################################## # PHP ############################################################################## From 989670e868daaad6ce0306e6ec1b9ff40659c19e Mon Sep 17 00:00:00 2001 From: Google APIs Date: Wed, 23 Sep 2020 14:49:46 -0700 Subject: [PATCH 7/8] feat: update third party protos with URLs and latest fields PiperOrigin-RevId: 333377977 --- google/cloud/notebooks/v1beta1/instance.proto | 16 ++++++++++++++-- .../notebooks/v1beta1/notebooks_v1beta1.yaml | 6 ++---- google/cloud/notebooks/v1beta1/service.proto | 19 +++++++++++++------ 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/google/cloud/notebooks/v1beta1/instance.proto b/google/cloud/notebooks/v1beta1/instance.proto index 9ac89233..e1cf91f9 100644 --- a/google/cloud/notebooks/v1beta1/instance.proto +++ b/google/cloud/notebooks/v1beta1/instance.proto @@ -22,9 +22,9 @@ import "google/cloud/notebooks/v1beta1/environment.proto"; import "google/protobuf/timestamp.proto"; import "google/api/annotations.proto"; -option go_package = "google.golang.org/genproto/googleapis/cloud/notebooks/v1beta1;notebooks"; option csharp_namespace = "Google.Cloud.Notebooks.V1Beta1"; -option php_namespace = "Google\\Cloud\\Notebooks\\V1Beta1"; +option go_package = "google.golang.org/genproto/googleapis/cloud/notebooks/v1beta1;notebooks"; +option php_namespace = "Google\\Cloud\\Notebooks\\V1beta1"; option ruby_package = "Google::Cloud::Notebooks::V1beta1"; option java_multiple_files = true; option java_outer_classname = "InstanceProto"; @@ -109,6 +109,15 @@ message Instance { // The instance is deleted. DELETED = 6; + + // The instance is upgrading. + UPGRADING = 7; + + // The instance is being created. + INITIALIZING = 8; + + // The instance is getting registered. + REGISTERING = 9; } // Possible disk types for notebook instances. @@ -121,6 +130,9 @@ message Instance { // SSD persistent disk type. PD_SSD = 2; + + // Balanced persistent disk type. + PD_BALANCED = 3; } // Definition of the disk encryption options. diff --git a/google/cloud/notebooks/v1beta1/notebooks_v1beta1.yaml b/google/cloud/notebooks/v1beta1/notebooks_v1beta1.yaml index f1311f94..92243150 100644 --- a/google/cloud/notebooks/v1beta1/notebooks_v1beta1.yaml +++ b/google/cloud/notebooks/v1beta1/notebooks_v1beta1.yaml @@ -11,10 +11,8 @@ types: documentation: summary: |- - AI Platform Notebooks API (beta) is used to manage notebook resources in - Google Cloud. AI Platform Notebooks API is in a pre-release state and - might change or have limited support. For more information, see the product launch stages. + AI Platform Notebooks API is used to manage notebook resources in Google + Cloud. rules: - selector: google.iam.v1.IAMPolicy.GetIamPolicy description: |- diff --git a/google/cloud/notebooks/v1beta1/service.proto b/google/cloud/notebooks/v1beta1/service.proto index f1e7f2fb..8c1b58c8 100644 --- a/google/cloud/notebooks/v1beta1/service.proto +++ b/google/cloud/notebooks/v1beta1/service.proto @@ -24,15 +24,15 @@ import "google/longrunning/operations.proto"; import "google/protobuf/timestamp.proto"; import "google/api/client.proto"; -option go_package = "google.golang.org/genproto/googleapis/cloud/notebooks/v1beta1;notebooks"; option csharp_namespace = "Google.Cloud.Notebooks.V1Beta1"; -option php_namespace = "Google\\Cloud\\Notebooks\\V1Beta1"; +option go_package = "google.golang.org/genproto/googleapis/cloud/notebooks/v1beta1;notebooks"; +option php_namespace = "Google\\Cloud\\Notebooks\\V1beta1"; option ruby_package = "Google::Cloud::Notebooks::V1beta1"; option java_multiple_files = true; option java_outer_classname = "NotebooksProto"; option java_package = "com.google.cloud.notebooks.v1beta1"; -// API service for Cloud AI Platform Notebooks. +// API v1beta1 service for Cloud AI Platform Notebooks. service NotebookService { option (google.api.default_host) = "notebooks.googleapis.com"; option (google.api.oauth_scopes) = "https://www.googleapis.com/auth/cloud-platform"; @@ -271,6 +271,9 @@ message OperationMetadata { // API version used to start the operation. string api_version = 7; + + // API endpoint name of this operation. + string endpoint = 8; } // Request for listing notebook instances. @@ -346,8 +349,8 @@ message SetInstanceAcceleratorRequest { // Required. Count of cores of this accelerator. Note that not all combinations // of `type` and `core_count` are valid. Check [GPUs on - // Compute Engine](/compute/docs/gpus/#gpus-list) to find a valid - // combination. TPUs are not supported. + // Compute Engine](https://cloud.google.com/compute/docs/gpus/#gpus-list) to + // find a valid combination. TPUs are not supported. int64 core_count = 3 [(google.api.field_behavior) = REQUIRED]; } @@ -357,7 +360,8 @@ message SetInstanceMachineTypeRequest { // `projects/{project_id}/locations/{location}/instances/{instance_id}` string name = 1 [(google.api.field_behavior) = REQUIRED]; - // Required. The [Compute Engine machine type](/compute/docs/machine-types). + // Required. The [Compute Engine machine + // type](https://cloud.google.com/compute/docs/machine-types). string machine_type = 2 [(google.api.field_behavior) = REQUIRED]; } @@ -430,6 +434,9 @@ message IsInstanceUpgradeableResponse { // The version this instance will be upgraded to if calling the upgrade // endpoint. This field will only be populated if field upgradeable is true. string upgrade_version = 2; + + // Additional information about upgrade. + string upgrade_info = 3; } // Request for upgrading a notebook instance From 780419edef30c9dc232e36a445388d1aa3583e2c Mon Sep 17 00:00:00 2001 From: Google APIs Date: Wed, 23 Sep 2020 15:35:06 -0700 Subject: [PATCH 8/8] build: provide package name hint for Node.js PiperOrigin-RevId: 333386951 --- google/cloud/aiplatform/v1beta1/BUILD.bazel | 1 + 1 file changed, 1 insertion(+) diff --git a/google/cloud/aiplatform/v1beta1/BUILD.bazel b/google/cloud/aiplatform/v1beta1/BUILD.bazel index 65a112d5..e7276f08 100644 --- a/google/cloud/aiplatform/v1beta1/BUILD.bazel +++ b/google/cloud/aiplatform/v1beta1/BUILD.bazel @@ -285,6 +285,7 @@ nodejs_gapic_library( src = ":aiplatform_proto_with_info", grpc_service_config = "aiplatform_grpc_service_config.json", package = "google.cloud.aiplatform.v1beta1", + package_name = "@google-cloud/aiplatform", service_yaml = "aiplatform_v1beta1.yaml", deps = [], )