From 62f3240bf70f303aead08a2aba1254a7917b09eb Mon Sep 17 00:00:00 2001 From: googleapis-publisher Date: Mon, 5 Dec 2016 19:18:05 -0800 Subject: [PATCH] Synchronize new proto changes. --- .../devtools/cloudbuild/v1/cloudbuild.proto | 93 ++++++++++++++----- .../clouderrorreporting/v1beta1/common.proto | 1 - google/devtools/cloudtrace/v1/trace.proto | 2 + 3 files changed, 73 insertions(+), 23 deletions(-) diff --git a/google/devtools/cloudbuild/v1/cloudbuild.proto b/google/devtools/cloudbuild/v1/cloudbuild.proto index ba87c581..dd966044 100644 --- a/google/devtools/cloudbuild/v1/cloudbuild.proto +++ b/google/devtools/cloudbuild/v1/cloudbuild.proto @@ -17,12 +17,12 @@ syntax = "proto3"; package google.devtools.cloudbuild.v1; import "google/api/annotations.proto"; -import "google/devtools/source/v1/source_context.proto"; import "google/longrunning/operations.proto"; import "google/protobuf/duration.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; +option go_package = "google.golang.org/genproto/googleapis/devtools/cloudbuild/v1;cloudbuild"; option java_multiple_files = true; option java_package = "com.google.cloudbuild.v1"; option objc_class_prefix = "GCB"; @@ -173,14 +173,36 @@ message BuiltImage { // BuildStep describes a step to perform in the build pipeline. message BuildStep { - // Name of the container image to use for creating this stage in the - // pipeline, as presented to `docker pull`. + // The name of the container image that will run this particular build step. + // + // If the image is already available in the host's Docker daemon's cache, it + // will be run directly. If not, the host will attempt to pull the image + // first, using the builder service account's credentials if necessary. + // + // The Docker daemon's cache will already have the latest versions of all of + // the officially supported build steps + // (https://github.com/GoogleCloudPlatform/cloud-builders). The Docker daemon + // will also have cached many of the layers for some popular images, like + // "ubuntu", "debian", but they will be refreshed at the time you attempt to + // use them. + // + // If you built an image in a previous build step, it will be stored in the + // host's Docker daemon's cache and is available to use as the name for a + // later build step. string name = 1; - // Additional environment variables to set for this step's container. + // A list of environment variable definitions to be used when running a step. + // + // The elements are of the form "KEY=VALUE" for the environment variable "KEY" + // being given the value "VALUE". repeated string env = 2; - // Command-line arguments to use when running this step's container. + // A list of arguments that will be presented to the step when it is started. + // + // If the image used to run the step's container has an entrypoint, these args + // will be used as arguments to that entrypoint. If the image does not define + // an entrypoint, the first element in args will be used as the entrypoint, + // and the remainder will be used as arguments. repeated string args = 3; // Working directory (relative to project source root) to use when running @@ -213,15 +235,24 @@ message Results { // At a high level, a Build describes where to find source code, how to build // it (for example, the builder image to run on the source), and what tag to // apply to the built image when it is pushed to Google Container Registry. +// +// Fields can include the following variables which will be expanded when the +// build is created: +// +// - $PROJECT_ID: the project ID of the build. +// - $BUILD_ID: the autogenerated ID of the build. +// - $REPO_NAME: the source repository name specified by RepoSource. +// - $BRANCH_NAME: the branch name specified by RepoSource. +// - $TAG_NAME: the tag name specified by RepoSource. +// - $REVISION_ID or $COMMIT_SHA: the commit SHA specified by RepoSource or +// resolved from the specified branch or tag. message Build { // Possible status of a build. + // Non-terminal statuses. enum Status { // Status of the build is unknown. STATUS_UNKNOWN = 0; - // Build has been received and is being queued. - QUEUING = 8; - // Build is queued; work has not yet begun. QUEUED = 1; @@ -270,7 +301,7 @@ message Build { // @OutputOnly Results results = 10; - // Time at which the build was created. + // Time at which the request to create the build was received. // @OutputOnly google.protobuf.Timestamp create_time = 6; @@ -279,6 +310,9 @@ message Build { google.protobuf.Timestamp start_time = 7; // Time at which execution of the build was finished. + // + // The difference between finish_time and start_time is the duration of the + // build's execution. // @OutputOnly google.protobuf.Timestamp finish_time = 8; @@ -289,10 +323,15 @@ message Build { // Default time is ten minutes. google.protobuf.Duration timeout = 12; - // List of images expected to be built and pushed to Google Container - // Registry. If an image is listed here and the image is not produced by - // one of the build steps, the build will fail. Any images present when - // the build steps are complete will be pushed to Container Registry. + // A list of images to be pushed upon the successful completion of all build + // steps. + // + // The images will be pushed using the builder service account's credentials. + // + // The digests of the pushed images will be stored in the Build resource's + // results field. + // + // If any of the images fail to be pushed, the build is marked FAILURE. repeated string images = 13; // Google Cloud Storage bucket where logs should be written (see @@ -305,6 +344,11 @@ message Build { // @OutputOnly SourceProvenance source_provenance = 21; + // The ID of the BuildTrigger that triggered this build, if it was + // triggered automatically. + // @OutputOnly + string build_trigger_id = 22; + // Special options for this build. BuildOptions options = 23; @@ -396,6 +440,9 @@ message ListBuildsRequest { // Token to provide to skip to a particular spot in the list. string page_token = 3; + + // The raw filter text to constrain the results. + string filter = 8; } // Response including listed builds. @@ -424,6 +471,9 @@ message BuildTrigger { // @OutputOnly string id = 1; + // Human-readable description of this trigger. + string description = 10; + // Template describing the types of source changes to trigger a build. // // Branch and tag names in trigger templates are interpreted as regular @@ -432,23 +482,22 @@ message BuildTrigger { RepoSource trigger_template = 7; // Template describing the Build request to make when the trigger is matched. - // - // Fields can include the following variables which will be expanded when the - // build is created: - // - $PROJECT_ID: the project ID that owns the repo. - // - $REPO_NAME: the name of the repo. - // - $BRANCH_NAME: the branch name that triggered the build. - // - $TAG_NAME: the tag name that triggered the build. - // - $REVISION_ID: the commit SHA of the revision that triggered the build. oneof build_template { // Contents of the build template. Build build = 4; + + // Path, from the source root, to a file whose contents is used for the + // template. + string filename = 8; } // Time when the trigger was created. // // @OutputOnly google.protobuf.Timestamp create_time = 5; + + // If true, the trigger will never result in a build. + bool disabled = 9; } // Request to create a new BuildTrigger. @@ -516,6 +565,6 @@ message BuildOptions { // Requested hash for SourceProvenance. repeated Hash.HashType source_provenance_hash = 1; - // Options for a verifiable build with details uploaded to the Analysis API. + // Requested verifiability options. VerifyOption requested_verify_option = 2; } diff --git a/google/devtools/clouderrorreporting/v1beta1/common.proto b/google/devtools/clouderrorreporting/v1beta1/common.proto index 2a7a6386..e2cbbb72 100644 --- a/google/devtools/clouderrorreporting/v1beta1/common.proto +++ b/google/devtools/clouderrorreporting/v1beta1/common.proto @@ -18,7 +18,6 @@ package google.devtools.clouderrorreporting.v1beta1; import "google/api/annotations.proto"; import "google/api/monitored_resource.proto"; -import "google/appengine/logging/v1/request_log.proto"; import "google/protobuf/timestamp.proto"; option csharp_namespace = "Google.Cloud.ErrorReporting.V1Beta1"; diff --git a/google/devtools/cloudtrace/v1/trace.proto b/google/devtools/cloudtrace/v1/trace.proto index e7001a79..7344e47d 100644 --- a/google/devtools/cloudtrace/v1/trace.proto +++ b/google/devtools/cloudtrace/v1/trace.proto @@ -20,6 +20,8 @@ import "google/api/annotations.proto"; import "google/protobuf/empty.proto"; import "google/protobuf/timestamp.proto"; +option csharp_namespace = "Google.Cloud.Trace.V1"; +option go_package = "google.golang.org/genproto/googleapis/devtools/cloudtrace/v1;cloudtrace"; option java_multiple_files = true; option java_outer_classname = "TraceProto"; option java_package = "com.google.devtools.cloudtrace.v1";