Skip to content
This repository was archived by the owner on Sep 16, 2023. It is now read-only.

Commit 4c727e1

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
fix: Use http binding with location field as primary http bindings (#138)
* fix!: Use http binding with location field as primary http bindings Changing HTTP bindings and/or their order might be a breaking change for libraries. PiperOrigin-RevId: 430239565 Source-Link: googleapis/googleapis@71fe7ff Source-Link: https://github.com/googleapis/googleapis-gen/commit/1f496cc36dd77921e45a278114bbc2198cc8352a Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMWY0OTZjYzM2ZGQ3NzkyMWU0NWEyNzgxMTRiYmMyMTk4Y2M4MzUyYSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 9de1698 commit 4c727e1

File tree

11 files changed

+73
-76
lines changed

11 files changed

+73
-76
lines changed

‎proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/Job.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
*
2424
* <pre>
2525
* Defines a job to be run by the Cloud Dataflow service.
26-
* nextID: 26
2726
* </pre>
2827
*
2928
* Protobuf type {@code google.dataflow.v1beta3.Job}
@@ -2324,7 +2323,6 @@ protected Builder newBuilderForType(com.google.protobuf.GeneratedMessageV3.Build
23242323
*
23252324
* <pre>
23262325
* Defines a job to be run by the Cloud Dataflow service.
2327-
* nextID: 26
23282326
* </pre>
23292327
*
23302328
* Protobuf type {@code google.dataflow.v1beta3.Job}

‎proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/JobsProto.java‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -327,24 +327,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
327327
+ "_DESCRIPTION\020\0032\221\014\n\013JobsV1Beta3\022\301\001\n\tCreat"
328328
+ "eJob\022).google.dataflow.v1beta3.CreateJob"
329329
+ "Request\032\034.google.dataflow.v1beta3.Job\"k\202"
330-
+ "\323\344\223\002e\" /v1b3/projects/{project_id}/jobs:"
331-
+ "\003jobZ<\"5/v1b3/projects/{project_id}/loca"
332-
+ "tions/{location}/jobs:\003job\022\303\001\n\006GetJob\022&."
330+
+ "\323\344\223\002e\"5/v1b3/projects/{project_id}/locat"
331+
+ "ions/{location}/jobs:\003jobZ\'\" /v1b3/proje"
332+
+ "cts/{project_id}/jobs:\003job\022\303\001\n\006GetJob\022&."
333333
+ "google.dataflow.v1beta3.GetJobRequest\032\034."
334-
+ "google.dataflow.v1beta3.Job\"s\202\323\344\223\002m\022)/v1"
335-
+ "b3/projects/{project_id}/jobs/{job_id}Z@"
336-
+ "\022>/v1b3/projects/{project_id}/locations/"
337-
+ "{location}/jobs/{job_id}\022\323\001\n\tUpdateJob\022)"
334+
+ "google.dataflow.v1beta3.Job\"s\202\323\344\223\002m\022>/v1"
335+
+ "b3/projects/{project_id}/locations/{loca"
336+
+ "tion}/jobs/{job_id}Z+\022)/v1b3/projects/{p"
337+
+ "roject_id}/jobs/{job_id}\022\323\001\n\tUpdateJob\022)"
338338
+ ".google.dataflow.v1beta3.UpdateJobReques"
339339
+ "t\032\034.google.dataflow.v1beta3.Job\"}\202\323\344\223\002w\032"
340-
+ ")/v1b3/projects/{project_id}/jobs/{job_i"
341-
+ "d}:\003jobZE\032>/v1b3/projects/{project_id}/l"
342-
+ "ocations/{location}/jobs/{job_id}:\003job\022\302"
340+
+ ">/v1b3/projects/{project_id}/locations/{"
341+
+ "location}/jobs/{job_id}:\003jobZ0\032)/v1b3/pr"
342+
+ "ojects/{project_id}/jobs/{job_id}:\003job\022\302"
343343
+ "\001\n\010ListJobs\022(.google.dataflow.v1beta3.Li"
344344
+ "stJobsRequest\032).google.dataflow.v1beta3."
345-
+ "ListJobsResponse\"a\202\323\344\223\002[\022 /v1b3/projects"
346-
+ "/{project_id}/jobsZ7\0225/v1b3/projects/{pr"
347-
+ "oject_id}/locations/{location}/jobs\022\236\001\n\022"
345+
+ "ListJobsResponse\"a\202\323\344\223\002[\0225/v1b3/projects"
346+
+ "/{project_id}/locations/{location}/jobsZ"
347+
+ "\"\022 /v1b3/projects/{project_id}/jobs\022\236\001\n\022"
348348
+ "AggregatedListJobs\022(.google.dataflow.v1b"
349349
+ "eta3.ListJobsRequest\032).google.dataflow.v"
350350
+ "1beta3.ListJobsResponse\"3\202\323\344\223\002-\022+/v1b3/p"
@@ -354,10 +354,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
354354
+ "ow.v1beta3.CheckActiveJobsResponse\"\000\022\354\001\n"
355355
+ "\013SnapshotJob\022+.google.dataflow.v1beta3.S"
356356
+ "napshotJobRequest\032!.google.dataflow.v1be"
357-
+ "ta3.Snapshot\"\214\001\202\323\344\223\002\205\001\"2/v1b3/projects/{"
358-
+ "project_id}/jobs/{job_id}:snapshot:\001*ZL\""
359-
+ "G/v1b3/projects/{project_id}/locations/{"
360-
+ "location}/jobs/{job_id}:snapshot:\001*\032\324\001\312A"
357+
+ "ta3.Snapshot\"\214\001\202\323\344\223\002\205\001\"G/v1b3/projects/{"
358+
+ "project_id}/locations/{location}/jobs/{j"
359+
+ "ob_id}:snapshot:\001*Z7\"2/v1b3/projects/{pr"
360+
+ "oject_id}/jobs/{job_id}:snapshot:\001*\032\324\001\312A"
361361
+ "\027dataflow.googleapis.com\322A\266\001https://www."
362362
+ "googleapis.com/auth/cloud-platform,https"
363363
+ "://www.googleapis.com/auth/compute,https"

‎proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MessagesProto.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
104104
+ "\020\0042\347\003\n\017MessagesV1Beta3\022\374\001\n\017ListJobMessag"
105105
+ "es\022/.google.dataflow.v1beta3.ListJobMess"
106106
+ "agesRequest\0320.google.dataflow.v1beta3.Li"
107-
+ "stJobMessagesResponse\"\205\001\202\323\344\223\002\177\0222/v1b3/pr"
108-
+ "ojects/{project_id}/jobs/{job_id}/messag"
109-
+ "esZI\022G/v1b3/projects/{project_id}/locati"
110-
+ "ons/{location}/jobs/{job_id}/messages\032\324\001"
107+
+ "stJobMessagesResponse\"\205\001\202\323\344\223\002\177\022G/v1b3/pr"
108+
+ "ojects/{project_id}/locations/{location}"
109+
+ "/jobs/{job_id}/messagesZ4\0222/v1b3/project"
110+
+ "s/{project_id}/jobs/{job_id}/messages\032\324\001"
111111
+ "\312A\027dataflow.googleapis.com\322A\266\001https://ww"
112112
+ "w.googleapis.com/auth/cloud-platform,htt"
113113
+ "ps://www.googleapis.com/auth/compute,htt"

‎proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/MetricsProto.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,9 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
164164
+ "ricsV1Beta3\022\351\001\n\rGetJobMetrics\022-.google.d"
165165
+ "ataflow.v1beta3.GetJobMetricsRequest\032#.g"
166166
+ "oogle.dataflow.v1beta3.JobMetrics\"\203\001\202\323\344\223"
167-
+ "\002}\0221/v1b3/projects/{project_id}/jobs/{jo"
168-
+ "b_id}/metricsZH\022F/v1b3/projects/{project"
169-
+ "_id}/locations/{location}/jobs/{job_id}/"
167+
+ "\002}\022F/v1b3/projects/{project_id}/location"
168+
+ "s/{location}/jobs/{job_id}/metricsZ3\0221/v"
169+
+ "1b3/projects/{project_id}/jobs/{job_id}/"
170170
+ "metrics\022\327\001\n\026GetJobExecutionDetails\0226.goo"
171171
+ "gle.dataflow.v1beta3.GetJobExecutionDeta"
172172
+ "ilsRequest\032,.google.dataflow.v1beta3.Job"

‎proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/SnapshotsProto.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -94,24 +94,24 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
9494
+ "DY\020\003\022\n\n\006FAILED\020\004\022\013\n\007DELETED\020\0052\357\007\n\020Snapsh"
9595
+ "otsV1Beta3\022\350\001\n\013GetSnapshot\022+.google.data"
9696
+ "flow.v1beta3.GetSnapshotRequest\032!.google"
97-
+ ".dataflow.v1beta3.Snapshot\"\210\001\202\323\344\223\002\201\001\0223/v"
98-
+ "1b3/projects/{project_id}/snapshots/{sna"
99-
+ "pshot_id}ZJ\022H/v1b3/projects/{project_id}"
100-
+ "/locations/{location}/snapshots/{snapsho"
97+
+ ".dataflow.v1beta3.Snapshot\"\210\001\202\323\344\223\002\201\001\022H/v"
98+
+ "1b3/projects/{project_id}/locations/{loc"
99+
+ "ation}/snapshots/{snapshot_id}Z5\0223/v1b3/"
100+
+ "projects/{project_id}/snapshots/{snapsho"
101101
+ "t_id}\022\354\001\n\016DeleteSnapshot\022..google.datafl"
102102
+ "ow.v1beta3.DeleteSnapshotRequest\032/.googl"
103103
+ "e.dataflow.v1beta3.DeleteSnapshotRespons"
104-
+ "e\"y\202\323\344\223\002s*%/v1b3/projects/{project_id}/s"
105-
+ "napshotsZJ*H/v1b3/projects/{project_id}/"
106-
+ "locations/{location}/snapshots/{snapshot"
107-
+ "_id}\022\251\002\n\rListSnapshots\022-.google.dataflow"
104+
+ "e\"y\202\323\344\223\002s*H/v1b3/projects/{project_id}/l"
105+
+ "ocations/{location}/snapshots/{snapshot_"
106+
+ "id}Z\'*%/v1b3/projects/{project_id}/snaps"
107+
+ "hots\022\251\002\n\rListSnapshots\022-.google.dataflow"
108108
+ ".v1beta3.ListSnapshotsRequest\032..google.d"
109109
+ "ataflow.v1beta3.ListSnapshotsResponse\"\270\001"
110-
+ "\202\323\344\223\002\261\001\022%/v1b3/projects/{project_id}/sna"
111-
+ "pshotsZ<\022:/v1b3/projects/{project_id}/lo"
112-
+ "cations/{location}/snapshotsZJ\022H/v1b3/pr"
113-
+ "ojects/{project_id}/locations/{location}"
114-
+ "/jobs/{job_id}/snapshots\032\324\001\312A\027dataflow.g"
110+
+ "\202\323\344\223\002\261\001\022H/v1b3/projects/{project_id}/loc"
111+
+ "ations/{location}/jobs/{job_id}/snapshot"
112+
+ "sZ<\022:/v1b3/projects/{project_id}/locatio"
113+
+ "ns/{location}/snapshotsZ\'\022%/v1b3/project"
114+
+ "s/{project_id}/snapshots\032\324\001\312A\027dataflow.g"
115115
+ "oogleapis.com\322A\266\001https://www.googleapis."
116116
+ "com/auth/cloud-platform,https://www.goog"
117117
+ "leapis.com/auth/compute,https://www.goog"

‎proto-google-cloud-dataflow-v1beta3/src/main/java/com/google/dataflow/v1beta3/TemplatesProto.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -295,22 +295,22 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() {
295295
+ "\020\t2\302\007\n\020TemplatesService\022\337\001\n\025CreateJobFro"
296296
+ "mTemplate\0225.google.dataflow.v1beta3.Crea"
297297
+ "teJobFromTemplateRequest\032\034.google.datafl"
298-
+ "ow.v1beta3.Job\"q\202\323\344\223\002k\"%/v1b3/projects/{"
299-
+ "project_id}/templates:\001*Z?\":/v1b3/projec"
300-
+ "ts/{project_id}/locations/{location}/tem"
298+
+ "ow.v1beta3.Job\"q\202\323\344\223\002k\":/v1b3/projects/{"
299+
+ "project_id}/locations/{location}/templat"
300+
+ "es:\001*Z*\"%/v1b3/projects/{project_id}/tem"
301301
+ "plates:\001*\022\224\002\n\016LaunchTemplate\022..google.da"
302302
+ "taflow.v1beta3.LaunchTemplateRequest\032/.g"
303303
+ "oogle.dataflow.v1beta3.LaunchTemplateRes"
304-
+ "ponse\"\240\001\202\323\344\223\002\231\001\",/v1b3/projects/{project"
305-
+ "_id}/templates:launch:\021launch_parameters"
306-
+ "ZV\"A/v1b3/projects/{project_id}/location"
307-
+ "s/{location}/templates:launch:\021launch_pa"
304+
+ "ponse\"\240\001\202\323\344\223\002\231\001\"A/v1b3/projects/{project"
305+
+ "_id}/locations/{location}/templates:laun"
306+
+ "ch:\021launch_parametersZA\",/v1b3/projects/"
307+
+ "{project_id}/templates:launch:\021launch_pa"
308308
+ "rameters\022\335\001\n\013GetTemplate\022+.google.datafl"
309309
+ "ow.v1beta3.GetTemplateRequest\032,.google.d"
310310
+ "ataflow.v1beta3.GetTemplateResponse\"s\202\323\344"
311-
+ "\223\002m\022)/v1b3/projects/{project_id}/templat"
312-
+ "es:getZ@\022>/v1b3/projects/{project_id}/lo"
313-
+ "cations/{location}/templates:get\032\324\001\312A\027da"
311+
+ "\223\002m\022>/v1b3/projects/{project_id}/locatio"
312+
+ "ns/{location}/templates:getZ+\022)/v1b3/pro"
313+
+ "jects/{project_id}/templates:get\032\324\001\312A\027da"
314314
+ "taflow.googleapis.com\322A\266\001https://www.goo"
315315
+ "gleapis.com/auth/cloud-platform,https://"
316316
+ "www.googleapis.com/auth/compute,https://"

‎proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/jobs.proto‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ service JobsV1Beta3 {
5151
// in `us-central1`.
5252
rpc CreateJob(CreateJobRequest) returns (Job) {
5353
option (google.api.http) = {
54-
post: "/v1b3/projects/{project_id}/jobs"
54+
post: "/v1b3/projects/{project_id}/locations/{location}/jobs"
5555
body: "job"
5656
additional_bindings {
57-
post: "/v1b3/projects/{project_id}/locations/{location}/jobs"
57+
post: "/v1b3/projects/{project_id}/jobs"
5858
body: "job"
5959
}
6060
};
@@ -69,9 +69,9 @@ service JobsV1Beta3 {
6969
// jobs that are running in `us-central1`.
7070
rpc GetJob(GetJobRequest) returns (Job) {
7171
option (google.api.http) = {
72-
get: "/v1b3/projects/{project_id}/jobs/{job_id}"
72+
get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}"
7373
additional_bindings {
74-
get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}"
74+
get: "/v1b3/projects/{project_id}/jobs/{job_id}"
7575
}
7676
};
7777
}
@@ -85,10 +85,10 @@ service JobsV1Beta3 {
8585
// of jobs that are running in `us-central1`.
8686
rpc UpdateJob(UpdateJobRequest) returns (Job) {
8787
option (google.api.http) = {
88-
put: "/v1b3/projects/{project_id}/jobs/{job_id}"
88+
put: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}"
8989
body: "job"
9090
additional_bindings {
91-
put: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}"
91+
put: "/v1b3/projects/{project_id}/jobs/{job_id}"
9292
body: "job"
9393
}
9494
};
@@ -104,9 +104,9 @@ service JobsV1Beta3 {
104104
// jobs that are running in `us-central1`.
105105
rpc ListJobs(ListJobsRequest) returns (ListJobsResponse) {
106106
option (google.api.http) = {
107-
get: "/v1b3/projects/{project_id}/jobs"
107+
get: "/v1b3/projects/{project_id}/locations/{location}/jobs"
108108
additional_bindings {
109-
get: "/v1b3/projects/{project_id}/locations/{location}/jobs"
109+
get: "/v1b3/projects/{project_id}/jobs"
110110
}
111111
};
112112
}
@@ -125,18 +125,17 @@ service JobsV1Beta3 {
125125
// Snapshot the state of a streaming job.
126126
rpc SnapshotJob(SnapshotJobRequest) returns (Snapshot) {
127127
option (google.api.http) = {
128-
post: "/v1b3/projects/{project_id}/jobs/{job_id}:snapshot"
128+
post: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}:snapshot"
129129
body: "*"
130130
additional_bindings {
131-
post: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}:snapshot"
131+
post: "/v1b3/projects/{project_id}/jobs/{job_id}:snapshot"
132132
body: "*"
133133
}
134134
};
135135
}
136136
}
137137

138138
// Defines a job to be run by the Cloud Dataflow service.
139-
// nextID: 26
140139
message Job {
141140
// The unique ID of this job.
142141
//

‎proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/messages.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ service MessagesV1Beta3 {
4848
// the status of jobs that are running in `us-central1`.
4949
rpc ListJobMessages(ListJobMessagesRequest) returns (ListJobMessagesResponse) {
5050
option (google.api.http) = {
51-
get: "/v1b3/projects/{project_id}/jobs/{job_id}/messages"
51+
get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/messages"
5252
additional_bindings {
53-
get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/messages"
53+
get: "/v1b3/projects/{project_id}/jobs/{job_id}/messages"
5454
}
5555
};
5656
}

‎proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/metrics.proto‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ service MetricsV1Beta3 {
4848
// status of jobs that are running in `us-central1`.
4949
rpc GetJobMetrics(GetJobMetricsRequest) returns (JobMetrics) {
5050
option (google.api.http) = {
51-
get: "/v1b3/projects/{project_id}/jobs/{job_id}/metrics"
51+
get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/metrics"
5252
additional_bindings {
53-
get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/metrics"
53+
get: "/v1b3/projects/{project_id}/jobs/{job_id}/metrics"
5454
}
5555
};
5656
}

‎proto-google-cloud-dataflow-v1beta3/src/main/proto/google/dataflow/v1beta3/snapshots.proto‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,32 @@ service SnapshotsV1Beta3 {
4141
// Gets information about a snapshot.
4242
rpc GetSnapshot(GetSnapshotRequest) returns (Snapshot) {
4343
option (google.api.http) = {
44-
get: "/v1b3/projects/{project_id}/snapshots/{snapshot_id}"
44+
get: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}"
4545
additional_bindings {
46-
get: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}"
46+
get: "/v1b3/projects/{project_id}/snapshots/{snapshot_id}"
4747
}
4848
};
4949
}
5050

5151
// Deletes a snapshot.
5252
rpc DeleteSnapshot(DeleteSnapshotRequest) returns (DeleteSnapshotResponse) {
5353
option (google.api.http) = {
54-
delete: "/v1b3/projects/{project_id}/snapshots"
54+
delete: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}"
5555
additional_bindings {
56-
delete: "/v1b3/projects/{project_id}/locations/{location}/snapshots/{snapshot_id}"
56+
delete: "/v1b3/projects/{project_id}/snapshots"
5757
}
5858
};
5959
}
6060

6161
// Lists snapshots.
6262
rpc ListSnapshots(ListSnapshotsRequest) returns (ListSnapshotsResponse) {
6363
option (google.api.http) = {
64-
get: "/v1b3/projects/{project_id}/snapshots"
64+
get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/snapshots"
6565
additional_bindings {
6666
get: "/v1b3/projects/{project_id}/locations/{location}/snapshots"
6767
}
6868
additional_bindings {
69-
get: "/v1b3/projects/{project_id}/locations/{location}/jobs/{job_id}/snapshots"
69+
get: "/v1b3/projects/{project_id}/snapshots"
7070
}
7171
};
7272
}

0 commit comments

Comments
 (0)