feat: variables and outputs for cloud billing export

Author: Felix Zieger

examples/basic-gcp-integration/main.tf

@@ -27,5 +27,5 @@ module "meshplatform" {
   billing_account_id = "..."
 
   # required for kraken
-  billing_dataset_project_id = "..."
-}
+  cloud_billing_export_project_id = "..."
+}

examples/gcp-integration-lz-access-gdm-templates/main.tf

@@ -27,7 +27,7 @@ module "meshplatform" {
   billing_account_id = "..."
 
   # required for kraken
-  billing_dataset_project_id = "..."
+  cloud_billing_export_project_id = "..."
 }
 
 # Details of the parameters are in the module structure input description (module README.md)

main.tf

@@ -1,11 +1,11 @@
 module "kraken_sa" {
   source = "./modules/meshcloud-kraken-service-account/"
 
-  sa_name                    = var.kraken_sa_name
-  org_id                     = var.org_id
-  meshstack_root_project_id  = var.project_id
-  billing_dataset_project_id = var.billing_dataset_project_id
-  landing_zone_folder_ids    = var.landing_zone_folder_ids
+  sa_name                         = var.kraken_sa_name
+  org_id                          = var.org_id
+  meshstack_root_project_id       = var.project_id
+  cloud_billing_export_project_id = var.cloud_billing_export_project_id
+  landing_zone_folder_ids         = var.landing_zone_folder_ids
 }
 
 module "replicator_sa" {

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

@@ -19,7 +19,7 @@ resource "google_project_iam_member" "bigquery_jobuser" {
 }
 
 resource "google_project_iam_member" "biquery_dataViewer" {
-  project = var.billing_dataset_project_id
+  project = var.cloud_billing_export_project_id
   role    = "roles/bigquery.dataViewer"
 
   member = "serviceAccount:${google_service_account.meshcloud_kraken_sa.email}"

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

@@ -13,9 +13,9 @@ variable "meshstack_root_project_id" {
   description = "GCP Project ID where to create the service account. This is typically a 'meshstack-root' project."
 }
 
-variable "billing_dataset_project_id" {
+variable "cloud_billing_export_project_id" {
   type        = string
-  description = "GCP Project ID where the biquery table resides that holds billing data export."
+  description = "GCP Project where the BiqQery table resides that holds the Cloud Billing export to BigQuery."
 }
 
 variable "landing_zone_folder_ids" {

outputs.tf

@@ -24,3 +24,8 @@ output "kraken_sa_key" {
   value       = module.kraken_sa.sa_key
   sensitive   = true
 }
+
+output "cloud_billing_export_table_name" {
+  description = "The BigQuery table name containing the GCP Cloud Billing BigQuery export."
+  value       = "${var.cloud_billing_export_table_id}.${var.cloud_billing_export_table_id}.${var.cloud_billing_export_table_id}"
+}

variables.tf

@@ -23,9 +23,19 @@ variable "landing_zone_folder_ids" {
   description = "GCP Folders that make up the Landing Zone. The service account will only receive permissions on these folders."
 }
 
-variable "billing_dataset_project_id" {
+variable "cloud_billing_export_project_id" {
   type        = string
-  description = "GCP Project ID where the biquery table resides that holds billing data export."
+  description = "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"
+}
+
+variable "cloud_billing_export_dataset_id" {
+  type        = string
+  description = "GCP BigQuery dataset containing the Cloud Billing BigQuery export."
+}
+
+variable "cloud_billing_export_table_id" {
+  type        = string
+  description = "GCP BigQuery table containing the Cloud Billing BigQuery export."
 }
 
 # ---------------------------------------------------------------------------------------------------------------------