Skip to content

Commit af47cbc

Browse files
feat: [run] Adding support for encryption_key_revocation_action and encryption_key_shutdown_duration for RevisionTemplate and ExecutionTemplate (#9013)
- [ ] Regenerate this pull request now. docs: Documentation improvements, including clarification that v1 labels/annotations are rejected in v2 API PiperOrigin-RevId: 503293343 Source-Link: https://togithub.com/googleapis/googleapis/commit/e3d3d63275d13364cc986e100faff16b2cf510f5 Source-Link: https://togithub.com/googleapis/googleapis-gen/commit/f401f99dd0e2bfe7fbe6b190d3381ba648f21227 Copy-Tag: eyJwIjoiamF2YS1ydW4vLk93bEJvdC55YW1sIiwiaCI6ImY0MDFmOTlkZDBlMmJmZTdmYmU2YjE5MGQzMzgxYmE2NDhmMjEyMjcifQ==
1 parent 265cc10 commit af47cbc

File tree

97 files changed

+8259
-5136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+8259
-5136
lines changed

java-run/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ If you are using Maven, add this to your pom.xml file:
2222
<dependency>
2323
<groupId>com.google.cloud</groupId>
2424
<artifactId>google-cloud-run</artifactId>
25-
<version>0.7.0</version>
25+
<version>0.8.0</version>
2626
</dependency>
2727
```
2828

2929
If you are using Gradle without BOM, add this to your dependencies:
3030

3131
```Groovy
32-
implementation 'com.google.cloud:google-cloud-run:0.7.0'
32+
implementation 'com.google.cloud:google-cloud-run:0.8.0'
3333
```
3434

3535
If you are using SBT, add this to your dependencies:
3636

3737
```Scala
38-
libraryDependencies += "com.google.cloud" % "google-cloud-run" % "0.7.0"
38+
libraryDependencies += "com.google.cloud" % "google-cloud-run" % "0.8.0"
3939
```
4040

4141
## Authentication

java-run/google-cloud-run/src/main/java/com/google/cloud/run/v2/ServicesClient.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ public final UnaryCallable<GetServiceRequest, Service> getServiceCallable() {
509509
* }</pre>
510510
*
511511
* @param parent Required. The location and project to list resources on. Location must be a valid
512-
* GCP region, and cannot be the "-" wildcard. Format:
512+
* Google Cloud region, and cannot be the "-" wildcard. Format:
513513
* projects/{project}/locations/{location}, where {project} can be project id or number.
514514
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
515515
*/
@@ -542,7 +542,7 @@ public final ListServicesPagedResponse listServices(LocationName parent) {
542542
* }</pre>
543543
*
544544
* @param parent Required. The location and project to list resources on. Location must be a valid
545-
* GCP region, and cannot be the "-" wildcard. Format:
545+
* Google Cloud region, and cannot be the "-" wildcard. Format:
546546
* projects/{project}/locations/{location}, where {project} can be project id or number.
547547
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
548548
*/

java-run/google-cloud-run/src/test/java/com/google/cloud/run/v2/ExecutionsClientHttpJsonTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ public void getExecutionTest() throws Exception {
107107
.setRunningCount(261439119)
108108
.setSucceededCount(633694641)
109109
.setFailedCount(-2013829491)
110+
.setCancelledCount(1921113249)
111+
.setRetriedCount(-1654679545)
112+
.setLogUri("logUri-1097354360")
110113
.setEtag("etag3123477")
111114
.build();
112115
mockService.addResponse(expectedResponse);
@@ -173,6 +176,9 @@ public void getExecutionTest2() throws Exception {
173176
.setRunningCount(261439119)
174177
.setSucceededCount(633694641)
175178
.setFailedCount(-2013829491)
179+
.setCancelledCount(1921113249)
180+
.setRetriedCount(-1654679545)
181+
.setLogUri("logUri-1097354360")
176182
.setEtag("etag3123477")
177183
.build();
178184
mockService.addResponse(expectedResponse);
@@ -341,6 +347,9 @@ public void deleteExecutionTest() throws Exception {
341347
.setRunningCount(261439119)
342348
.setSucceededCount(633694641)
343349
.setFailedCount(-2013829491)
350+
.setCancelledCount(1921113249)
351+
.setRetriedCount(-1654679545)
352+
.setLogUri("logUri-1097354360")
344353
.setEtag("etag3123477")
345354
.build();
346355
Operation resultOperation =
@@ -412,6 +421,9 @@ public void deleteExecutionTest2() throws Exception {
412421
.setRunningCount(261439119)
413422
.setSucceededCount(633694641)
414423
.setFailedCount(-2013829491)
424+
.setCancelledCount(1921113249)
425+
.setRetriedCount(-1654679545)
426+
.setLogUri("logUri-1097354360")
415427
.setEtag("etag3123477")
416428
.build();
417429
Operation resultOperation =

java-run/google-cloud-run/src/test/java/com/google/cloud/run/v2/ExecutionsClientTest.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ public void getExecutionTest() throws Exception {
115115
.setRunningCount(261439119)
116116
.setSucceededCount(633694641)
117117
.setFailedCount(-2013829491)
118+
.setCancelledCount(1921113249)
119+
.setRetriedCount(-1654679545)
120+
.setLogUri("logUri-1097354360")
118121
.setEtag("etag3123477")
119122
.build();
120123
mockExecutions.addResponse(expectedResponse);
@@ -175,6 +178,9 @@ public void getExecutionTest2() throws Exception {
175178
.setRunningCount(261439119)
176179
.setSucceededCount(633694641)
177180
.setFailedCount(-2013829491)
181+
.setCancelledCount(1921113249)
182+
.setRetriedCount(-1654679545)
183+
.setLogUri("logUri-1097354360")
178184
.setEtag("etag3123477")
179185
.build();
180186
mockExecutions.addResponse(expectedResponse);
@@ -323,6 +329,9 @@ public void deleteExecutionTest() throws Exception {
323329
.setRunningCount(261439119)
324330
.setSucceededCount(633694641)
325331
.setFailedCount(-2013829491)
332+
.setCancelledCount(1921113249)
333+
.setRetriedCount(-1654679545)
334+
.setLogUri("logUri-1097354360")
326335
.setEtag("etag3123477")
327336
.build();
328337
Operation resultOperation =
@@ -391,6 +400,9 @@ public void deleteExecutionTest2() throws Exception {
391400
.setRunningCount(261439119)
392401
.setSucceededCount(633694641)
393402
.setFailedCount(-2013829491)
403+
.setCancelledCount(1921113249)
404+
.setRetriedCount(-1654679545)
405+
.setLogUri("logUri-1097354360")
394406
.setEtag("etag3123477")
395407
.build();
396408
Operation resultOperation =

java-run/google-cloud-run/src/test/java/com/google/cloud/run/v2/JobsClientHttpJsonTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,9 @@ public void runJobTest() throws Exception {
762762
.setRunningCount(261439119)
763763
.setSucceededCount(633694641)
764764
.setFailedCount(-2013829491)
765+
.setCancelledCount(1921113249)
766+
.setRetriedCount(-1654679545)
767+
.setLogUri("logUri-1097354360")
765768
.setEtag("etag3123477")
766769
.build();
767770
Operation resultOperation =
@@ -833,6 +836,9 @@ public void runJobTest2() throws Exception {
833836
.setRunningCount(261439119)
834837
.setSucceededCount(633694641)
835838
.setFailedCount(-2013829491)
839+
.setCancelledCount(1921113249)
840+
.setRetriedCount(-1654679545)
841+
.setLogUri("logUri-1097354360")
836842
.setEtag("etag3123477")
837843
.build();
838844
Operation resultOperation =

java-run/google-cloud-run/src/test/java/com/google/cloud/run/v2/JobsClientTest.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,9 @@ public void runJobTest() throws Exception {
684684
.setRunningCount(261439119)
685685
.setSucceededCount(633694641)
686686
.setFailedCount(-2013829491)
687+
.setCancelledCount(1921113249)
688+
.setRetriedCount(-1654679545)
689+
.setLogUri("logUri-1097354360")
687690
.setEtag("etag3123477")
688691
.build();
689692
Operation resultOperation =
@@ -752,6 +755,9 @@ public void runJobTest2() throws Exception {
752755
.setRunningCount(261439119)
753756
.setSucceededCount(633694641)
754757
.setFailedCount(-2013829491)
758+
.setCancelledCount(1921113249)
759+
.setRetriedCount(-1654679545)
760+
.setLogUri("logUri-1097354360")
755761
.setEtag("etag3123477")
756762
.build();
757763
Operation resultOperation =

java-run/google-cloud-run/src/test/java/com/google/cloud/run/v2/RevisionsClientHttpJsonTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ public void getRevisionTest() throws Exception {
107107
.addAllVolumes(new ArrayList<Volume>())
108108
.setExecutionEnvironment(ExecutionEnvironment.forNumber(0))
109109
.setEncryptionKey("encryptionKey-36224036")
110+
.setEncryptionKeyRevocationAction(EncryptionKeyRevocationAction.forNumber(0))
111+
.setEncryptionKeyShutdownDuration(Duration.newBuilder().build())
110112
.setReconciling(true)
111113
.addAllConditions(new ArrayList<Condition>())
112114
.setObservedGeneration(900833007)
@@ -176,6 +178,8 @@ public void getRevisionTest2() throws Exception {
176178
.addAllVolumes(new ArrayList<Volume>())
177179
.setExecutionEnvironment(ExecutionEnvironment.forNumber(0))
178180
.setEncryptionKey("encryptionKey-36224036")
181+
.setEncryptionKeyRevocationAction(EncryptionKeyRevocationAction.forNumber(0))
182+
.setEncryptionKeyShutdownDuration(Duration.newBuilder().build())
179183
.setReconciling(true)
180184
.addAllConditions(new ArrayList<Condition>())
181185
.setObservedGeneration(900833007)
@@ -347,6 +351,8 @@ public void deleteRevisionTest() throws Exception {
347351
.addAllVolumes(new ArrayList<Volume>())
348352
.setExecutionEnvironment(ExecutionEnvironment.forNumber(0))
349353
.setEncryptionKey("encryptionKey-36224036")
354+
.setEncryptionKeyRevocationAction(EncryptionKeyRevocationAction.forNumber(0))
355+
.setEncryptionKeyShutdownDuration(Duration.newBuilder().build())
350356
.setReconciling(true)
351357
.addAllConditions(new ArrayList<Condition>())
352358
.setObservedGeneration(900833007)
@@ -421,6 +427,8 @@ public void deleteRevisionTest2() throws Exception {
421427
.addAllVolumes(new ArrayList<Volume>())
422428
.setExecutionEnvironment(ExecutionEnvironment.forNumber(0))
423429
.setEncryptionKey("encryptionKey-36224036")
430+
.setEncryptionKeyRevocationAction(EncryptionKeyRevocationAction.forNumber(0))
431+
.setEncryptionKeyShutdownDuration(Duration.newBuilder().build())
424432
.setReconciling(true)
425433
.addAllConditions(new ArrayList<Condition>())
426434
.setObservedGeneration(900833007)

java-run/google-cloud-run/src/test/java/com/google/cloud/run/v2/RevisionsClientTest.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ public void getRevisionTest() throws Exception {
115115
.addAllVolumes(new ArrayList<Volume>())
116116
.setExecutionEnvironment(ExecutionEnvironment.forNumber(0))
117117
.setEncryptionKey("encryptionKey-36224036")
118+
.setEncryptionKeyRevocationAction(EncryptionKeyRevocationAction.forNumber(0))
119+
.setEncryptionKeyShutdownDuration(Duration.newBuilder().build())
118120
.setReconciling(true)
119121
.addAllConditions(new ArrayList<Condition>())
120122
.setObservedGeneration(900833007)
@@ -178,6 +180,8 @@ public void getRevisionTest2() throws Exception {
178180
.addAllVolumes(new ArrayList<Volume>())
179181
.setExecutionEnvironment(ExecutionEnvironment.forNumber(0))
180182
.setEncryptionKey("encryptionKey-36224036")
183+
.setEncryptionKeyRevocationAction(EncryptionKeyRevocationAction.forNumber(0))
184+
.setEncryptionKeyShutdownDuration(Duration.newBuilder().build())
181185
.setReconciling(true)
182186
.addAllConditions(new ArrayList<Condition>())
183187
.setObservedGeneration(900833007)
@@ -329,6 +333,8 @@ public void deleteRevisionTest() throws Exception {
329333
.addAllVolumes(new ArrayList<Volume>())
330334
.setExecutionEnvironment(ExecutionEnvironment.forNumber(0))
331335
.setEncryptionKey("encryptionKey-36224036")
336+
.setEncryptionKeyRevocationAction(EncryptionKeyRevocationAction.forNumber(0))
337+
.setEncryptionKeyShutdownDuration(Duration.newBuilder().build())
332338
.setReconciling(true)
333339
.addAllConditions(new ArrayList<Condition>())
334340
.setObservedGeneration(900833007)
@@ -400,6 +406,8 @@ public void deleteRevisionTest2() throws Exception {
400406
.addAllVolumes(new ArrayList<Volume>())
401407
.setExecutionEnvironment(ExecutionEnvironment.forNumber(0))
402408
.setEncryptionKey("encryptionKey-36224036")
409+
.setEncryptionKeyRevocationAction(EncryptionKeyRevocationAction.forNumber(0))
410+
.setEncryptionKeyShutdownDuration(Duration.newBuilder().build())
403411
.setReconciling(true)
404412
.addAllConditions(new ArrayList<Condition>())
405413
.setObservedGeneration(900833007)

java-run/google-cloud-run/src/test/java/com/google/cloud/run/v2/TasksClientHttpJsonTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ public void getTaskTest() throws Exception {
111111
.setLastAttemptResult(TaskAttemptResult.newBuilder().build())
112112
.setEncryptionKey("encryptionKey-36224036")
113113
.setVpcAccess(VpcAccess.newBuilder().build())
114+
.setLogUri("logUri-1097354360")
114115
.setEtag("etag3123477")
115116
.build();
116117
mockService.addResponse(expectedResponse);
@@ -184,6 +185,7 @@ public void getTaskTest2() throws Exception {
184185
.setLastAttemptResult(TaskAttemptResult.newBuilder().build())
185186
.setEncryptionKey("encryptionKey-36224036")
186187
.setVpcAccess(VpcAccess.newBuilder().build())
188+
.setLogUri("logUri-1097354360")
187189
.setEtag("etag3123477")
188190
.build();
189191
mockService.addResponse(expectedResponse);

java-run/google-cloud-run/src/test/java/com/google/cloud/run/v2/TasksClientTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public void getTaskTest() throws Exception {
117117
.setLastAttemptResult(TaskAttemptResult.newBuilder().build())
118118
.setEncryptionKey("encryptionKey-36224036")
119119
.setVpcAccess(VpcAccess.newBuilder().build())
120+
.setLogUri("logUri-1097354360")
120121
.setEtag("etag3123477")
121122
.build();
122123
mockTasks.addResponse(expectedResponse);
@@ -184,6 +185,7 @@ public void getTaskTest2() throws Exception {
184185
.setLastAttemptResult(TaskAttemptResult.newBuilder().build())
185186
.setEncryptionKey("encryptionKey-36224036")
186187
.setVpcAccess(VpcAccess.newBuilder().build())
188+
.setLogUri("logUri-1097354360")
187189
.setEtag("etag3123477")
188190
.build();
189191
mockTasks.addResponse(expectedResponse);

0 commit comments

Comments
 (0)