kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix previous change to vpc sc module (#3629)" (#3630)

Browse Source 
This reverts commit dc35ce15ee.
This commit is contained in:
Ludovico Magnocavallo
2026-01-08 14:28:57 +01:00
committed by GitHub
parent 2fd0ef1416
commit 12d0bbf2fc
2 changed files with 12 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
modules/vpc-sc/perimeters-additive.tf
View File

@@ -17,56 +17,28 @@
# tfdoc:file:description Regular service perimeter resources which ignore resource changes. # tfdoc:file:description Regular service perimeter resources which ignore resource changes.
locals { locals {
_spec_resource_sets = flatten([ perimeters_additive = {
for k, v in local.perimeters : [ for k, v in google_access_context_manager_service_perimeter.additive :
for vv in try(v.spec.resources, []) : [ k => v.id
for vvv in lookup(local.ctx.resource_sets, vv, []) : { }
key = "${k}/${vvv}" spec_additive_resources = flatten([
perimeter = k
resource = vvv
}
] if startswith(vv, "$resource_sets:")
] if v.ignore_resource_changes
])
_spec_resources = flatten([
for k, v in local.perimeters : [ for k, v in local.perimeters : [
for vv in try(v.spec.resources, []) : { for vv in try(v.spec.resources, []) : {
key = "${k}/${vv}" key = "${k}/${vv}"
perimeter = k perimeter = k
resource = vv resource = vv
} if !startswith(vv, "$resource_sets:") }
] if v.ignore_resource_changes ] if v.ignore_resource_changes
]) ])
_status_resource_sets = flatten([ status_additive_resources = flatten([
for k, v in local.perimeters : [
for vv in try(v.status.resources, []) : [
for vvv in lookup(local.ctx.resource_sets, vv, []) : {
key = "${k}/${vvv}"
perimeter = k
resource = vvv
}
] if startswith(vv, "$resource_sets:")
] if v.ignore_resource_changes
])
_status_resources = flatten([
for k, v in local.perimeters : [ for k, v in local.perimeters : [
for vv in try(v.status.resources, []) : { for vv in try(v.status.resources, []) : {
key = "${k}/${vv}" key = "${k}/${vv}"
perimeter = k perimeter = k
resource = vv resource = vv
} if !startswith(vv, "$resource_sets:") }
] if v.ignore_resource_changes ] if v.ignore_resource_changes
]) ])
perimeters_additive = {
for k, v in google_access_context_manager_service_perimeter.additive :
k => v.id
}
spec_additive_resources = concat(
local._spec_resource_sets, local._spec_resources
)
status_additive_resources = concat(
local._status_resource_sets, local._status_resources
)
} }
resource "google_access_context_manager_service_perimeter" "additive" { resource "google_access_context_manager_service_perimeter" "additive" {

11
tests/modules/vpc_sc/context.yaml
View File

@@ -105,16 +105,13 @@ values:
google_access_context_manager_service_perimeter_resource.default["default/$project_numbers:test-1"]: google_access_context_manager_service_perimeter_resource.default["default/$project_numbers:test-1"]:
resource: projects/222222 resource: projects/222222
timeouts: null timeouts: null
google_access_context_manager_service_perimeter_resource.default["default/projects/321"]: google_access_context_manager_service_perimeter_resource.default["default/$resource_sets:test"]:
resource: projects/321 resource: $resource_sets:test
timeouts: null
google_access_context_manager_service_perimeter_resource.default["default/projects/654"]:
resource: projects/654
timeouts: null timeouts: null
counts: counts:
google_access_context_manager_access_level: 1 google_access_context_manager_access_level: 1
google_access_context_manager_service_perimeter: 1 google_access_context_manager_service_perimeter: 1
google_access_context_manager_service_perimeter_resource: 4 google_access_context_manager_service_perimeter_resource: 3
modules: 0 modules: 0
resources: 6 resources: 5