Merge branch 'master' into adfs-fixes

This commit is contained in:
apichick 2022-11-28 13:30:12 +01:00 committed by GitHub
commit 48c6733615
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions

View File

@ -32,8 +32,9 @@ module "project" {
? var.project_create.parent
: null
)
prefix = var.project_create == null ? null : var.prefix
name = var.project_id
project_create = var.project_create != null
prefix = var.project_create == null ? null : var.prefix
name = var.project_id
services = [
"artifactregistry.googleapis.com",
"binaryauthorization.googleapis.com",

View File

@ -17,7 +17,10 @@ variable "project_create" {
billing_account_id = string
parent = string
})
default = null
default = {
billing_account_id = "12345-12345-12345"
parent = "folders/123456789"
}
}
variable "project_id" {