From f36f335850bb816600dbb4f2cc1b589540f565c1 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Mon, 25 Feb 2019 14:45:18 -0800 Subject: [PATCH] Synchronize new proto/yaml changes. PiperOrigin-RevId: 235606400 --- google/appengine/legacy/audit_data.proto | 1 - google/appengine/logging/v1/request_log.proto | 1 - google/appengine/v1/app_yaml.proto | 6 +- google/appengine/v1/appengine.proto | 103 +++++++++++++----- google/appengine/v1/application.proto | 1 - google/appengine/v1/audit_data.proto | 1 - google/appengine/v1/deploy.proto | 1 - google/appengine/v1/instance.proto | 1 - google/appengine/v1/location.proto | 4 +- google/appengine/v1/operation.proto | 4 +- google/appengine/v1/service.proto | 1 - google/appengine/v1/version.proto | 7 +- 12 files changed, 86 insertions(+), 45 deletions(-) diff --git a/google/appengine/legacy/audit_data.proto b/google/appengine/legacy/audit_data.proto index 75c2a9b2..05181457 100644 --- a/google/appengine/legacy/audit_data.proto +++ b/google/appengine/legacy/audit_data.proto @@ -21,7 +21,6 @@ option java_multiple_files = true; option java_outer_classname = "AuditDataProto"; option java_package = "com.google.appengine.legacy"; - // Admin Console legacy audit log. message AuditData { // Text description of the admin event. diff --git a/google/appengine/logging/v1/request_log.proto b/google/appengine/logging/v1/request_log.proto index 678ea9a5..f3e2630a 100644 --- a/google/appengine/logging/v1/request_log.proto +++ b/google/appengine/logging/v1/request_log.proto @@ -25,7 +25,6 @@ option java_multiple_files = true; option java_outer_classname = "RequestLogProto"; option java_package = "com.google.appengine.logging.v1"; - // Application log line emitted while processing a request. message LogLine { // Approximate time when this log entry was made. diff --git a/google/appengine/v1/app_yaml.proto b/google/appengine/v1/app_yaml.proto index 2892ef30..c0bb2ce2 100644 --- a/google/appengine/v1/app_yaml.proto +++ b/google/appengine/v1/app_yaml.proto @@ -24,8 +24,8 @@ option java_multiple_files = true; option java_outer_classname = "AppYamlProto"; option java_package = "com.google.appengine.v1"; - -// [Google Cloud Endpoints](https://cloud.google.com/appengine/docs/python/endpoints/) +// [Google Cloud +// Endpoints](https://cloud.google.com/appengine/docs/python/endpoints/) // configuration for API handlers. message ApiConfigHandler { // Action to take when users access resources that require @@ -51,6 +51,7 @@ message ErrorHandler { // Error codes. enum ErrorCode { option allow_alias = true; + // Not specified. ERROR_CODE_DEFAULT is assumed. ERROR_CODE_UNSPECIFIED = 0; @@ -261,6 +262,7 @@ enum LoginRequirement { // Methods to enforce security (HTTPS) on a URL. enum SecurityLevel { option allow_alias = true; + // Not specified. SECURE_UNSPECIFIED = 0; diff --git a/google/appengine/v1/appengine.proto b/google/appengine/v1/appengine.proto index ef947a65..6b9c3847 100644 --- a/google/appengine/v1/appengine.proto +++ b/google/appengine/v1/appengine.proto @@ -32,22 +32,28 @@ option java_multiple_files = true; option java_outer_classname = "AppengineProto"; option java_package = "com.google.appengine.v1"; - // Manages instances of a version. service Instances { // Lists the instances of a version. rpc ListInstances(ListInstancesRequest) returns (ListInstancesResponse) { - option (google.api.http) = { get: "/v1/{parent=apps/*/services/*/versions/*}/instances" }; + option (google.api.http) = { + get: "/v1/{parent=apps/*/services/*/versions/*}/instances" + }; } // Gets instance information. rpc GetInstance(GetInstanceRequest) returns (Instance) { - option (google.api.http) = { get: "/v1/{name=apps/*/services/*/versions/*/instances/*}" }; + option (google.api.http) = { + get: "/v1/{name=apps/*/services/*/versions/*/instances/*}" + }; } // Stops a running instance. - rpc DeleteInstance(DeleteInstanceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { delete: "/v1/{name=apps/*/services/*/versions/*/instances/*}" }; + rpc DeleteInstance(DeleteInstanceRequest) + returns (google.longrunning.Operation) { + option (google.api.http) = { + delete: "/v1/{name=apps/*/services/*/versions/*/instances/*}" + }; } // Enables debugging on a VM instance. This allows you to use the SSH @@ -58,8 +64,12 @@ service Instances { // should be started. // // Only applicable for instances in App Engine flexible environment. - rpc DebugInstance(DebugInstanceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/{name=apps/*/services/*/versions/*/instances/*}:debug" body: "*" }; + rpc DebugInstance(DebugInstanceRequest) + returns (google.longrunning.Operation) { + option (google.api.http) = { + post: "/v1/{name=apps/*/services/*/versions/*/instances/*}:debug" + body: "*" + }; } } @@ -67,19 +77,27 @@ service Instances { service Versions { // Lists the versions of a service. rpc ListVersions(ListVersionsRequest) returns (ListVersionsResponse) { - option (google.api.http) = { get: "/v1/{parent=apps/*/services/*}/versions" }; + option (google.api.http) = { + get: "/v1/{parent=apps/*/services/*}/versions" + }; } // Gets the specified Version resource. // By default, only a `BASIC_VIEW` will be returned. // Specify the `FULL_VIEW` parameter to get the full resource. rpc GetVersion(GetVersionRequest) returns (Version) { - option (google.api.http) = { get: "/v1/{name=apps/*/services/*/versions/*}" }; + option (google.api.http) = { + get: "/v1/{name=apps/*/services/*/versions/*}" + }; } // Deploys code and resource files to a new version. - rpc CreateVersion(CreateVersionRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/{parent=apps/*/services/*}/versions" body: "version" }; + rpc CreateVersion(CreateVersionRequest) + returns (google.longrunning.Operation) { + option (google.api.http) = { + post: "/v1/{parent=apps/*/services/*}/versions" + body: "version" + }; } // Updates the specified Version resource. @@ -97,13 +115,20 @@ service Versions { // * [`automatic_scaling.max_idle_instances`](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services.versions#Version.FIELDS.automatic_scaling): // For Version resources that use automatic scaling and run in the App // Engine standard environment. - rpc UpdateVersion(UpdateVersionRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { patch: "/v1/{name=apps/*/services/*/versions/*}" body: "version" }; + rpc UpdateVersion(UpdateVersionRequest) + returns (google.longrunning.Operation) { + option (google.api.http) = { + patch: "/v1/{name=apps/*/services/*/versions/*}" + body: "version" + }; } // Deletes an existing Version resource. - rpc DeleteVersion(DeleteVersionRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { delete: "/v1/{name=apps/*/services/*/versions/*}" }; + rpc DeleteVersion(DeleteVersionRequest) + returns (google.longrunning.Operation) { + option (google.api.http) = { + delete: "/v1/{name=apps/*/services/*/versions/*}" + }; } } @@ -111,22 +136,33 @@ service Versions { service Services { // Lists all the services in the application. rpc ListServices(ListServicesRequest) returns (ListServicesResponse) { - option (google.api.http) = { get: "/v1/{parent=apps/*}/services" }; + option (google.api.http) = { + get: "/v1/{parent=apps/*}/services" + }; } // Gets the current configuration of the specified service. rpc GetService(GetServiceRequest) returns (Service) { - option (google.api.http) = { get: "/v1/{name=apps/*/services/*}" }; + option (google.api.http) = { + get: "/v1/{name=apps/*/services/*}" + }; } // Updates the configuration of the specified service. - rpc UpdateService(UpdateServiceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { patch: "/v1/{name=apps/*/services/*}" body: "service" }; + rpc UpdateService(UpdateServiceRequest) + returns (google.longrunning.Operation) { + option (google.api.http) = { + patch: "/v1/{name=apps/*/services/*}" + body: "service" + }; } // Deletes the specified service and all enclosed versions. - rpc DeleteService(DeleteServiceRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { delete: "/v1/{name=apps/*/services/*}" }; + rpc DeleteService(DeleteServiceRequest) + returns (google.longrunning.Operation) { + option (google.api.http) = { + delete: "/v1/{name=apps/*/services/*}" + }; } } @@ -134,15 +170,21 @@ service Services { service Applications { // Gets information about an application. rpc GetApplication(GetApplicationRequest) returns (Application) { - option (google.api.http) = { get: "/v1/{name=apps/*}" }; + option (google.api.http) = { + get: "/v1/{name=apps/*}" + }; } // Recreates the required App Engine features for the application in your // project, for example a Cloud Storage bucket or App Engine service account. // Use this method if you receive an error message about a missing feature, // for example "*Error retrieving the App Engine service account*". - rpc RepairApplication(RepairApplicationRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/{name=apps/*}:repair" body: "*" }; + rpc RepairApplication(RepairApplicationRequest) + returns (google.longrunning.Operation) { + option (google.api.http) = { + post: "/v1/{name=apps/*}:repair" + body: "*" + }; } } @@ -201,14 +243,17 @@ message UpdateServiceRequest { // single version. By default, traffic is shifted immediately. // For gradual traffic migration, the target version // must be located within instances that are configured for both - // [warmup requests](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services.versions#inboundservicetype) + // [warmup + // requests](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services.versions#inboundservicetype) // and - // [automatic scaling](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services.versions#automaticscaling). + // [automatic + // scaling](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services.versions#automaticscaling). // You must specify the // [`shardBy`](https://cloud.google.com/appengine/docs/admin-api/reference/rest/v1/apps.services#shardby) // field in the Service resource. Gradual traffic migration is not // supported in the App Engine flexible environment. For examples, see - // [Migrating and Splitting Traffic](https://cloud.google.com/appengine/docs/admin-api/migrating-splitting-traffic). + // [Migrating and Splitting + // Traffic](https://cloud.google.com/appengine/docs/admin-api/migrating-splitting-traffic). bool migrate_traffic = 4; } @@ -327,8 +372,8 @@ message DebugInstanceRequest { string name = 1; } -// Fields that should be returned when [Version][google.appengine.v1.Version] resources -// are retreived. +// Fields that should be returned when [Version][google.appengine.v1.Version] +// resources are retreived. enum VersionView { // Basic version information including scaling and inbound services, // but not detailed deployment information. diff --git a/google/appengine/v1/application.proto b/google/appengine/v1/application.proto index d962dda6..f85375fe 100644 --- a/google/appengine/v1/application.proto +++ b/google/appengine/v1/application.proto @@ -24,7 +24,6 @@ option java_multiple_files = true; option java_outer_classname = "ApplicationProto"; option java_package = "com.google.appengine.v1"; - // An Application resource contains the top-level configuration of an App // Engine application. message Application { diff --git a/google/appengine/v1/audit_data.proto b/google/appengine/v1/audit_data.proto index 6318a960..db8d97df 100644 --- a/google/appengine/v1/audit_data.proto +++ b/google/appengine/v1/audit_data.proto @@ -24,7 +24,6 @@ option java_multiple_files = true; option java_outer_classname = "AuditDataProto"; option java_package = "com.google.appengine.v1"; - // App Engine admin service audit log. message AuditData { // Detailed information about methods that require it. Does not include diff --git a/google/appengine/v1/deploy.proto b/google/appengine/v1/deploy.proto index 77e6444f..e8419993 100644 --- a/google/appengine/v1/deploy.proto +++ b/google/appengine/v1/deploy.proto @@ -23,7 +23,6 @@ option java_multiple_files = true; option java_outer_classname = "DeployProto"; option java_package = "com.google.appengine.v1"; - // Code and application artifacts used to deploy a version to App Engine. message Deployment { // Manifest of the files stored in Google Cloud Storage that are included diff --git a/google/appengine/v1/instance.proto b/google/appengine/v1/instance.proto index 206af269..e7c87ee2 100644 --- a/google/appengine/v1/instance.proto +++ b/google/appengine/v1/instance.proto @@ -24,7 +24,6 @@ option java_multiple_files = true; option java_outer_classname = "InstanceProto"; option java_package = "com.google.appengine.v1"; - // An Instance resource is the computing unit that App Engine uses to // automatically scale an application. message Instance { diff --git a/google/appengine/v1/location.proto b/google/appengine/v1/location.proto index 2a81fb91..8364dde8 100644 --- a/google/appengine/v1/location.proto +++ b/google/appengine/v1/location.proto @@ -24,8 +24,8 @@ option java_multiple_files = true; option java_outer_classname = "LocationProto"; option java_package = "com.google.appengine.v1"; - -// Metadata for the given [google.cloud.location.Location][google.cloud.location.Location]. +// Metadata for the given +// [google.cloud.location.Location][google.cloud.location.Location]. message LocationMetadata { // App Engine Standard Environment is available in the given location. // diff --git a/google/appengine/v1/operation.proto b/google/appengine/v1/operation.proto index ec798889..b1c9e235 100644 --- a/google/appengine/v1/operation.proto +++ b/google/appengine/v1/operation.proto @@ -24,8 +24,8 @@ option java_multiple_files = true; option java_outer_classname = "OperationProto"; option java_package = "com.google.appengine.v1"; - -// Metadata for the given [google.longrunning.Operation][google.longrunning.Operation]. +// Metadata for the given +// [google.longrunning.Operation][google.longrunning.Operation]. message OperationMetadataV1 { // API method that initiated this operation. Example: // `google.appengine.v1.Versions.CreateVersion`. diff --git a/google/appengine/v1/service.proto b/google/appengine/v1/service.proto index 2a24c47f..2726fae9 100644 --- a/google/appengine/v1/service.proto +++ b/google/appengine/v1/service.proto @@ -23,7 +23,6 @@ option java_multiple_files = true; option java_outer_classname = "ServiceProto"; option java_package = "com.google.appengine.v1"; - // A Service resource is a logical component of an application that can share // state and communicate in a secure fashion with other services. // For example, an application that handles customer requests might diff --git a/google/appengine/v1/version.proto b/google/appengine/v1/version.proto index b32e1ac5..94ed0b0c 100644 --- a/google/appengine/v1/version.proto +++ b/google/appengine/v1/version.proto @@ -27,7 +27,6 @@ option java_multiple_files = true; option java_outer_classname = "VersionProto"; option java_package = "com.google.appengine.v1"; - // A Version resource is a specific set of source code and configuration files // that are deployed into a service. message Version { @@ -138,7 +137,8 @@ message Version { repeated Library libraries = 102; // Serving configuration for - // [Google Cloud Endpoints](https://cloud.google.com/appengine/docs/python/endpoints/). + // [Google Cloud + // Endpoints](https://cloud.google.com/appengine/docs/python/endpoints/). // // Only returned in `GET` requests if `view=FULL` is set. ApiConfigHandler api_config = 103; @@ -249,7 +249,8 @@ message BasicScaling { message ManualScaling { // Number of instances to assign to the service at the start. This number // can later be altered by using the - // [Modules API](https://cloud.google.com/appengine/docs/python/modules/functions) + // [Modules + // API](https://cloud.google.com/appengine/docs/python/modules/functions) // `set_num_instances()` function. int32 instances = 1; }