Skip to content

Commit 5221891

Browse files
chore: merge main into generate-libraries-main
2 parents 297faaf + fa0f6a0 commit 5221891

38 files changed

Lines changed: 1468 additions & 456 deletions

.github/workflows/unmanaged_dependency_check.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.1
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.50.2
2121
with:
2222
bom-path: google-cloud-storage-bom/pom.xml

google-cloud-storage-bom/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>sdk-platform-java-config</artifactId>
27-
<version>3.50.1</version>
27+
<version>3.50.2</version>
2828
<relativePath/>
2929
</parent>
3030

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,10 @@
139139
<to>* validate(*)</to>
140140
</difference>
141141

142+
<difference>
143+
<differenceType>7013</differenceType>
144+
<className>com/google/cloud/storage/BucketInfo$Builder</className>
145+
<method>com.google.cloud.storage.BucketInfo$Builder setIpFilter(com.google.cloud.storage.BucketInfo$IpFilter)</method>
146+
</difference>
147+
142148
</differences>

google-cloud-storage/src/main/java/com/google/cloud/storage/Bucket.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,12 @@ public Builder setHierarchicalNamespace(HierarchicalNamespace hierarchicalNamesp
759759
return this;
760760
}
761761

762+
@Override
763+
public Builder setIpFilter(IpFilter ipFilter) {
764+
infoBuilder.setIpFilter(ipFilter);
765+
return this;
766+
}
767+
762768
@Override
763769
public Bucket build() {
764770
return new Bucket(storage, infoBuilder);
@@ -943,6 +949,12 @@ Builder clearCustomPlacementConfig() {
943949
infoBuilder.clearCustomPlacementConfig();
944950
return this;
945951
}
952+
953+
@Override
954+
Builder clearIpFilter() {
955+
infoBuilder.clearIpFilter();
956+
return this;
957+
}
946958
}
947959

948960
Bucket(Storage storage, BucketInfo.BuilderImpl infoBuilder) {

0 commit comments

Comments
 (0)