Skip to content

Commit 043f7c2

Browse files
committed
feat: update storage bucket IP filter samples to preserve existing metadata and optimize list retrieval
1 parent b145c73 commit 043f7c2

3 files changed

Lines changed: 24 additions & 28 deletions

File tree

storage/deleteBucketIpFilterRules.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ function main(bucketName = 'my-bucket') {
4444
const updatedIpFilter = {
4545
...metadata.ipFilter,
4646
publicNetworkSource: {
47+
...metadata.ipFilter.publicNetworkSource,
4748
allowedIpCidrRanges: updatedIpRanges,
4849
},
4950
};

storage/enableBucketIpFilter.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ function main(bucketName = 'my-bucket', filterMode = 'Enabled') {
4848

4949
const updatedIpFilter = {
5050
...existingIpFilter,
51+
mode: filterMode,
5152
publicNetworkSource: {
53+
...existingIpFilter.publicNetworkSource,
5254
allowedIpCidrRanges: updatedIpRanges,
5355
},
5456
};

storage/listBucketIpFilters.js

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,29 @@ function main(projectId = 'my-project-id') {
3232
const [buckets] = await storage.getBuckets();
3333

3434
for (const bucket of buckets) {
35-
if (bucket.metadata.ipFilter) {
36-
try {
37-
const [metadata] = await storage.bucket(bucket.name).getMetadata();
38-
const ipFilter = metadata.ipFilter;
39-
console.log(`${bucket.name}: IP Filter Mode - ${ipFilter.mode}`);
35+
const ipFilter = bucket.metadata?.ipFilter;
36+
if (ipFilter) {
37+
console.log(`${bucket.name}: IP Filter Mode - ${ipFilter.mode}`);
4038

41-
const publicNetworkSource = ipFilter.publicNetworkSource;
42-
if (publicNetworkSource && publicNetworkSource.allowedIpCidrRanges) {
43-
console.log(' Public Network Allowed IP Ranges:');
44-
publicNetworkSource.allowedIpCidrRanges.forEach(range => {
45-
console.log(` - ${range}`);
46-
});
47-
}
39+
const publicNetworkSource = ipFilter.publicNetworkSource;
40+
if (publicNetworkSource && publicNetworkSource.allowedIpCidrRanges) {
41+
console.log(' Public Network Allowed IP Ranges:');
42+
publicNetworkSource.allowedIpCidrRanges.forEach(range => {
43+
console.log(` - ${range}`);
44+
});
45+
}
4846

49-
const vpcNetworkSources = ipFilter.vpcNetworkSources;
50-
if (vpcNetworkSources && vpcNetworkSources.length > 0) {
51-
console.log(' VPC Network Sources:');
52-
vpcNetworkSources.forEach(source => {
53-
console.log(` - Network: ${source.network}`);
54-
if (source.allowedIpCidrRanges) {
55-
source.allowedIpCidrRanges.forEach(range => {
56-
console.log(` - ${range}`);
57-
});
58-
}
59-
});
60-
}
61-
} catch (err) {
62-
console.log(
63-
`${bucket.name}: Error fetching IP filter - ${err.message}`
64-
);
47+
const vpcNetworkSources = ipFilter.vpcNetworkSources;
48+
if (vpcNetworkSources && vpcNetworkSources.length > 0) {
49+
console.log(' VPC Network Sources:');
50+
vpcNetworkSources.forEach(source => {
51+
console.log(` - Network: ${source.network}`);
52+
if (source.allowedIpCidrRanges) {
53+
source.allowedIpCidrRanges.forEach(range => {
54+
console.log(` - ${range}`);
55+
});
56+
}
57+
});
6558
}
6659
}
6760
}

0 commit comments

Comments
 (0)