From c506d3ec5fd440d34582540f6466fe073fd2df81 Mon Sep 17 00:00:00 2001 From: Google APIs Date: Thu, 14 Dec 2017 13:04:59 -0800 Subject: [PATCH] Synchronize new proto changes. --- gapic/packaging/dependencies.yaml | 2 +- .../v1/videointelligence_gapic.yaml | 5 + google/devtools/cloudbuild/cloudbuild.yaml | 4 +- .../devtools/cloudbuild/v1/cloudbuild.proto | 93 ++++++++++++------- 4 files changed, 65 insertions(+), 39 deletions(-) diff --git a/gapic/packaging/dependencies.yaml b/gapic/packaging/dependencies.yaml index 8e28c08a..225a8a10 100644 --- a/gapic/packaging/dependencies.yaml +++ b/gapic/packaging/dependencies.yaml @@ -47,7 +47,7 @@ gax_version: php: lower: '0.27.0' ruby: - lower: '0.10.2' + lower: '1.0.0' java: lower: '1.15.0' diff --git a/google/cloud/videointelligence/v1/videointelligence_gapic.yaml b/google/cloud/videointelligence/v1/videointelligence_gapic.yaml index 55f451c7..e16586b6 100644 --- a/google/cloud/videointelligence/v1/videointelligence_gapic.yaml +++ b/google/cloud/videointelligence/v1/videointelligence_gapic.yaml @@ -21,6 +21,11 @@ license_header: license_file: license-header-apache-2.0.txt interfaces: - name: google.cloud.videointelligence.v1.VideoIntelligenceService + smoke_test: + method: AnnotateVideo + init_fields: + - input_uri=gs://demomaker/cat.mp4 + - features[0]=LABEL_DETECTION collections: [] retry_codes_def: - name: idempotent diff --git a/google/devtools/cloudbuild/cloudbuild.yaml b/google/devtools/cloudbuild/cloudbuild.yaml index 574a2c5e..19a91029 100644 --- a/google/devtools/cloudbuild/cloudbuild.yaml +++ b/google/devtools/cloudbuild/cloudbuild.yaml @@ -34,6 +34,8 @@ backend: deadline: 20.0 - selector: google.devtools.cloudbuild.v1.CloudBuild.CancelBuild deadline: 5.0 + - selector: google.devtools.cloudbuild.v1.CloudBuild.RetryBuild + deadline: 20.0 - selector: google.devtools.cloudbuild.v1.CloudBuild.CreateBuildTrigger deadline: 5.0 - selector: google.devtools.cloudbuild.v1.CloudBuild.GetBuildTrigger @@ -46,8 +48,6 @@ backend: deadline: 5.0 - selector: google.devtools.cloudbuild.v1.CloudBuild.RunBuildTrigger deadline: 20.0 - - selector: google.devtools.cloudbuild.v1.CloudBuild.RetryBuild - deadline: 20.0 authentication: rules: diff --git a/google/devtools/cloudbuild/v1/cloudbuild.proto b/google/devtools/cloudbuild/v1/cloudbuild.proto index fc52d6a9..0272fbd9 100644 --- a/google/devtools/cloudbuild/v1/cloudbuild.proto +++ b/google/devtools/cloudbuild/v1/cloudbuild.proto @@ -38,9 +38,6 @@ option objc_class_prefix = "GCB"; // // A user can list previously-requested builds or get builds by their ID to // determine the status of the build. -// ////////// -// BUILDS // -// ////////// service CloudBuild { // Starts a build with the specified configuration. // @@ -72,6 +69,37 @@ service CloudBuild { option (google.api.http) = { post: "/v1/projects/{project_id}/builds/{id}:cancel" body: "*" }; } + // Creates a new build based on the given build. + // + // This API creates a new build using the original build request, which may + // or may not result in an identical build. + // + // For triggered builds: + // + // * Triggered builds resolve to a precise revision, so a retry of a triggered + // build will result in a build that uses the same revision. + // + // For non-triggered builds that specify RepoSource: + // + // * If the original build built from the tip of a branch, the retried build + // will build from the tip of that branch, which may not be the same revision + // as the original build. + // * If the original build specified a commit sha or revision ID, the retried + // build will use the identical source. + // + // For builds that specify StorageSource: + // + // * If the original build pulled source from Cloud Storage without specifying + // the generation of the object, the new build will use the current object, + // which may be different from the original build source. + // * If the original build pulled source from Cloud Storage and specified the + // generation of the object, the new build will attempt to use the same + // object, which may or may not be available depending on the bucket's + // lifecycle management settings. + rpc RetryBuild(RetryBuildRequest) returns (google.longrunning.Operation) { + option (google.api.http) = { post: "/v1/projects/{project_id}/builds/{id}:retry" body: "*" }; + } + // Creates a new BuildTrigger. // // This API is experimental. @@ -111,37 +139,6 @@ service CloudBuild { rpc RunBuildTrigger(RunBuildTriggerRequest) returns (google.longrunning.Operation) { option (google.api.http) = { post: "/v1/projects/{project_id}/triggers/{trigger_id}:run" body: "source" }; } - - // Creates a new build based on the given build. - // - // This API creates a new build using the original build request, which may - // or may not result in an identical build. - // - // For triggered builds: - // - // * Triggered builds resolve to a precise revision, so a retry of a triggered - // build will result in a build that uses the same revision. - // - // For non-triggered builds that specify RepoSource: - // - // * If the original build built from the tip of a branch, the retried build - // will build from the tip of that branch, which may not be the same revision - // as the original build. - // * If the original build specified a commit sha or revision ID, the retried - // build will use the identical source. - // - // For builds that specify StorageSource: - // - // * If the original build pulled source from Cloud Storage without specifying - // the generation of the object, the new build will use the current object, - // which may be different from the original build source. - // * If the original build pulled source from Cloud Storage and specified the - // generation of the object, the new build will attempt to use the same - // object, which may or may not be available depending on the bucket's - // lifecycle management settings. - rpc RetryBuild(RetryBuildRequest) returns (google.longrunning.Operation) { - option (google.api.http) = { post: "/v1/projects/{project_id}/builds/{id}:retry" body: "*" }; - } } // RetryBuildRequest specifies a build to retry. @@ -233,6 +230,9 @@ message BuiltImage { // Docker Registry 2.0 digest. string digest = 3; + + // Stores timing information for pushing the specified image. + TimeSpan push_timing = 4; } // BuildStep describes a step to perform in the build pipeline. @@ -301,6 +301,9 @@ message BuildStep { // Using a named volume in only one step is not valid as it is indicative // of a mis-configured build request. repeated Volume volumes = 9; + + // Stores timing information for executing this build step. + TimeSpan timing = 10; } // Volume describes a Docker container volume which is mounted into build steps @@ -462,6 +465,24 @@ message Build { // Secrets to decrypt using Cloud KMS. repeated Secret secrets = 32; + + // Stores timing information for phases of the build. + // Valid keys are: + // - BUILD: time to execute all build steps + // - PUSH: time to push all specified images. + // - FETCHSOURCE: time to fetch source. + // If the build does not specify source, or does not specify images, + // these keys will not be included. + map timing = 33; +} + +// Stores start and end times for a build execution phase. +message TimeSpan { + // Start of time span. + google.protobuf.Timestamp start_time = 1; + + // End of time span. + google.protobuf.Timestamp end_time = 2; } // Metadata for build operations. @@ -692,10 +713,10 @@ message BuildOptions { // Standard machine type. UNSPECIFIED = 0; - // Medium size. + // Highcpu machine with 8 CPUs. N1_HIGHCPU_8 = 1; - // Large size. + // Highcpu machine with 32 CPUs. N1_HIGHCPU_32 = 2; }