kovagoadi/hunfabric
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix unresolved variables in starter-gcd and customizations tests (#3967)

Browse Source 
* Fix unresolved variables in starter-gcd dataset (#3961)

* Fix unresolved variables in customizations test (#3961)

* leftover files for the fix
This commit is contained in:
Ludovico Magnocavallo
2026-05-14 16:36:23 +02:00
committed by GitHub
parent abff147a95
commit ed234bfb46
8 changed files with 606 additions and 1086 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fast/stages/0-org-setup/datasets/starter-gcd/defaults.yaml
View File

@@ -56,6 +56,3 @@ output_files:
0-org-setup:
bucket: $storage_buckets:iac-0/iac-org-state
service_account: $iam_principals:service_accounts/iac-0/iac-org-rw
0-org-setup-ro:
bucket: $storage_buckets:iac-0/iac-org-state
service_account: $iam_principals:service_accounts/iac-0/iac-org-ro

36
fast/stages/0-org-setup/datasets/starter-gcd/organization/tags/environment.yaml
View File

@@ -21,23 +21,23 @@ description: "Organization-level environments."
values:
development:
description: "Development."
iam:
"roles/resourcemanager.tagUser":
- $iam_principals:service_accounts/iac-0/iac-networking-rw
- $iam_principals:service_accounts/iac-0/iac-security-rw
- $iam_principals:service_accounts/iac-0/iac-pf-rw
"roles/resourcemanager.tagViewer":
- $iam_principals:service_accounts/iac-0/iac-networking-ro
- $iam_principals:service_accounts/iac-0/iac-security-ro
- $iam_principals:service_accounts/iac-0/iac-pf-ro
# iam:
# "roles/resourcemanager.tagUser":
# - $iam_principals:service_accounts/iac-0/iac-networking-rw
# - $iam_principals:service_accounts/iac-0/iac-security-rw
# - $iam_principals:service_accounts/iac-0/iac-pf-rw
# "roles/resourcemanager.tagViewer":
# - $iam_principals:service_accounts/iac-0/iac-networking-ro
# - $iam_principals:service_accounts/iac-0/iac-security-ro
# - $iam_principals:service_accounts/iac-0/iac-pf-ro
production:
description: "Production."
iam:
"roles/resourcemanager.tagUser":
- $iam_principals:service_accounts/iac-0/iac-networking-rw
- $iam_principals:service_accounts/iac-0/iac-security-rw
- $iam_principals:service_accounts/iac-0/iac-pf-rw
"roles/resourcemanager.tagViewer":
- $iam_principals:service_accounts/iac-0/iac-networking-ro
- $iam_principals:service_accounts/iac-0/iac-security-ro
- $iam_principals:service_accounts/iac-0/iac-pf-ro
# iam:
# "roles/resourcemanager.tagUser":
# - $iam_principals:service_accounts/iac-0/iac-networking-rw
# - $iam_principals:service_accounts/iac-0/iac-security-rw
# - $iam_principals:service_accounts/iac-0/iac-pf-rw
# "roles/resourcemanager.tagViewer":
# - $iam_principals:service_accounts/iac-0/iac-networking-ro
# - $iam_principals:service_accounts/iac-0/iac-security-ro
# - $iam_principals:service_accounts/iac-0/iac-pf-ro

2
fast/stages/0-org-setup/datasets/starter-gcd/projects/iac-0.yaml
View File

@@ -52,8 +52,6 @@ buckets:
iam:
roles/storage.admin:
- $iam_principals:service_accounts/iac-0/iac-org-rw
$custom_roles:storage_viewer:
- $iam_principals:service_accounts/iac-0/iac-org-ro
iac-outputs:
description: Terraform state for the org-level automation.
versioning: true

1
tests/fast/stages/s0_org_setup/customizations.tfvars
View File

@@ -1,4 +1,5 @@
factories_config = {
dataset = "datasets/starter-gcd"
paths = {
defaults = "./data-customizations/defaults.yaml"
organization = "./data-customizations/organization"

1540
tests/fast/stages/s0_org_setup/customizations.yaml
View File

File diff suppressed because it is too large Load Diff

19
tests/fast/stages/s0_org_setup/data-customizations/defaults.yaml
View File

@@ -37,25 +37,6 @@ output_files:
0-org-setup:
bucket: $storage_buckets:iac-0/iac-org-state
service_account: $iam_principals:service_accounts/iac-0/iac-org-rw
0-org-setup-ro:
bucket: $storage_buckets:iac-0/iac-org-state
service_account: $iam_principals:service_accounts/iac-0/iac-org-rw
1-vpcsc:
bucket: $storage_buckets:iac-0/iac-stage-state
prefix: 1-vpcsc
service_account: $iam_principals:service_accounts/iac-0/iac-vpcsc-rw
2-networking:
bucket: $storage_buckets:iac-0/iac-stage-state
prefix: 2-networking
service_account: $iam_principals:service_accounts/iac-0/iac-networking-rw
2-security:
bucket: $storage_buckets:iac-0/iac-stage-state
prefix: 2-security
service_account: $iam_principals:service_accounts/iac-0/iac-security-rw
2-project-factory:
bucket: $storage_buckets:iac-0/iac-stage-state
prefix: 2-project-factory
service_account: $iam_principals:service_accounts/iac-0/iac-pf-rw
context:
iam_principals:
gcp-organization-admins: group:fabric-fast-owners@google.com

18
tests/fast/stages/s0_org_setup/data-customizations/organization/tags/environment.yaml
View File

@@ -21,23 +21,5 @@ description: "Organization-level environments."
values:
development:
description: "Development."
iam:
"roles/resourcemanager.tagUser":
- $iam_principals:service_accounts/iac-0/iac-networking-rw
- $iam_principals:service_accounts/iac-0/iac-security-rw
- $iam_principals:service_accounts/iac-0/iac-pf-rw
"roles/resourcemanager.tagViewer":
- $iam_principals:service_accounts/iac-0/iac-networking-ro
- $iam_principals:service_accounts/iac-0/iac-security-ro
- $iam_principals:service_accounts/iac-0/iac-pf-ro
production:
description: "Production."
iam:
"roles/resourcemanager.tagUser":
- $iam_principals:service_accounts/iac-0/iac-networking-rw
- $iam_principals:service_accounts/iac-0/iac-security-rw
- $iam_principals:service_accounts/iac-0/iac-pf-rw
"roles/resourcemanager.tagViewer":
- $iam_principals:service_accounts/iac-0/iac-networking-ro
- $iam_principals:service_accounts/iac-0/iac-security-ro
- $iam_principals:service_accounts/iac-0/iac-pf-ro

73
tests/fast/stages/s0_org_setup/starter-gcd.yaml
View File

@@ -4,7 +4,7 @@
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
@@ -45,38 +45,6 @@ values:
source: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.providers["0-org-setup-ro"]:
bucket: ft0-prod-iac-core-0-iac-outputs
cache_control: null
content: "/**\n * Copyright 2022 Google LLC\n *\n * Licensed under the Apache\
\ License, Version 2.0 (the \"License\");\n * you may not use this file except\
\ in compliance with the License.\n * You may obtain a copy of the License at\n\
\ *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required\
\ by applicable law or agreed to in writing, software\n * distributed under\
\ the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR\
\ CONDITIONS OF ANY KIND, either express or implied.\n * See the License for\
\ the specific language governing permissions and\n * limitations under the\
\ License.\n */\n\nterraform {\n backend \"gcs\" {\n bucket \
\ = \"ft0-prod-iac-core-0-iac-org-state\"\n impersonate_service_account\
\ = \"iac-org-rw@ft0-prod-iac-core-0.iam.gserviceaccount.com\"\n }\n}\nprovider\
\ \"google\" {\n impersonate_service_account = \"iac-org-rw@ft0-prod-iac-core-0.iam.gserviceaccount.com\"\
\n}\nprovider \"google-beta\" {\n impersonate_service_account = \"iac-org-rw@ft0-prod-iac-core-0.iam.gserviceaccount.com\"\
\n}\n"
content_disposition: null
content_encoding: null
content_language: null
contexts: []
customer_encryption: []
deletion_policy: null
detect_md5hash: null
event_based_hold: null
force_empty_content_type: null
metadata: null
name: providers/0-org-setup-ro-providers.tf
retention: []
source: null
temporary_hold: null
timeouts: null
google_storage_bucket_object.tfvars["globals"]:
bucket: ft0-prod-iac-core-0-iac-outputs
cache_control: null
@@ -236,11 +204,6 @@ values:
uniform_bucket_level_access: true
versioning:
- enabled: true
? module.factory.module.buckets["iac-0/iac-org-state"].google_storage_bucket_iam_binding.authoritative["$custom_roles:storage_viewer"]
: bucket: ft0-prod-iac-core-0-iac-org-state
condition: []
role: $custom_roles:storage_viewer
timeouts: null
? module.factory.module.buckets["iac-0/iac-org-state"].google_storage_bucket_iam_binding.authoritative["roles/storage.admin"]
: bucket: ft0-prod-iac-core-0-iac-org-state
condition: []
@@ -991,34 +954,6 @@ values:
condition:
- title: audit-logs bucket writer
role: roles/logging.bucketWriter
? module.organization-iam[0].google_tags_tag_value_iam_binding.default["environment/development:roles/resourcemanager.tagUser"]
: condition: []
members:
- $iam_principals:service_accounts/iac-0/iac-networking-rw
- $iam_principals:service_accounts/iac-0/iac-pf-rw
- $iam_principals:service_accounts/iac-0/iac-security-rw
role: roles/resourcemanager.tagUser
? module.organization-iam[0].google_tags_tag_value_iam_binding.default["environment/development:roles/resourcemanager.tagViewer"]
: condition: []
members:
- $iam_principals:service_accounts/iac-0/iac-networking-ro
- $iam_principals:service_accounts/iac-0/iac-pf-ro
- $iam_principals:service_accounts/iac-0/iac-security-ro
role: roles/resourcemanager.tagViewer
? module.organization-iam[0].google_tags_tag_value_iam_binding.default["environment/production:roles/resourcemanager.tagUser"]
: condition: []
members:
- $iam_principals:service_accounts/iac-0/iac-networking-rw
- $iam_principals:service_accounts/iac-0/iac-pf-rw
- $iam_principals:service_accounts/iac-0/iac-security-rw
role: roles/resourcemanager.tagUser
? module.organization-iam[0].google_tags_tag_value_iam_binding.default["environment/production:roles/resourcemanager.tagViewer"]
: condition: []
members:
- $iam_principals:service_accounts/iac-0/iac-networking-ro
- $iam_principals:service_accounts/iac-0/iac-pf-ro
- $iam_principals:service_accounts/iac-0/iac-security-ro
role: roles/resourcemanager.tagViewer
module.organization[0].google_logging_organization_settings.default[0]:
organization: '1234567890'
timeouts: null
@@ -1324,6 +1259,7 @@ values:
input: null
output: null
triggers_replace: null
counts:
google_bigquery_dataset: 1
google_bigquery_default_service_account: 3
@@ -1346,16 +1282,15 @@ counts:
google_project_service_identity: 14
google_service_account: 1
google_storage_bucket: 2
google_storage_bucket_iam_binding: 3
google_storage_bucket_iam_binding: 2
google_storage_bucket_object: 5
google_storage_project_service_account: 3
google_tags_tag_binding: 2
google_tags_tag_key: 1
google_tags_tag_value: 2
google_tags_tag_value_iam_binding: 4
local_file: 4
modules: 27
resources: 173
resources: 168
terraform_data: 4
outputs: