diff --git a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/README.md b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/README.md index 4f5b722732..1cb692d253 100644 --- a/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/README.md +++ b/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider/README.md @@ -38,13 +38,13 @@ The codebase provisions the following list of resources: ```hcl module "test" { - source = "./fabric/blueprints/cloud-operations/terraform-enterprise-wif/gcp-workload-identity-provider" + source = "./fabric/blueprints/cloud-operations/terraform-cloud-dynamic-credentials/gcp-workload-identity-provider" billing_account = "1234-ABCD-1234" project_create = true project_id = "project-1" parent = "folders/12345" - tfe_organization_id = "org-123" - tfe_workspace_id = "ws-123" + tfc_organization_id = "org-123" + tfc_workspace_id = "ws-123" workload_identity_pool_id = "tfe-pool" workload_identity_pool_provider_id = "tf-provider" issuer_uri = "https://app.terraform.io/" diff --git a/blueprints/data-solutions/data-platform-foundations/README.md b/blueprints/data-solutions/data-platform-foundations/README.md index a272a8c3bf..5f41e0de31 100644 --- a/blueprints/data-solutions/data-platform-foundations/README.md +++ b/blueprints/data-solutions/data-platform-foundations/README.md @@ -296,9 +296,11 @@ Features to add in future releases: module "test" { source = "./fabric/blueprints/data-solutions/data-platform-foundations/" organization_domain = "example.com" - billing_account_id = "123456-123456-123456" - folder_id = "folders/12345678" - prefix = "prefix" + project_config = { + billing_account_id = "123456-123456-123456" + parent = "folders/12345678" + } + prefix = "prefix" } -# tftest modules=43 resources=297 +# tftest modules=43 resources=278 ``` diff --git a/blueprints/networking/decentralized-firewall/README.md b/blueprints/networking/decentralized-firewall/README.md index 4322c3c1b7..cab7da0653 100644 --- a/blueprints/networking/decentralized-firewall/README.md +++ b/blueprints/networking/decentralized-firewall/README.md @@ -51,5 +51,5 @@ module "test" { root_node = "organizations/0123456789" } -# tftest modules=7 resources=50 +# tftest modules=9 resources=50 ``` diff --git a/tests/modules/project_factory/examples/example.yaml b/tests/blueprints/factories/project_factory/examples/example.yaml similarity index 95% rename from tests/modules/project_factory/examples/example.yaml rename to tests/blueprints/factories/project_factory/examples/example.yaml index fc166a0e68..fe33a437d6 100644 --- a/tests/modules/project_factory/examples/example.yaml +++ b/tests/blueprints/factories/project_factory/examples/example.yaml @@ -97,8 +97,8 @@ values: notification_category_subscriptions: - ALL parent: projects/test1-project - module.projects["project"].module.project.google_org_policy_policy.default["constraints/compute.disableGuestAttributesAccess"]: - name: projects/test1-project/policies/constraints/compute.disableGuestAttributesAccess + module.projects["project"].module.project.google_org_policy_policy.default["compute.disableGuestAttributesAccess"]: + name: projects/test1-project/policies/compute.disableGuestAttributesAccess parent: projects/test1-project spec: - inherit_from_parent: null @@ -109,8 +109,8 @@ values: deny_all: null enforce: 'TRUE' values: [] - module.projects["project"].module.project.google_org_policy_policy.default["constraints/compute.trustedImageProjects"]: - name: projects/test1-project/policies/constraints/compute.trustedImageProjects + module.projects["project"].module.project.google_org_policy_policy.default["compute.trustedImageProjects"]: + name: projects/test1-project/policies/compute.trustedImageProjects parent: projects/test1-project spec: - inherit_from_parent: null @@ -124,8 +124,8 @@ values: - allowed_values: - projects/fast-dev-iac-core-0 denied_values: null - module.projects["project"].module.project.google_org_policy_policy.default["constraints/compute.vmExternalIpAccess"]: - name: projects/test1-project/policies/constraints/compute.vmExternalIpAccess + module.projects["project"].module.project.google_org_policy_policy.default["compute.vmExternalIpAccess"]: + name: projects/test1-project/policies/compute.vmExternalIpAccess parent: projects/test1-project spec: - inherit_from_parent: null