Merge branch 'master' into miraleung-patch-1

This commit is contained in:
Mira Leung 2020-09-23 16:37:45 -07:00 committed by GitHub
commit e06a4c4fcf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 248 additions and 103 deletions

View File

@ -244,8 +244,8 @@ pip_repositories()
# Change upstream repository once PR is merged
http_archive(
name = "gapic_generator_python",
strip_prefix = "gapic-generator-python-0.33.0",
urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.33.0.zip"],
urls = ["https://github.com/googleapis/gapic-generator-python/archive/v0.33.6.zip"],
strip_prefix = "gapic-generator-python-0.33.6",
)
load(

View File

@ -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",
],
)
@ -326,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 = [],
)

View File

@ -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].

View File

@ -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";

View File

@ -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.

View File

@ -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 <a
href="/products#product-launch-stages">product launch stages</a>.
AI Platform Notebooks API is used to manage notebook resources in Google
Cloud.
rules:
- selector: google.iam.v1.IAMPolicy.GetIamPolicy
description: |-

View File

@ -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

View File

@ -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

View File

@ -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;
}

View File

@ -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
##############################################################################