Merge pull request #1344 from GoogleCloudPlatform/jccb/fast-export-logging-info
Add logging details to bootstrap outputs
This commit is contained in:
commit
f5b5bf9327
|
@ -222,10 +222,10 @@ This configuration is possible but unsupported and only exists for development p
|
|||
|
||||
| name | description | sensitive | consumers |
|
||||
|---|---|:---:|---|
|
||||
| [cicd_workflows](outputs.tf#L102) | CI/CD workflows for tenant bootstrap and resource management stages. | ✓ | |
|
||||
| [federated_identity](outputs.tf#L108) | Workload Identity Federation pool and providers. | | |
|
||||
| [provider](outputs.tf#L118) | Terraform provider file for tenant resource management stage. | ✓ | <code>stage-01</code> |
|
||||
| [tenant_resources](outputs.tf#L125) | Tenant-level resources. | | |
|
||||
| [tfvars](outputs.tf#L136) | Terraform variable files for the following tenant stages. | ✓ | |
|
||||
| [cicd_workflows](outputs.tf#L107) | CI/CD workflows for tenant bootstrap and resource management stages. | ✓ | |
|
||||
| [federated_identity](outputs.tf#L113) | Workload Identity Federation pool and providers. | | |
|
||||
| [provider](outputs.tf#L123) | Terraform provider file for tenant resource management stage. | ✓ | <code>stage-01</code> |
|
||||
| [tenant_resources](outputs.tf#L130) | Tenant-level resources. | | |
|
||||
| [tfvars](outputs.tf#L141) | Terraform variable files for the following tenant stages. | ✓ | |
|
||||
|
||||
<!-- END TFDOC -->
|
||||
|
|
|
@ -85,6 +85,11 @@ locals {
|
|||
fast_features = local.fast_features
|
||||
groups = var.tenant_config.groups
|
||||
locations = local.locations
|
||||
logging = {
|
||||
project_id = module.log-export-project.project_id
|
||||
project_number = module.log-export-project.number
|
||||
writer_identities = module.organization.sink_writer_identities
|
||||
}
|
||||
organization = var.organization
|
||||
prefix = local.prefix
|
||||
root_node = module.tenant-folder.id
|
||||
|
|
|
@ -521,15 +521,15 @@ The remaining configuration is manual, as it regards the repositories themselves
|
|||
|
||||
| name | description | sensitive | consumers |
|
||||
|---|---|:---:|---|
|
||||
| [automation](outputs.tf#L86) | Automation resources. | | |
|
||||
| [billing_dataset](outputs.tf#L91) | BigQuery dataset prepared for billing export. | | |
|
||||
| [cicd_repositories](outputs.tf#L96) | CI/CD repository configurations. | | |
|
||||
| [custom_roles](outputs.tf#L108) | Organization-level custom roles. | | |
|
||||
| [federated_identity](outputs.tf#L113) | Workload Identity Federation pool and providers. | | |
|
||||
| [outputs_bucket](outputs.tf#L123) | GCS bucket where generated output files are stored. | | |
|
||||
| [project_ids](outputs.tf#L128) | Projects created by this stage. | | |
|
||||
| [providers](outputs.tf#L138) | Terraform provider files for this stage and dependent stages. | ✓ | <code>stage-01</code> |
|
||||
| [service_accounts](outputs.tf#L145) | Automation service accounts created by this stage. | | |
|
||||
| [tfvars](outputs.tf#L154) | Terraform variable files for the following stages. | ✓ | |
|
||||
| [automation](outputs.tf#L91) | Automation resources. | | |
|
||||
| [billing_dataset](outputs.tf#L96) | BigQuery dataset prepared for billing export. | | |
|
||||
| [cicd_repositories](outputs.tf#L101) | CI/CD repository configurations. | | |
|
||||
| [custom_roles](outputs.tf#L113) | Organization-level custom roles. | | |
|
||||
| [federated_identity](outputs.tf#L118) | Workload Identity Federation pool and providers. | | |
|
||||
| [outputs_bucket](outputs.tf#L128) | GCS bucket where generated output files are stored. | | |
|
||||
| [project_ids](outputs.tf#L133) | Projects created by this stage. | | |
|
||||
| [providers](outputs.tf#L143) | Terraform provider files for this stage and dependent stages. | ✓ | <code>stage-01</code> |
|
||||
| [service_accounts](outputs.tf#L150) | Automation service accounts created by this stage. | | |
|
||||
| [tfvars](outputs.tf#L159) | Terraform variable files for the following stages. | ✓ | |
|
||||
|
||||
<!-- END TFDOC -->
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
/**
|
||||
* Copyright 2022 Google LLC
|
||||
* Copyright 2023 Google LLC
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
|
@ -72,6 +72,11 @@ locals {
|
|||
project_number = module.automation-project.number
|
||||
}
|
||||
custom_roles = local.custom_roles
|
||||
logging = {
|
||||
project_id = module.log-export-project.project_id
|
||||
project_number = module.log-export-project.number
|
||||
writer_identities = module.organization.sink_writer_identities
|
||||
}
|
||||
}
|
||||
tfvars_globals = {
|
||||
billing_account = var.billing_account
|
||||
|
|
Loading…
Reference in New Issue