docs: new variables

Author: Felix Zieger

TERRAFORM_DOCS.md

@@ -24,18 +24,21 @@ No resources.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_billing_account_id"></a> [billing\_account\_id](#input\_billing\_account\_id) | The GCP billing account in your organization. | `string` | n/a | yes |
-| <a name="input_billing_dataset_project_id"></a> [billing\_dataset\_project\_id](#input\_billing\_dataset\_project\_id) | GCP Project ID where the biquery table resides that holds billing data export. | `string` | n/a | yes |
-| <a name="input_billing_org_id"></a> [billing\_org\_id](#input\_billing\_org\_id) | GCP organization ID that holds billing account | `string` | n/a | yes |
-| <a name="input_kraken_sa_name"></a> [kraken\_sa\_name](#input\_kraken\_sa\_name) | Name of the service account to create for Kraken | `string` | `"mesh-kraken-service-tf"` | no |
+| <a name="input_billing_org_id"></a> [billing\_org\_id](#input\_billing\_org\_id) | GCP organization ID that holds billing account. | `string` | n/a | yes |
+| <a name="input_cloud_billing_export_dataset_id"></a> [cloud\_billing\_export\_dataset\_id](#input\_cloud\_billing\_export\_dataset\_id) | GCP BigQuery dataset containing the Cloud Billing BigQuery export. | `string` | n/a | yes |
+| <a name="input_cloud_billing_export_project_id"></a> [cloud\_billing\_export\_project\_id](#input\_cloud\_billing\_export\_project\_id) | GCP Project where the BiqQery table resides that holds the Cloud Billing export to BigQuery. See https://cloud.google.com/billing/docs/how-to/export-data-bigquery | `string` | n/a | yes |
+| <a name="input_cloud_billing_export_table_id"></a> [cloud\_billing\_export\_table\_id](#input\_cloud\_billing\_export\_table\_id) | GCP BigQuery table containing the Cloud Billing BigQuery export. | `string` | n/a | yes |
+| <a name="input_kraken_sa_name"></a> [kraken\_sa\_name](#input\_kraken\_sa\_name) | Name of the service account to create for Kraken. | `string` | `"mesh-kraken-service-tf"` | no |
 | <a name="input_landing_zone_folder_ids"></a> [landing\_zone\_folder\_ids](#input\_landing\_zone\_folder\_ids) | GCP Folders that make up the Landing Zone. The service account will only receive permissions on these folders. | `list(string)` | n/a | yes |
 | <a name="input_org_id"></a> [org\_id](#input\_org\_id) | GCP Organization ID that holds the projects that generate billing data that the service account should import. | `string` | n/a | yes |
-| <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP Project ID where to create the resources. This is typically a 'meshstack-root' project | `string` | n/a | yes |
-| <a name="input_replicator_sa_name"></a> [replicator\_sa\_name](#input\_replicator\_sa\_name) | Name of the service account to create for Replicator | `string` | `"mesh-replicator-service-tf"` | no |
+| <a name="input_project_id"></a> [project\_id](#input\_project\_id) | GCP Project ID where to create the resources. This is typically a 'meshstack-root' project. | `string` | n/a | yes |
+| <a name="input_replicator_sa_name"></a> [replicator\_sa\_name](#input\_replicator\_sa\_name) | Name of the service account to create for Replicator. | `string` | `"mesh-replicator-service-tf"` | no |
 
 ## Outputs
 
 | Name | Description |
 |------|-------------|
+| <a name="output_cloud_billing_export_table_name"></a> [cloud\_billing\_export\_table\_name](#output\_cloud\_billing\_export\_table\_name) | The BigQuery table name containing the GCP Cloud Billing BigQuery export. |
 | <a name="output_kraken_sa_email"></a> [kraken\_sa\_email](#output\_kraken\_sa\_email) | Kraken service account email. |
 | <a name="output_kraken_sa_key"></a> [kraken\_sa\_key](#output\_kraken\_sa\_key) | Kraken service account key. |
 | <a name="output_replicator_manual_setup"></a> [replicator\_manual\_setup](#output\_replicator\_manual\_setup) | Replicator service account setup information. |

modules/meshcloud-kraken-service-account/README.md

@@ -30,11 +30,11 @@ No modules.
 
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
-| <a name="input_billing_dataset_project_id"></a> [billing\_dataset\_project\_id](#input\_billing\_dataset\_project\_id) | GCP Project ID where the biquery table resides that holds billing data export. | `string` | n/a | yes |
+| <a name="input_cloud_billing_export_project_id"></a> [cloud\_billing\_export\_project\_id](#input\_cloud\_billing\_export\_project\_id) | GCP Project where the BiqQery table resides that holds the Cloud Billing export to BigQuery. | `string` | n/a | yes |
 | <a name="input_landing_zone_folder_ids"></a> [landing\_zone\_folder\_ids](#input\_landing\_zone\_folder\_ids) | GCP Folders that make up the Landing Zone. The service account will only receive permissions on these folders. | `set(string)` | n/a | yes |
 | <a name="input_meshstack_root_project_id"></a> [meshstack\_root\_project\_id](#input\_meshstack\_root\_project\_id) | GCP Project ID where to create the service account. This is typically a 'meshstack-root' project. | `string` | n/a | yes |
 | <a name="input_org_id"></a> [org\_id](#input\_org\_id) | GCP Organization ID that holds the projects that generate billing data that the service account should import. | `string` | n/a | yes |
-| <a name="input_sa_name"></a> [sa\_name](#input\_sa\_name) | name of the service account to create | `string` | n/a | yes |
+| <a name="input_sa_name"></a> [sa\_name](#input\_sa\_name) | Name of the service account to create. | `string` | n/a | yes |
 
 ## Outputs
 

modules/meshcloud-kraken-service-account/variables.tf

@@ -1,6 +1,6 @@
 variable "sa_name" {
   type        = string
-  description = "name of the service account to create"
+  description = "Name of the service account to create."
 }
 
 variable "org_id" {

modules/meshcloud-replicator-service-account/README.md

@@ -24,6 +24,7 @@ No modules.
 | [google_organization_iam_custom_role.replicator_service](https://registry.terraform.io/providers/hashicorp/google/4.11.0/docs/resources/organization_iam_custom_role) | resource |
 | [google_project_service.admin_api](https://registry.terraform.io/providers/hashicorp/google/4.11.0/docs/resources/project_service) | resource |
 | [google_project_service.cloudbilling_api](https://registry.terraform.io/providers/hashicorp/google/4.11.0/docs/resources/project_service) | resource |
+| [google_project_service.cloudresourcemanager_api](https://registry.terraform.io/providers/hashicorp/google/4.11.0/docs/resources/project_service) | resource |
 | [google_service_account.replicator_service](https://registry.terraform.io/providers/hashicorp/google/4.11.0/docs/resources/service_account) | resource |
 | [google_service_account_key.sa_key](https://registry.terraform.io/providers/hashicorp/google/4.11.0/docs/resources/service_account_key) | resource |
 

modules/meshcloud-replicator-service-account/outputs.tf

@@ -14,9 +14,6 @@ output "sa_email" {
   description = "Service account email."
 }
 
-# further manual setup is required because currently there is no way to figure out the role id and do GSuite
-# calls needed with Terraform. See this ticket in a custom TF module:
-# https://github.com/DeviaVir/terraform-provider-gsuite/issues/147
 output "replicator_manual_setup" {
   value       = <<EOF
   Attention. The created service account ${google_service_account.replicator_service.email} with the unique id '${google_service_account.replicator_service.unique_id}' needs a manual role assignment for the G Suite role 'Group Administrator' so necessary group operations can be performed domain-wide.

variables.tf

@@ -1,6 +1,6 @@
 variable "project_id" {
   type        = string
-  description = "GCP Project ID where to create the resources. This is typically a 'meshstack-root' project"
+  description = "GCP Project ID where to create the resources. This is typically a 'meshstack-root' project."
 }
 
 variable "org_id" {
@@ -10,7 +10,7 @@ variable "org_id" {
 
 variable "billing_org_id" {
   type        = string
-  description = "GCP organization ID that holds billing account"
+  description = "GCP organization ID that holds billing account."
 }
 
 variable "billing_account_id" {
@@ -45,12 +45,12 @@ variable "cloud_billing_export_table_id" {
 
 variable "replicator_sa_name" {
   type        = string
-  description = "Name of the service account to create for Replicator"
+  description = "Name of the service account to create for Replicator."
   default     = "mesh-replicator-service-tf"
 }
 
 variable "kraken_sa_name" {
   type        = string
-  description = "Name of the service account to create for Kraken"
+  description = "Name of the service account to create for Kraken."
   default     = "mesh-kraken-service-tf"
-}
+}