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

Rationalize location defaults across project factory module and FAST stages (#3392)

Browse Source 
* group default/overrides locations in a single object in pf module

* org setup

* project factory stage

* fix defaults

* pf defaults

* security stage defaults
This commit is contained in:
Ludovico Magnocavallo
2025-10-08 09:12:15 +02:00
committed by GitHub
parent 3b3efd57bd
commit d3c80ce18b
34 changed files with 765 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/fast/stages/s0_org_setup/data-simple/cicd.yaml
View File

@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# yaml-language-server: $schema=../schemas/cicd.schema.json
# yaml-language-server: $schema=../../../../../fast/stages/0-org-setup/schemas/cicd.schema.json
workload_identity_federation:
pool_name: iac-0

13
tests/fast/stages/s0_org_setup/data-simple/defaults.yaml
View File

@@ -12,15 +12,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# yaml-language-server: $schema=../../../../../fast/stages/0-bootstrap-experimental/schemas/defaults.schema.json
# yaml-language-server: $schema=../../../../../fast/stages/0-org-setup/schemas/defaults.schema.json
# defaults:
# storage_location: europe-west1
global:
billing_account: 012345-012345-012345
locations:
bigquery: europe-west1
logging: europe-west1
organization:
domain: example.org
id: 1234567890
@@ -28,8 +25,10 @@ global:
projects:
defaults:
prefix: ft0
storage_location: europe-west1
bigquery_location: europe-west1
locations:
bigquery: $locations:primary
logging: $locations:primary
storage: $locations:primary
overrides: {}
output_files:
local_path: /tmp/fast-config
@@ -60,3 +59,5 @@ output_files:
context:
iam_principals:
gcp-organization-admins: group:fabric-fast-owners@google.com
locations:
primary: europe-west1

10
tests/fast/stages/s0_org_setup/not-simple.yaml
View File

@@ -243,7 +243,7 @@ values:
google_storage_bucket_object.tfvars["globals"]:
bucket: ft0-prod-iac-core-0-iac-outputs
cache_control: null
content: '{"billing_account":{"id":"012345-012345-012345"},"groups":{"domain":"domain:example.org","gcp-billing-admins":"group:gcp-billing-admins@example.org","gcp-devops":"group:gcp-devops@example.org","gcp-network-admins":"group:gcp-network-admins@example.org","gcp-organization-admins":"group:fabric-fast-owners@google.com","gcp-secops-admins":"group:gcp-secops-admins@example.org","gcp-security-admins":"group:gcp-security-admins@example.org","gcp-support":"group:gcp-support@example.org"},"locations":{"bigquery":"europe-west1","logging":"europe-west1","pubsub":[],"storage":"eu"},"organization":{"customer_id":"abcd123456","domain":"example.org","id":"1234567890"},"prefix":"ft0","universe":null}'
content: '{"billing_account":{"id":"012345-012345-012345"},"groups":{"domain":"domain:example.org","gcp-billing-admins":"group:gcp-billing-admins@example.org","gcp-devops":"group:gcp-devops@example.org","gcp-network-admins":"group:gcp-network-admins@example.org","gcp-organization-admins":"group:fabric-fast-owners@google.com","gcp-secops-admins":"group:gcp-secops-admins@example.org","gcp-security-admins":"group:gcp-security-admins@example.org","gcp-support":"group:gcp-support@example.org"},"organization":{"customer_id":"abcd123456","domain":"example.org","id":"1234567890"},"prefix":"ft0","universe":null}'
content_disposition: null
content_encoding: null
content_language: null
@@ -426,7 +426,7 @@ values:
sensitive_content: null
source: null
local_file.tfvars["globals"]:
content: '{"billing_account":{"id":"012345-012345-012345"},"groups":{"domain":"domain:example.org","gcp-billing-admins":"group:gcp-billing-admins@example.org","gcp-devops":"group:gcp-devops@example.org","gcp-network-admins":"group:gcp-network-admins@example.org","gcp-organization-admins":"group:fabric-fast-owners@google.com","gcp-secops-admins":"group:gcp-secops-admins@example.org","gcp-security-admins":"group:gcp-security-admins@example.org","gcp-support":"group:gcp-support@example.org"},"locations":{"bigquery":"europe-west1","logging":"europe-west1","pubsub":[],"storage":"eu"},"organization":{"customer_id":"abcd123456","domain":"example.org","id":"1234567890"},"prefix":"ft0","universe":null}'
content: '{"billing_account":{"id":"012345-012345-012345"},"groups":{"domain":"domain:example.org","gcp-billing-admins":"group:gcp-billing-admins@example.org","gcp-devops":"group:gcp-devops@example.org","gcp-network-admins":"group:gcp-network-admins@example.org","gcp-organization-admins":"group:fabric-fast-owners@google.com","gcp-secops-admins":"group:gcp-secops-admins@example.org","gcp-security-admins":"group:gcp-security-admins@example.org","gcp-support":"group:gcp-support@example.org"},"organization":{"customer_id":"abcd123456","domain":"example.org","id":"1234567890"},"prefix":"ft0","universe":null}'
content_base64: null
directory_permission: '0777'
file_permission: '0644'
@@ -1011,7 +1011,7 @@ values:
cmek_settings: []
enable_analytics: false
index_configs: []
location: global
location: europe-west1
locked: null
project: ft0-prod-audit-logs-0
retention_days: 30
@@ -1020,7 +1020,7 @@ values:
cmek_settings: []
enable_analytics: false
index_configs: []
location: global
location: europe-west1
locked: null
project: ft0-prod-audit-logs-0
retention_days: 30
@@ -1029,7 +1029,7 @@ values:
cmek_settings: []
enable_analytics: true
index_configs: []
location: global
location: europe-west1
locked: null
project: ft0-prod-audit-logs-0
retention_days: 31

5
tests/fast/stages/s2_project_factory/simple.tfvars
View File

@@ -12,3 +12,8 @@ tag_values = {
"environment/development" = "tagValues/1234567890"
"environment/production" = "tagValues/2345678901"
}
data_defaults = {
locations = {
storage = "europe-west1"
}
}

3
tests/fast/stages/s2_security/data-simple/defaults.yaml
View File

@@ -20,4 +20,5 @@ context:
secondary: europe-west3
projects:
defaults:
storage_location: eu
locations:
storage: eu