Merge branch 'decentralized-firewall-averbukh' of https://github.com/terraform-google-modules/cloud-foundation-fabric into decentralized-firewall-averbukh
This commit is contained in:
commit
b149aa5c7e
|
@ -183,6 +183,7 @@ module "project" {
|
||||||
| *billing_account* | Billing account id. | <code title="">string</code> | | <code title="">null</code> |
|
| *billing_account* | Billing account id. | <code title="">string</code> | | <code title="">null</code> |
|
||||||
| *contacts* | List of essential contacts for this resource. Must be in the form EMAIL -> [NOTIFICATION_TYPES]. Valid notification types are ALL, SUSPENSION, SECURITY, TECHNICAL, BILLING, LEGAL, PRODUCT_UPDATES | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
| *contacts* | List of essential contacts for this resource. Must be in the form EMAIL -> [NOTIFICATION_TYPES]. Valid notification types are ALL, SUSPENSION, SECURITY, TECHNICAL, BILLING, LEGAL, PRODUCT_UPDATES | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
||||||
| *custom_roles* | Map of role name => list of permissions to create in this project. | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
| *custom_roles* | Map of role name => list of permissions to create in this project. | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
||||||
|
| *descriptive_name* | Name of the project name. Used for project name instead of `name` variable | <code title="">string</code> | | <code title="">null</code> |
|
||||||
| *group_iam* | Authoritative IAM binding for organization groups, in {GROUP_EMAIL => [ROLES]} format. Group emails need to be static. Can be used in combination with the `iam` variable. | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
| *group_iam* | Authoritative IAM binding for organization groups, in {GROUP_EMAIL => [ROLES]} format. Group emails need to be static. Can be used in combination with the `iam` variable. | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
||||||
| *iam* | IAM bindings in {ROLE => [MEMBERS]} format. | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
| *iam* | IAM bindings in {ROLE => [MEMBERS]} format. | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
||||||
| *iam_additive* | IAM additive bindings in {ROLE => [MEMBERS]} format. | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
| *iam_additive* | IAM additive bindings in {ROLE => [MEMBERS]} format. | <code title="map(list(string))">map(list(string))</code> | | <code title="">{}</code> |
|
||||||
|
|
|
@ -15,6 +15,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
locals {
|
locals {
|
||||||
|
descriptive_name = var.descriptive_name != null ? var.descriptive_name : "${local.prefix}${var.name}"
|
||||||
group_iam_roles = distinct(flatten(values(var.group_iam)))
|
group_iam_roles = distinct(flatten(values(var.group_iam)))
|
||||||
group_iam = {
|
group_iam = {
|
||||||
for r in local.group_iam_roles : r => [
|
for r in local.group_iam_roles : r => [
|
||||||
|
@ -75,6 +76,7 @@ locals {
|
||||||
])
|
])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
data "google_project" "project" {
|
data "google_project" "project" {
|
||||||
count = var.project_create ? 0 : 1
|
count = var.project_create ? 0 : 1
|
||||||
project_id = "${local.prefix}${var.name}"
|
project_id = "${local.prefix}${var.name}"
|
||||||
|
@ -85,7 +87,7 @@ resource "google_project" "project" {
|
||||||
org_id = local.parent_type == "organizations" ? local.parent_id : null
|
org_id = local.parent_type == "organizations" ? local.parent_id : null
|
||||||
folder_id = local.parent_type == "folders" ? local.parent_id : null
|
folder_id = local.parent_type == "folders" ? local.parent_id : null
|
||||||
project_id = "${local.prefix}${var.name}"
|
project_id = "${local.prefix}${var.name}"
|
||||||
name = "${local.prefix}${var.name}"
|
name = local.descriptive_name
|
||||||
billing_account = var.billing_account
|
billing_account = var.billing_account
|
||||||
auto_create_network = var.auto_create_network
|
auto_create_network = var.auto_create_network
|
||||||
labels = var.labels
|
labels = var.labels
|
||||||
|
|
|
@ -215,3 +215,9 @@ variable "service_perimeter_bridges" {
|
||||||
type = list(string)
|
type = list(string)
|
||||||
default = null
|
default = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
variable "descriptive_name" {
|
||||||
|
description = "Name of the project name. Used for project name instead of `name` variable"
|
||||||
|
type = string
|
||||||
|
default = null
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue