Skip to content

Commit f6aa72f

Browse files
committed
Merge branch 'fix/CG-1008' into 'main'
CG-1008: fix(storageBucket): add labels on raw output Closes CG-1008 See merge request auto-cloud/cloudgraph/provider/cloudgraph-provider-gcp!53
2 parents 4ba3e4e + d0d8eb8 commit f6aa72f

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/services/storageBucket/data.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ export interface RawGcpStorageBucket {
2222
iam: any
2323
pollIntervalMs?: number
2424
userProject?: string
25+
labels?: {
26+
[key: string]: string
27+
}
2528
}
2629

2730
export const listStorageBucketsData = async (
@@ -43,6 +46,7 @@ export const listStorageBucketsData = async (
4346
id: bucket.name,
4447
...bucket,
4548
projectId,
49+
labels: bucket?.metadata?.labels,
4650
region: regions.includes(location) ? location : GLOBAL_REGION,
4751
})
4852
}

src/services/storageBucket/format.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ export default ({
1616
name,
1717
pollIntervalMs,
1818
userProject,
19+
labels,
1920
} = service
2021

2122
return {
@@ -33,10 +34,10 @@ export default ({
3334
defaultEventBasedHold: metadata.defaultEventBasedHold,
3435
timeCreated: metadata.timeCreated,
3536
updated: metadata.updated,
36-
labels: Object.keys(metadata.labels || {}).map(key => ({
37+
labels: Object.keys(labels || {}).map(key => ({
3738
id: cuid(),
3839
key,
39-
value: metadata.labels[key],
40+
value: labels[key],
4041
})),
4142
iamConfiguration: metadata.iamConfiguration,
4243
locationType: metadata.locationType,

0 commit comments

Comments
 (0)