zecfoundation
/
cloud-foundation-fabric
mirror of https://github.com/ZcashFoundation/cloud-foundation-fabric.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'GoogleCloudPlatform:master' into network-dashboard

This commit is contained in:
Aurélien Legrand 2022-03-24 10:08:05 +01:00 committed by GitHub
parent 344a489a27 22f03bd5d5
commit d7b8beb495
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fast/stages/01-resman/branch-teams.tf
View File

@ -96,11 +96,6 @@ module "branch-teams-team-dev-folder" {
}
}
moved {
from = module.branch-teams-dev-projectfactory-sa
to = module.branch-teams-dev-pf-sa
}
module "branch-teams-dev-pf-sa" {
source = "../../../modules/iam-service-account"
project_id = var.automation_project_id
@ -110,11 +105,6 @@ module "branch-teams-dev-pf-sa" {
prefix = var.prefix
}
moved {
from = module.branch-teams-dev-projectfactory-gcs
to = module.branch-teams-dev-pf-gcs
}
module "branch-teams-dev-pf-gcs" {
source = "../../../modules/gcs"
project_id = var.automation_project_id
@ -149,11 +139,6 @@ module "branch-teams-team-prod-folder" {
}
}
moved {
from = module.branch-teams-prod-projectfactory-sa
to = module.branch-teams-prod-pf-sa
}
module "branch-teams-prod-pf-sa" {
source = "../../../modules/iam-service-account"
project_id = var.automation_project_id
@ -163,11 +148,6 @@ module "branch-teams-prod-pf-sa" {
prefix = var.prefix
}
moved {
from = module.branch-teams-prod-projectfactory-gcs
to = module.branch-teams-prod-pf-gcs
}
module "branch-teams-prod-pf-gcs" {
source = "../../../modules/gcs"
project_id = var.automation_project_id

6
modules/bigquery-dataset/README.md
View File

@ -15,7 +15,7 @@ Access configuration defaults to using the separate `google_bigquery_dataset_acc
You can choose to manage the `google_bigquery_dataset` access rules instead via the `dataset_access` variable, but be sure to always have at least one `OWNER` access and to avoid duplicating accesses, or `terraform apply` will fail.
The access variables are split into `access_roles` and `access_identities` variables, so that dynamic values can be passed in for identities (eg a service account email generated by a different module or resource). The `access_views` variable is separate, so as to allow proper type constraints.
The access variables are split into `access` and `access_identities` variables, so that dynamic values can be passed in for identities (eg a service account email generated by a different module or resource).
```hcl
module "bigquery-dataset" {
@ -54,8 +54,6 @@ module "bigquery-dataset" {
# tftest modules=1 resources=2
```
roles/bigquery.dataOwner
### Dataset options
Dataset options are set via the `options` variable. all options must be specified, but a `null` value can be set to options that need to use defaults.
@ -182,7 +180,7 @@ module "bigquery-dataset" {
| [id](variables.tf#L69) | Dataset id. | <code>string</code> | ✓ | |
| [project_id](variables.tf#L100) | Id of the project where datasets will be created. | <code>string</code> | ✓ | |
| [access](variables.tf#L17) | Map of access rules with role and identity type. Keys are arbitrary and must match those in the `access_identities` variable, types are `domain`, `group`, `special_group`, `user`, `view`. | <code title="map&#40;object&#40;&#123;&#10; role &#61; string&#10; type &#61; string&#10;&#125;&#41;&#41;">map&#40;object&#40;&#123;&#8230;&#125;&#41;&#41;</code> | | <code>&#123;&#125;</code> |
| [access_identities](variables.tf#L33) | Map of access identities used for basic access roles. View identities have the format 'project_id|dataset_id|table_id'. | <code>map&#40;string&#41;</code> | | <code>&#123;&#125;</code> |
| [access_identities](variables.tf#L33) | Map of access identities used for basic access roles. View identities have the format 'project_id\|dataset_id\|table_id'. | <code>map&#40;string&#41;</code> | | <code>&#123;&#125;</code> |
| [dataset_access](variables.tf#L39) | Set access in the dataset resource instead of using separate resources. | <code>bool</code> | | <code>false</code> |
| [description](variables.tf#L45) | Optional description. | <code>string</code> | | <code>&#34;Terraform managed.&#34;</code> |
| [encryption_key](variables.tf#L51) | Self link of the KMS key that will be used to protect destination table. | <code>string</code> | | <code>null</code> |

2
tools/tfdoc.py
View File

@ -206,7 +206,7 @@ def parse_variables(basepath, exclude_files=None):
except (IOError, OSError) as e:
raise SystemExit(f'Cannot open variables file {shortname}.')
for item in _parse(body):
description = ''.join(item['description'])
description = (''.join(item['description'])).replace('|', '\\|')
vtype = '\n'.join(item['type'])
default = HEREDOC_RE.sub(r'\1', '\n'.join(item['default']))
required = not item['default']