Skip to content

Commit 0b67e2d

Browse files
feat: add soft_delete_time and hard_delete_time object metadata fields (#2415)
* feat: Add an API method for reordering firewall policies PiperOrigin-RevId: 607015517 Source-Link: googleapis/googleapis@c43e216 Source-Link: https://github.com/googleapis/googleapis-gen/commit/71c27adc96b0c80093b4a413815bd93943196bb2 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNzFjMjdhZGM5NmIwYzgwMDkzYjRhNDEzODE1YmQ5Mzk0MzE5NmJiMiJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * feat: add soft_delete_time and hard_delete_time object metadata fields PiperOrigin-RevId: 609782289 Source-Link: googleapis/googleapis@a8bcfb6 Source-Link: https://github.com/googleapis/googleapis-gen/commit/6827329c2a5bd683050571a4d71bb84dcef391d9 Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiNjgyNzMyOWMyYTViZDY4MzA1MDU3MWE0ZDcxYmI4NGRjZWYzOTFkOSJ9 * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * add clirr ignore --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Jesse Lovelace <[email protected]>
1 parent 45837d3 commit 0b67e2d

File tree

32 files changed

+981
-183
lines changed

32 files changed

+981
-183
lines changed

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/StorageSettings.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@
2222
import static com.google.storage.v2.StorageClient.ListObjectsPagedResponse;
2323

2424
import com.google.api.core.ApiFunction;
25-
import com.google.api.core.BetaApi;
2625
import com.google.api.gax.core.GoogleCredentialsProvider;
2726
import com.google.api.gax.core.InstantiatingExecutorProvider;
2827
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
@@ -293,7 +292,6 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
293292
return StorageStubSettings.defaultTransportChannelProvider();
294293
}
295294

296-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
297295
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
298296
return StorageStubSettings.defaultApiClientHeaderProviderBuilder();
299297
}

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/GrpcStorageCallableFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/GrpcStorageStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

gapic-google-cloud-storage-v2/src/main/java/com/google/storage/v2/stub/StorageStubSettings.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,7 +23,6 @@
2323

2424
import com.google.api.core.ApiFunction;
2525
import com.google.api.core.ApiFuture;
26-
import com.google.api.core.BetaApi;
2726
import com.google.api.gax.core.GaxProperties;
2827
import com.google.api.gax.core.GoogleCredentialsProvider;
2928
import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -678,7 +677,6 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
678677
return defaultGrpcTransportProviderBuilder().build();
679678
}
680679

681-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
682680
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
683681
return ApiClientHeaderProvider.newBuilder()
684682
.setGeneratedLibToken("gapic", GaxProperties.getLibraryVersion(StorageStubSettings.class))

gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/MockStorage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/MockStorageImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

