Skip to content

Commit 783c91e

Browse files
yoshi-automationcrwilcox
yoshi-automation
authored and
crwilcox
committed
Copy proto files alongside protoc versions.
1 parent b2c75cb commit 783c91e

File tree

5 files changed

+100
-144
lines changed

5 files changed

+100
-144
lines changed

‎dataproc/google/cloud/dataproc_v1/proto/clusters.proto‎

Lines changed: 50 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,19 @@
1515

1616
syntax = "proto3";
1717

18-
package google.cloud.dataproc.v1beta2;
18+
package google.cloud.dataproc.v1;
1919

2020
import "google/api/annotations.proto";
21-
import "google/cloud/dataproc/v1beta2/shared.proto";
22-
import "google/cloud/dataproc/v1beta2/operations.proto";
21+
import "google/cloud/dataproc/v1/operations.proto";
2322
import "google/longrunning/operations.proto";
2423
import "google/protobuf/duration.proto";
2524
import "google/protobuf/field_mask.proto";
2625
import "google/protobuf/timestamp.proto";
2726

28-
option go_package = "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2;dataproc";
27+
option go_package = "google.golang.org/genproto/googleapis/cloud/dataproc/v1;dataproc";
2928
option java_multiple_files = true;
3029
option java_outer_classname = "ClustersProto";
31-
option java_package = "com.google.cloud.dataproc.v1beta2";
30+
option java_package = "com.google.cloud.dataproc.v1";
3231

3332

