Skip to content

Commit 105be42

Browse files
authored
fix: switch svpc access to explicit dep on service enablement (#934)
1 parent 1f1fbc3 commit 105be42

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

main.tf

+4-1
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,15 @@ module "shared_vpc_access" {
8181
enable_shared_vpc_service_project = var.svpc_host_project_id != "" ? true : false
8282
host_project_id = var.svpc_host_project_id
8383
service_project_id = module.project-factory.project_id
84-
active_apis = module.project-factory.enabled_apis
84+
active_apis = var.activate_apis
8585
shared_vpc_subnets = var.shared_vpc_subnets
8686
service_project_number = module.project-factory.project_number
8787
lookup_project_numbers = false
8888
grant_services_security_admin_role = var.grant_services_security_admin_role
8989
grant_network_role = var.grant_network_role
90+
# Workaround for import complaining about count cannot determine resource instances
91+
# until apply. https://github.com/hashicorp/terraform/issues/24690
92+
depends_on = [module.project-factory.enabled_apis]
9093
}
9194

9295
/******************************************

modules/svpc_service_project/main.tf

+4-1
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,15 @@ module "shared_vpc_access" {
6969
host_project_id = var.shared_vpc
7070
enable_shared_vpc_service_project = true
7171
service_project_id = module.project-factory.project_id
72-
active_apis = module.project-factory.enabled_apis
72+
active_apis = var.activate_apis
7373
shared_vpc_subnets = var.shared_vpc_subnets
7474
service_project_number = module.project-factory.project_number
7575
lookup_project_numbers = false
7676
grant_services_security_admin_role = var.grant_services_security_admin_role
7777
grant_network_role = var.grant_network_role
78+
# Workaround for import complaining about count cannot determine resource instances
79+
# until apply. https://github.com/hashicorp/terraform/issues/24690
80+
depends_on = [module.project-factory.enabled_apis]
7881
}
7982

8083
/******************************************

0 commit comments

Comments
 (0)