gapic-google-cloud-storage-v2/src/test/java/com/google/storage/v2/StorageClientTest.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -1382,6 +1382,8 @@ public void composeObjectTest() throws Exception {
13821382
.setOwner(Owner.newBuilder().build())
13831383
.setCustomerEncryption(CustomerEncryption.newBuilder().build())
13841384
.setCustomTime(Timestamp.newBuilder().build())
1385+
.setSoftDeleteTime(Timestamp.newBuilder().build())
1386+
.setHardDeleteTime(Timestamp.newBuilder().build())
13851387
.build();
13861388
mockStorage.addResponse(expectedResponse);
13871389

@@ -1636,6 +1638,8 @@ public void restoreObjectTest() throws Exception {
16361638
.setOwner(Owner.newBuilder().build())
16371639
.setCustomerEncryption(CustomerEncryption.newBuilder().build())
16381640
.setCustomTime(Timestamp.newBuilder().build())
1641+
.setSoftDeleteTime(Timestamp.newBuilder().build())
1642+
.setHardDeleteTime(Timestamp.newBuilder().build())
16391643
.build();
16401644
mockStorage.addResponse(expectedResponse);
16411645

@@ -1708,6 +1712,8 @@ public void restoreObjectTest2() throws Exception {
17081712
.setOwner(Owner.newBuilder().build())
17091713
.setCustomerEncryption(CustomerEncryption.newBuilder().build())
17101714
.setCustomTime(Timestamp.newBuilder().build())
1715+
.setSoftDeleteTime(Timestamp.newBuilder().build())
1716+
.setHardDeleteTime(Timestamp.newBuilder().build())
17111717
.build();
17121718
mockStorage.addResponse(expectedResponse);
17131719

@@ -1817,6 +1823,8 @@ public void getObjectTest() throws Exception {
18171823
.setOwner(Owner.newBuilder().build())
18181824
.setCustomerEncryption(CustomerEncryption.newBuilder().build())
18191825
.setCustomTime(Timestamp.newBuilder().build())
1826+
.setSoftDeleteTime(Timestamp.newBuilder().build())
1827+
.setHardDeleteTime(Timestamp.newBuilder().build())
18201828
.build();
18211829
mockStorage.addResponse(expectedResponse);
18221830

@@ -1886,6 +1894,8 @@ public void getObjectTest2() throws Exception {
18861894
.setOwner(Owner.newBuilder().build())
18871895
.setCustomerEncryption(CustomerEncryption.newBuilder().build())
18881896
.setCustomTime(Timestamp.newBuilder().build())
1897+
.setSoftDeleteTime(Timestamp.newBuilder().build())
1898+
.setHardDeleteTime(Timestamp.newBuilder().build())
18891899
.build();
18901900
mockStorage.addResponse(expectedResponse);
18911901

@@ -1955,6 +1965,8 @@ public void getObjectTest3() throws Exception {
19551965
.setOwner(Owner.newBuilder().build())
19561966
.setCustomerEncryption(CustomerEncryption.newBuilder().build())
19571967
.setCustomTime(Timestamp.newBuilder().build())
1968+
.setSoftDeleteTime(Timestamp.newBuilder().build())
1969+
.setHardDeleteTime(Timestamp.newBuilder().build())
19581970
.build();
19591971
mockStorage.addResponse(expectedResponse);
19601972

@@ -2027,6 +2039,8 @@ public void getObjectTest4() throws Exception {
20272039
.setOwner(Owner.newBuilder().build())
20282040
.setCustomerEncryption(CustomerEncryption.newBuilder().build())
20292041
.setCustomTime(Timestamp.newBuilder().build())
2042+
.setSoftDeleteTime(Timestamp.newBuilder().build())
2043+
.setHardDeleteTime(Timestamp.newBuilder().build())
20302044
.build();
20312045
mockStorage.addResponse(expectedResponse);
20322046

@@ -2170,6 +2184,8 @@ public void updateObjectTest() throws Exception {
21702184
.setOwner(Owner.newBuilder().build())
21712185
.setCustomerEncryption(CustomerEncryption.newBuilder().build())
21722186
.setCustomTime(Timestamp.newBuilder().build())
2187+
.setSoftDeleteTime(Timestamp.newBuilder().build())
2188+
.setHardDeleteTime(Timestamp.newBuilder().build())
21732189
.build();
21742190
mockStorage.addResponse(expectedResponse);
21752191

google-cloud-storage-control/src/main/java/com/google/storage/control/v2/StorageControlClient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

google-cloud-storage-control/src/main/java/com/google/storage/control/v2/StorageControlSettings.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@
1919
import static com.google.storage.control.v2.StorageControlClient.ListFoldersPagedResponse;
2020

2121
import com.google.api.core.ApiFunction;
22-
import com.google.api.core.BetaApi;
2322
import com.google.api.gax.core.GoogleCredentialsProvider;
2423
import com.google.api.gax.core.InstantiatingExecutorProvider;
2524
import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider;
@@ -148,7 +147,6 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
148147
return StorageControlStubSettings.defaultTransportChannelProvider();
149148
}
150149

151-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
152150
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
153151
return StorageControlStubSettings.defaultApiClientHeaderProviderBuilder();
154152
}

google-cloud-storage-control/src/main/java/com/google/storage/control/v2/package-info.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlCallableFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/GrpcStorageControlStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/StorageControlStub.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

google-cloud-storage-control/src/main/java/com/google/storage/control/v2/stub/StorageControlStubSettings.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -277,7 +277,6 @@ public static TransportChannelProvider defaultTransportChannelProvider() {
277277
return defaultGrpcTransportProviderBuilder().build();
278278
}
279279

280-
@BetaApi("The surface for customizing headers is not stable yet and may change in the future.")
281280
public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() {
282281
return ApiClientHeaderProvider.newBuilder()
283282
.setGeneratedLibToken(

google-cloud-storage-control/src/test/java/com/google/storage/control/v2/MockStorageControl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

google-cloud-storage-control/src/test/java/com/google/storage/control/v2/MockStorageControlImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

google-cloud-storage-control/src/test/java/com/google/storage/control/v2/StorageControlClientTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

proto-google-cloud-storage-control-v2/src/main/java/com/google/storage/control/v2/BucketName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

proto-google-cloud-storage-control-v2/src/main/java/com/google/storage/control/v2/FolderName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

proto-google-cloud-storage-control-v2/src/main/java/com/google/storage/control/v2/StorageLayoutName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

proto-google-cloud-storage-v2/clirr-ignored-differences.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,4 +55,15 @@
5555
<className>com/google/storage/v2/*</className>
5656
<method>* *SoftDeleted*(*)</method>
5757
</difference>
58+
59+
<difference>
60+
<differenceType>7012</differenceType>
61+
<className>com/google/storage/v2/*</className>
62+
<method>* *SoftDeleteTime*(*)</method>
63+
</difference>
64+
<difference>
65+
<differenceType>7012</differenceType>
66+
<className>com/google/storage/v2/*</className>
67+
<method>* *HardDeleteTime*(*)</method>
68+
</difference>
5869
</differences>

proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/BucketName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/CryptoKeyName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

proto-google-cloud-storage-v2/src/main/java/com/google/storage/v2/NotificationConfigName.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Google LLC
2+
* Copyright 2024 Google LLC
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.

0 commit comments

Comments
 (0)