3433
// The ClusterControllerService provides methods to manage clusters
@@ -37,37 +36,37 @@ service ClusterController {
3736
// Creates a cluster in a project.
3837
rpc CreateCluster(CreateClusterRequest) returns (google.longrunning.Operation) {
3938
option (google.api.http) = {
40-
post: "/v1beta2/projects/{project_id}/regions/{region}/clusters"
39+
post: "/v1/projects/{project_id}/regions/{region}/clusters"
4140
body: "cluster"
4241
};
4342
}
4443

4544
// Updates a cluster in a project.
4645
rpc UpdateCluster(UpdateClusterRequest) returns (google.longrunning.Operation) {
4746
option (google.api.http) = {
48-
patch: "/v1beta2/projects/{project_id}/regions/{region}/clusters/{cluster_name}"
47+
patch: "/v1/projects/{project_id}/regions/{region}/clusters/{cluster_name}"
4948
body: "cluster"
5049
};
5150
}
5251

5352
// Deletes a cluster in a project.
5453
rpc DeleteCluster(DeleteClusterRequest) returns (google.longrunning.Operation) {
5554
option (google.api.http) = {
56-
delete: "/v1beta2/projects/{project_id}/regions/{region}/clusters/{cluster_name}"
55+
delete: "/v1/projects/{project_id}/regions/{region}/clusters/{cluster_name}"
5756
};
5857
}
5958

6059
// Gets the resource representation for a cluster in a project.
6160
rpc GetCluster(GetClusterRequest) returns (Cluster) {
6261
option (google.api.http) = {
63-
get: "/v1beta2/projects/{project_id}/regions/{region}/clusters/{cluster_name}"
62+
get: "/v1/projects/{project_id}/regions/{region}/clusters/{cluster_name}"
6463
};
6564
}
6665

6766
// Lists all regions/{region}/clusters in a project.
6867
rpc ListClusters(ListClustersRequest) returns (ListClustersResponse) {
6968
option (google.api.http) = {
70-
get: "/v1beta2/projects/{project_id}/regions/{region}/clusters"
69+
get: "/v1/projects/{project_id}/regions/{region}/clusters"
7170
};
7271
}
7372

@@ -76,7 +75,7 @@ service ClusterController {
7675
// contains `DiagnoseClusterOutputLocation`.
7776
rpc DiagnoseCluster(DiagnoseClusterRequest) returns (google.longrunning.Operation) {
7877
option (google.api.http) = {
79-
post: "/v1beta2/projects/{project_id}/regions/{region}/clusters/{cluster_name}:diagnose"
78+
post: "/v1/projects/{project_id}/regions/{region}/clusters/{cluster_name}:diagnose"
8079
body: "*"
8180
};
8281
}
@@ -114,7 +113,7 @@ message Cluster {
114113
// generates this value when it creates the cluster.
115114
string cluster_uuid = 6;
116115

117-
// Output only. Contains cluster daemon metrics such as HDFS and YARN stats.
116+
// Contains cluster daemon metrics such as HDFS and YARN stats.
118117
//
119118
// **Beta Feature**: This report is available for testing purposes only. It may
120119
// be changed before final release.
@@ -150,15 +149,12 @@ message ClusterConfig {
150149
// Optional. The config settings for software inside the cluster.
151150
SoftwareConfig software_config = 13;
152151

153-
// Optional. The config setting for auto delete cluster schedule.
154-
LifecycleConfig lifecycle_config = 14;
155-
156152
// Optional. Commands to execute on each node after config is
157153
// completed. By default, executables are run on master and all worker nodes.
158-
// You can test a node's <code>role</code> metadata to run an executable on
154+
// You can test a node's `role` metadata to run an executable on
159155
// a master or worker node, as shown below using `curl` (you can also use `wget`):
160156
//
161-
// ROLE=$(curl -H Metadata-Flavor:Google http://metadata/computeMetadata/v1beta2/instance/attributes/dataproc-role)
157+
// ROLE=$(curl -H Metadata-Flavor:Google http://metadata/computeMetadata/v1/instance/attributes/dataproc-role)
162158
// if [[ "${ROLE}" == 'Master' ]]; then
163159
// ... master specific actions ...
164160
// else
@@ -183,8 +179,8 @@ message GceClusterConfig {
183179
// Optional. The zone where the Compute Engine cluster will be located.
184180
// On a create request, it is required in the "global" region. If omitted
185181
// in a non-global Cloud Dataproc region, the service will pick a zone in the
186-
// corresponding Compute Engine region. On a get request, zone will always be
187-
// present.
182+
// corresponding Compute Engine region. On a get request, zone will
183+
// always be present.
188184
//
189185
// A full URL, partial URI, or short name are valid. Examples:
190186
//
@@ -308,11 +304,6 @@ message InstanceGroupConfig {
308304
// **Beta Feature**: This feature is still under development. It may be
309305
// changed before final release.
310306
repeated AcceleratorConfig accelerators = 8;
311-
312-
// Optional. Specifies the minimum cpu platform for the Instance Group.
313-
// See [Cloud Dataproc&rarr;Minimum CPU Platform]
314-
// (/dataproc/docs/concepts/compute/dataproc-min-cpu).
315-
string min_cpu_platform = 9;
316307
}
317308

318309
// Specifies the resources used to actively manage an instance group.
@@ -326,13 +317,14 @@ message ManagedGroupConfig {
326317
}
327318

328319
// Specifies the type and number of accelerator cards attached to the instances
329-
// of an instance group (see [GPUs on Compute Engine](/compute/docs/gpus/)).
320+
// of an instance. See [GPUs on Compute Engine](/compute/docs/gpus/).
330321
message AcceleratorConfig {
331322
// Full URL, partial URI, or short name of the accelerator type resource to
332-
// expose to this instance. See [Compute Engine AcceleratorTypes](
333-
// /compute/docs/reference/beta/acceleratorTypes)
323+
// expose to this instance. See
324+
// [Compute Engine AcceleratorTypes](/compute/docs/reference/beta/acceleratorTypes).
325+
//
326+
// Examples:
334327
//
335-
// Examples
336328
// * `https://www.googleapis.com/compute/beta/projects/[project_id]/zones/us-east1-a/acceleratorTypes/nvidia-tesla-k80`
337329
// * `projects/[project_id]/zones/us-east1-a/acceleratorTypes/nvidia-tesla-k80`
338330
// * `nvidia-tesla-k80`
@@ -366,30 +358,6 @@ message DiskConfig {
366358
int32 num_local_ssds = 2;
367359
}
368360

369-
// Specifies the cluster auto-delete schedule configuration.
370-
message LifecycleConfig {
371-
// Optional. The duration to keep the cluster alive while idling.
372-
// Passing this threshold will cause the cluster to be
373-
// deleted. Valid range: **[10m, 14d]**.
374-
//
375-
// Example: **"10m"**, the minimum value, to delete the
376-
// cluster when it has had no jobs running for 10 minutes.
377-
google.protobuf.Duration idle_delete_ttl = 1;
378-
379-
// Optional. Either the exact time the cluster should be deleted at or
380-
// the cluster maximum age.
381-
oneof ttl {
382-
// Optional. The time when cluster will be auto-deleted.
383-
google.protobuf.Timestamp auto_delete_time = 2;
384-
385-
// Optional. The lifetime duration of cluster. The cluster will be
386-
// auto-deleted at the end of this period. Valid range: **[10m, 14d]**.
387-
//
388-
// Example: **"1d"**, to delete the cluster 1 day after its creation..
389-
google.protobuf.Duration auto_delete_ttl = 3;
390-
}
391-
}
392-
393361
// Specifies an executable to run on a fully configured node and a
394362
// timeout period for executable completion.
395363
message NodeInitializationAction {
@@ -514,7 +482,7 @@ message CreateClusterRequest {
514482
Cluster cluster = 2;
515483

516484
// Optional. A unique id used to identify the request. If the server
517-
// receives two [CreateClusterRequest][google.cloud.dataproc.v1beta2.CreateClusterRequest] requests with the same
485+
// receives two [CreateClusterRequest][google.cloud.dataproc.v1.CreateClusterRequest] requests with the same
518486
// id, then the second request will be ignored and the
519487
// first [google.longrunning.Operation][google.longrunning.Operation] created and stored in the backend
520488
// is returned.
@@ -565,10 +533,10 @@ message UpdateClusterRequest {
565533
// }
566534
// }
567535
// }
568-
//
569-
// Similarly, to change the number of preemptible workers in a cluster to 5, the
570-
// `update_mask` parameter would be `config.secondary_worker_config.num_instances`,
571-
// and the `PATCH` request body would be set as follows:
536+
// Similarly, to change the number of preemptible workers in a cluster to 5,
537+
// the `update_mask` parameter would be
538+
// `config.secondary_worker_config.num_instances`, and the `PATCH` request
539+
// body would be set as follows:
572540
//
573541
// {
574542
// "config":{
@@ -577,35 +545,32 @@ message UpdateClusterRequest {
577545
// }
578546
// }
579547
// }
580-
// <strong>Note:</strong> currently only the following fields can be updated:
581-
//
582-
// <table>
583-
// <tr>
584-
// <td><strong>Mask</strong></td><td><strong>Purpose</strong></td>
585-
// </tr>
586-
// <tr>
587-
// <td>labels</td><td>Updates labels</td>
588-
// </tr>
589-
// <tr>
590-
// <td>config.worker_config.num_instances</td><td>Resize primary worker group</td>
591-
// </tr>
592-
// <tr>
593-
// <td>config.secondary_worker_config.num_instances</td><td>Resize secondary worker group</td>
594-
// </tr>
595-
// <tr>
596-
// <td>config.lifecycle_config.auto_delete_ttl</td><td>Reset MAX TTL duration</td>
597-
// </tr>
598-
// <tr>
599-
// <td>config.lifecycle_config.auto_delete_time</td><td>Update MAX TTL deletion timestamp</td>
600-
// </tr>
601-
// <tr>
602-
// <td>config.lifecycle_config.idle_delete_ttl</td><td>Update Idle TTL duration</td>
603-
// </tr>
604-
// </table>
548+
// <strong>Note:</strong> Currently, only the following fields can be updated:
549+
//
550+
// <table>
551+
// <tbody>
552+
// <tr>
553+
// <td><strong>Mask</strong></td>
554+
// <td><strong>Purpose</strong></td>
555+
// </tr>
556+
// <tr>
557+
// <td><strong><em>labels</em></strong></td>
558+
// <td>Update labels</td>
559+
// </tr>
560+
// <tr>
561+
// <td><strong><em>config.worker_config.num_instances</em></strong></td>
562+
// <td>Resize primary worker group</td>
563+
// </tr>
564+
// <tr>
565+
// <td><strong><em>config.secondary_worker_config.num_instances</em></strong></td>
566+
// <td>Resize secondary worker group</td>
567+
// </tr>
568+
// </tbody>
569+
// </table>
605570
google.protobuf.FieldMask update_mask = 4;
606571

607572
// Optional. A unique id used to identify the request. If the server
608-
// receives two [UpdateClusterRequest][google.cloud.dataproc.v1beta2.UpdateClusterRequest] requests with the same
573+
// receives two [UpdateClusterRequest][google.cloud.dataproc.v1.UpdateClusterRequest] requests with the same
609574
// id, then the second request will be ignored and the
610575
// first [google.longrunning.Operation][google.longrunning.Operation] created and stored in the
611576
// backend is returned.
@@ -635,7 +600,7 @@ message DeleteClusterRequest {
635600
string cluster_uuid = 4;
636601

637602
// Optional. A unique id used to identify the request. If the server
638-
// receives two [DeleteClusterRequest][google.cloud.dataproc.v1beta2.DeleteClusterRequest] requests with the same
603+
// receives two [DeleteClusterRequest][google.cloud.dataproc.v1.DeleteClusterRequest] requests with the same
639604
// id, then the second request will be ignored and the
640605
// first [google.longrunning.Operation][google.longrunning.Operation] created and stored in the
641606
// backend is returned.
@@ -705,7 +670,7 @@ message ListClustersResponse {
705670

706671
// Output only. This token is included in the response if there are more
707672
// results to fetch. To fetch additional results, provide this value as the
708-
// `page_token` in a subsequent <code>ListClustersRequest</code>.
673+
// `page_token` in a subsequent `ListClustersRequest`.
709674
string next_page_token = 2;
710675
}
711676

‎dataproc/google/cloud/dataproc_v1/proto/jobs.proto‎

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,58 +15,58 @@
1515

1616
syntax = "proto3";
1717

18-
package google.cloud.dataproc.v1beta2;
18+
package google.cloud.dataproc.v1;
1919

2020
import "google/api/annotations.proto";
2121
import "google/protobuf/empty.proto";
2222
import "google/protobuf/field_mask.proto";
2323
import "google/protobuf/timestamp.proto";
2424

25-
option go_package = "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2;dataproc";
25+
option go_package = "google.golang.org/genproto/googleapis/cloud/dataproc/v1;dataproc";
2626
option java_multiple_files = true;
2727
option java_outer_classname = "JobsProto";
28-
option java_package = "com.google.cloud.dataproc.v1beta2";
28+
option java_package = "com.google.cloud.dataproc.v1";
2929

3030

3131
// The JobController provides methods to manage jobs.
3232
service JobController {
3333
// Submits a job to a cluster.
3434
rpc SubmitJob(SubmitJobRequest) returns (Job) {
3535
option (google.api.http) = {
36-
post: "/v1beta2/projects/{project_id}/regions/{region}/jobs:submit"
36+
post: "/v1/projects/{project_id}/regions/{region}/jobs:submit"
3737
body: "*"
3838
};
3939
}
4040

4141
// Gets the resource representation for a job in a project.
4242
rpc GetJob(GetJobRequest) returns (Job) {
4343
option (google.api.http) = {
44-
get: "/v1beta2/projects/{project_id}/regions/{region}/jobs/{job_id}"
44+
get: "/v1/projects/{project_id}/regions/{region}/jobs/{job_id}"
4545
};
4646
}
4747

4848
// Lists regions/{region}/jobs in a project.
4949
rpc ListJobs(ListJobsRequest) returns (ListJobsResponse) {
5050
option (google.api.http) = {
51-
get: "/v1beta2/projects/{project_id}/regions/{region}/jobs"
51+
get: "/v1/projects/{project_id}/regions/{region}/jobs"
5252
};
5353
}
5454

5555
// Updates a job in a project.
5656
rpc UpdateJob(UpdateJobRequest) returns (Job) {
5757
option (google.api.http) = {
58-
patch: "/v1beta2/projects/{project_id}/regions/{region}/jobs/{job_id}"
58+
patch: "/v1/projects/{project_id}/regions/{region}/jobs/{job_id}"
5959
body: "job"
6060
};
6161
}
6262

6363
// Starts a job cancellation request. To access the job resource
6464
// after cancellation, call
65-
// [regions/{region}/jobs.list](/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/list) or
66-
// [regions/{region}/jobs.get](/dataproc/docs/reference/rest/v1beta2/projects.regions.jobs/get).
65+
// [regions/{region}/jobs.list](/dataproc/docs/reference/rest/v1/projects.regions.jobs/list) or
66+
// [regions/{region}/jobs.get](/dataproc/docs/reference/rest/v1/projects.regions.jobs/get).
6767
rpc CancelJob(CancelJobRequest) returns (Job) {
6868
option (google.api.http) = {
69-
post: "/v1beta2/projects/{project_id}/regions/{region}/jobs/{job_id}:cancel"
69+
post: "/v1/projects/{project_id}/regions/{region}/jobs/{job_id}:cancel"
7070
body: "*"
7171
};
7272
}
@@ -75,7 +75,7 @@ service JobController {
7575
// and the response returns `FAILED_PRECONDITION`.
7676
rpc DeleteJob(DeleteJobRequest) returns (google.protobuf.Empty) {
7777
option (google.api.http) = {
78-
delete: "/v1beta2/projects/{project_id}/regions/{region}/jobs/{job_id}"
78+
delete: "/v1/projects/{project_id}/regions/{region}/jobs/{job_id}"
7979
};
8080
}
8181
}
@@ -577,10 +577,6 @@ message Job {
577577
// be changed before final release.
578578
repeated YarnApplication yarn_applications = 9;
579579

580-
// Output only. The email address of the user submitting the job. For jobs
581-
// submitted on the cluster, the address is <code>username@hostname</code>.
582-
string submitted_by = 10;
583-
584580
// Output only. A URI pointing to the location of the stdout of the job's
585581
// driver program.
586582
string driver_output_resource_uri = 17;
@@ -633,9 +629,9 @@ message SubmitJobRequest {
633629
Job job = 2;
634630

635631
// Optional. A unique id used to identify the request. If the server
636-
// receives two [SubmitJobRequest][google.cloud.dataproc.v1beta2.SubmitJobRequest] requests with the same
632+
// receives two [SubmitJobRequest][google.cloud.dataproc.v1.SubmitJobRequest] requests with the same
637633
// id, then the second request will be ignored and the
638-
// first [Job][google.cloud.dataproc.v1beta2.Job] created and stored in the backend
634+
// first [Job][google.cloud.dataproc.v1.Job] created and stored in the backend
639635
// is returned.
640636
//
641637
// It is recommended to always set this value to a

‎dataproc/google/cloud/dataproc_v1/proto/operations.proto‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515

1616
syntax = "proto3";
1717

18-
package google.cloud.dataproc.v1beta2;
18+
package google.cloud.dataproc.v1;
1919

2020
import "google/api/annotations.proto";
2121
import "google/protobuf/timestamp.proto";
2222

23-
option go_package = "google.golang.org/genproto/googleapis/cloud/dataproc/v1beta2;dataproc";
23+
option go_package = "google.golang.org/genproto/googleapis/cloud/dataproc/v1;dataproc";
2424
option java_multiple_files = true;
2525
option java_outer_classname = "OperationsProto";
26-
option java_package = "com.google.cloud.dataproc.v1beta2";
26+
option java_package = "com.google.cloud.dataproc.v1";
2727

2828

2929
// The status of the operation.

0 commit comments

Comments
 (0)