use new bigquery module in foundation samples

This commit is contained in:
Ludovico Magnocavallo 2020-05-02 17:41:24 +02:00
parent c7bffbbac1
commit 89165ac68d
3 changed files with 13 additions and 27 deletions

View File

@ -110,25 +110,18 @@ module "audit-project" {
# audit logs dataset and sink
module "audit-datasets" {
source = "../../modules/bigquery"
module "audit-dataset" {
source = "../../modules/bigquery-dataset"
project_id = module.audit-project.project_id
datasets = {
audit_export = {
name = "Audit logs export."
description = "Terraform managed."
location = "EU"
labels = null
options = null
}
}
id = "audit_export"
friendly_name = "Audit logs export."
}
module "audit-log-sinks" {
source = "../../modules/logging-sinks"
parent = var.root_node
destinations = {
audit-logs = "bigquery.googleapis.com/projects/${module.audit-project.project_id}/datasets/${try(module.audit-datasets.names[0], "")}"
audit-logs = "bigquery.googleapis.com/${module.audit-dataset.id}"
}
sinks = {
audit-logs = var.audit_filter

View File

@ -125,25 +125,18 @@ module "audit-project" {
# audit logs dataset and sink
module "audit-datasets" {
source = "../../modules/bigquery"
module "audit-dataset" {
source = "../../modules/bigquery-dataset"
project_id = module.audit-project.project_id
datasets = {
audit_export = {
name = "Audit logs export."
description = "Terraform managed."
location = "EU"
labels = null
options = null
}
}
id = "audit_export"
friendly_name = "Audit logs export."
}
module "audit-log-sinks" {
source = "../../modules/logging-sinks"
parent = var.root_node
destinations = {
audit-logs = "bigquery.googleapis.com/projects/${module.audit-project.project_id}/datasets/${try(module.audit-datasets.names[0], "")}"
audit-logs = "bigquery.googleapis.com/${module.audit-dataset.id}"
}
sinks = {
audit-logs = var.audit_filter

View File

@ -45,7 +45,7 @@ output "environment_service_accounts" {
output "audit_logs_bq_dataset" {
description = "Bigquery dataset for the audit logs export."
value = module.audit-datasets.datasets[0].dataset_id
value = module.audit-dataset.id
}
output "audit_logs_project" {