Fix outputs file name, fix README, remove dependeces on composer resource
This commit is contained in:
Lorenzo Caggioni
parent
6e9b884dce
commit
679b20533e
|
|
@ -102,30 +102,4 @@ resource "google_composer_environment" "orc-cmp-0" {
|
|||
# }
|
||||
# }
|
||||
}
|
||||
depends_on = [
|
||||
module.dtl-0-bq-0,
|
||||
module.dtl-1-bq-0,
|
||||
module.dtl-2-bq-0,
|
||||
module.dtl-exp-bq-0,
|
||||
module.dtl-0-cs-0,
|
||||
module.dtl-1-cs-0,
|
||||
module.dtl-2-cs-0,
|
||||
module.dtl-exp-cs-0,
|
||||
module.lnd-cs-0,
|
||||
module.lnd-bq-0,
|
||||
module.lnd-ps-0,
|
||||
module.lod-cs-df-0,
|
||||
module.trf-cs-df-0,
|
||||
module.orc-vpc,
|
||||
module.orc-vpc,
|
||||
module.dtl-0-prj,
|
||||
module.dtl-1-prj,
|
||||
module.dtl-2-prj,
|
||||
module.lnd-prj,
|
||||
module.lod-prj,
|
||||
module.orc-prj,
|
||||
module.trf-prj,
|
||||
module.lod-sa-df-0,
|
||||
module.lod-sa-df-0,
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -176,6 +176,35 @@ Description of commands:
|
|||
- 03: copy the Cloud Composer DAG to Cloud Composer storage bucket impersonating the `orchestration` service account.
|
||||
- 04: Open the Cloud Composer Airflow UI and run the imported DAG.
|
||||
- 05: Run the Bigquery query to see results.
|
||||
<!-- BEGIN TFDOC -->
|
||||
|
||||
## Variables
|
||||
|
||||
| name | description | type | required | default |
|
||||
|---|---|:---:|:---:|:---:|
|
||||
| [organization](variables.tf#L76) | Organization details. | <code title="object({ domain = string })">object({…})</code> | ✓ | |
|
||||
| [prefix](variables.tf#L83) | Unique prefix used for resource names. Not used for project if 'project_create' is null. | <code>string</code> | ✓ | |
|
||||
| [composer_config](variables.tf#L17) | | <code title="object({ ip_range_cloudsql = string ip_range_gke_master = string ip_range_web_server = string region = string secondary_ip_range = object({ pods = string services = string }) })">object({…})</code> | | <code title="{ ip_range_cloudsql = "10.20.10.0/24" ip_range_gke_master = "10.20.11.0/28" ip_range_web_server = "10.20.11.16/28" region = "europe-west1" secondary_ip_range = { pods = "10.10.8.0/22" services = "10.10.12.0/24" } }">{…}</code> |
|
||||
| [data_force_destroy](variables.tf#L40) | Flag to set 'force_destroy' on data services like biguqery or cloud storage. | <code>bool</code> | | <code>false</code> |
|
||||
| [groups](variables.tf#L46) | Groups. | <code>map(string)</code> | | <code title="{ data-analysts = "gcp-data-analysts" data-engineers = "gcp-data-engineers" data-security = "gcp-data-security" }">{…}</code> |
|
||||
| [location_config](variables.tf#L128) | Locations where resources will be deployed. Map to configure region and multiregion specs. | <code title="object({ region = string multi_region = string })">object({…})</code> | | <code title="{ region = "europe-west1" multi_region = "eu" }">{…}</code> |
|
||||
| [network_config](variables.tf#L56) | Shared VPC to use. If not null networks will be created in projects. | <code title="object({ network = string vpc_subnet_range = object({ load = string transformation = string orchestration = string }) })">object({…})</code> | | <code title="{ network = null vpc_subnet_range = { load = "10.10.0.0/24" transformation = "10.10.0.0/24" orchestration = "10.10.0.0/24" } }">{…}</code> |
|
||||
| [project_create](variables.tf#L88) | Provide values if project creation is needed, uses existing project if null. Parent is in 'folders/nnn' or 'organizations/nnn' format. | <code title="object({ billing_account_id = string parent = string })">object({…})</code> | | <code>null</code> |
|
||||
| [project_id](variables.tf#L97) | Project id, references existing project if `project_create` is null. | <code title="object({ landing = string load = string orchestration = string trasformation = string datalake = string security = string })">object({…})</code> | | <code title="{ landing = "lnd" load = "lod" orchestration = "orc" trasformation = "trf" datalake = "dtl" security = "sec" }">{…}</code> |
|
||||
| [project_services](variables.tf#L117) | List of core services enabled on all projects. | <code>list(string)</code> | | <code title="[ "cloudresourcemanager.googleapis.com", "iam.googleapis.com", "serviceusage.googleapis.com", "stackdriver.googleapis.com" ]">[…]</code> |
|
||||
|
||||
## Outputs
|
||||
|
||||
| name | description | sensitive |
|
||||
|---|---|:---:|
|
||||
| [VPC](outputs.tf#L61) | VPC networks. | |
|
||||
| [bigquery-datasets](outputs.tf#L17) | BigQuery datasets. | |
|
||||
| [demo_commands](outputs.tf#L70) | Demo commands | |
|
||||
| [gcs-buckets](outputs.tf#L28) | GCS buckets. | |
|
||||
| [kms_keys](outputs.tf#L42) | Cloud MKS keys. | |
|
||||
| [projects](outputs.tf#L47) | GCP Projects. | |
|
||||
|
||||
<!-- END TFDOC -->
|
||||
# TODOs
|
||||
Features to add in futere releases:
|
||||
* Add support for Column level access on Bigquery
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ output "VPC" {
|
|||
}
|
||||
|
||||
output "demo_commands" {
|
||||
description = "Demo commands"
|
||||
description = "Demo commands."
|
||||
value = {
|
||||
01 = "gsutil -i ${module.lnd-sa-cs-0.email} cp demo/data/*.csv gs://${module.lnd-cs-0.name}"
|
||||
02 = "gsutil -i ${module.orc-sa-cmp-0.email} cp demo/data/*.j* gs://${module.orc-cs-0.name}"
|
||||
Loading…
Reference in New Issue