diff --git a/modules/project/README.md b/modules/project/README.md index b30ff2eb..8ce143bb 100644 --- a/modules/project/README.md +++ b/modules/project/README.md @@ -386,7 +386,7 @@ output "compute_robot" { | [policy_list](variables.tf#L168) | Map of list org policies, status is true for allow, false for deny, null for restore. Values can only be used for allow or deny. | map(object({…})) | | {} | | [prefix](variables.tf#L180) | Prefix used to generate project id and name. | string | | null | | [project_create](variables.tf#L186) | Create project. When set to false, uses a data source to reference existing project. | bool | | true | -| [service_config](variables.tf#L192) | Configure service API activation. | object({…}) | | {…} | +| [service_config](variables.tf#L192) | Configure service API activation. | object({…}) | | {…} | | [service_encryption_key_ids](variables.tf#L204) | Cloud KMS encryption key in {SERVICE => [KEY_URL]} format. | map(list(string)) | | {} | | [service_perimeter_bridges](variables.tf#L211) | Name of VPC-SC Bridge perimeters to add project into. See comment in the variables file for format. | list(string) | | null | | [service_perimeter_standard](variables.tf#L218) | Name of VPC-SC Standard perimeter to add project into. See comment in the variables file for format. | string | | null | @@ -403,8 +403,8 @@ output "compute_robot" { | [custom_roles](outputs.tf#L17) | Ids of the created custom roles. | | | [name](outputs.tf#L25) | Project name. | | | [number](outputs.tf#L38) | Project number. | | -| [project_id](outputs.tf#L51) | Project id. | | -| [service_accounts](outputs.tf#L70) | Product robot service accounts in project. | | -| [sink_writer_identities](outputs.tf#L86) | Writer identities created for each sink. | | +| [project_id](outputs.tf#L56) | Project id. | | +| [service_accounts](outputs.tf#L76) | Product robot service accounts in project. | | +| [sink_writer_identities](outputs.tf#L92) | Writer identities created for each sink. | | diff --git a/modules/project/outputs.tf b/modules/project/outputs.tf index 4bd28aa0..3b7efc90 100644 --- a/modules/project/outputs.tf +++ b/modules/project/outputs.tf @@ -42,9 +42,14 @@ output "number" { google_project_organization_policy.boolean, google_project_organization_policy.list, google_project_service.project_services, + google_compute_shared_vpc_host_project.shared_vpc_host, + google_compute_shared_vpc_service_project.shared_vpc_service, google_compute_shared_vpc_service_project.service_projects, google_project_iam_member.shared_vpc_host_robots, - google_kms_crypto_key_iam_member.service_identity_cmek + google_kms_crypto_key_iam_member.service_identity_cmek, + google_project_service_identity.jit_si, + google_project_service_identity.servicenetworking, + google_project_iam_member.servicenetworking ] } @@ -62,6 +67,7 @@ output "project_id" { google_compute_shared_vpc_service_project.service_projects, google_project_iam_member.shared_vpc_host_robots, google_kms_crypto_key_iam_member.service_identity_cmek, + google_project_service_identity.jit_si, google_project_service_identity.servicenetworking, google_project_iam_member.servicenetworking ] diff --git a/modules/project/variables.tf b/modules/project/variables.tf index 578f9d23..9268deb2 100644 --- a/modules/project/variables.tf +++ b/modules/project/variables.tf @@ -196,8 +196,8 @@ variable "service_config" { disable_dependent_services = bool }) default = { - disable_on_destroy = true - disable_dependent_services = true + disable_on_destroy = false + disable_dependent_services = false } }