diff --git a/Makefile b/Makefile index 2cdc9078..b852089f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# Copyright 2019 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/docs/upgrading_to_v10.0.md b/docs/upgrading_to_v10.0.md index a6c679a1..f6c3ebb7 100644 --- a/docs/upgrading_to_v10.0.md +++ b/docs/upgrading_to_v10.0.md @@ -1,3 +1,8 @@ # Upgrading to Log Export v10.0 -The v10.0 release of Log Export is a backwards incompatible release and features a new feature `intercept_children` for folder and oraganization logging sinks. Minimum provider version `5.27` ia required. +## Provider version +- The v10.0 release of Log Export is a backwards incompatible release and features a new feature `intercept_children` for folder and organization logging sinks. Minimum provider version `5.27` ia required. +- Allows maximum provider version 6+ + +## Terraform version +- Terraform version 1.3+ required diff --git a/examples/bigquery/billing_account/main.tf b/examples/bigquery/billing_account/main.tf index 5af1e984..76e78325 100644 --- a/examples/bigquery/billing_account/main.tf +++ b/examples/bigquery/billing_account/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri log_sink_name = "bigquery_example_logsink" @@ -27,7 +27,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id dataset_name = "bigquery_example" diff --git a/examples/bigquery/billing_account/outputs.tf b/examples/bigquery/billing_account/outputs.tf index 2fd70c8d..cca9cc39 100644 --- a/examples/bigquery/billing_account/outputs.tf +++ b/examples/bigquery/billing_account/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bigquery/billing_account/variables.tf b/examples/bigquery/billing_account/variables.tf index be3d4bc2..9bdd46cc 100644 --- a/examples/bigquery/billing_account/variables.tf +++ b/examples/bigquery/billing_account/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bigquery/billing_account/versions.tf b/examples/bigquery/billing_account/versions.tf index 42dbd4f2..f9368a79 100644 --- a/examples/bigquery/billing_account/versions.tf +++ b/examples/bigquery/billing_account/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/bigquery/folder/main.tf b/examples/bigquery/folder/main.tf index 96d5437c..3af31a73 100644 --- a/examples/bigquery/folder/main.tf +++ b/examples/bigquery/folder/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id dataset_name = "bq_folder_${random_string.suffix.result}" diff --git a/examples/bigquery/folder/outputs.tf b/examples/bigquery/folder/outputs.tf index 2fd70c8d..cca9cc39 100644 --- a/examples/bigquery/folder/outputs.tf +++ b/examples/bigquery/folder/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bigquery/folder/variables.tf b/examples/bigquery/folder/variables.tf index be3d4bc2..9bdd46cc 100644 --- a/examples/bigquery/folder/variables.tf +++ b/examples/bigquery/folder/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bigquery/folder/versions.tf b/examples/bigquery/folder/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/bigquery/folder/versions.tf +++ b/examples/bigquery/folder/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/bigquery/organization/main.tf b/examples/bigquery/organization/main.tf index 449a0ddf..06c1aad1 100644 --- a/examples/bigquery/organization/main.tf +++ b/examples/bigquery/organization/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id dataset_name = "bq_org_${random_string.suffix.result}" diff --git a/examples/bigquery/organization/outputs.tf b/examples/bigquery/organization/outputs.tf index a05963d4..8dbde136 100644 --- a/examples/bigquery/organization/outputs.tf +++ b/examples/bigquery/organization/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bigquery/organization/variables.tf b/examples/bigquery/organization/variables.tf index 6177bc0f..dd0331b2 100644 --- a/examples/bigquery/organization/variables.tf +++ b/examples/bigquery/organization/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bigquery/organization/versions.tf b/examples/bigquery/organization/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/bigquery/organization/versions.tf +++ b/examples/bigquery/organization/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/bigquery/project/main.tf b/examples/bigquery/project/main.tf index af5cc770..51c1e6ff 100644 --- a/examples/bigquery/project/main.tf +++ b/examples/bigquery/project/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/bigquery" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id dataset_name = "bq_project_${random_string.suffix.result}" diff --git a/examples/bigquery/project/outputs.tf b/examples/bigquery/project/outputs.tf index a05963d4..8dbde136 100644 --- a/examples/bigquery/project/outputs.tf +++ b/examples/bigquery/project/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bigquery/project/variables.tf b/examples/bigquery/project/variables.tf index 5e6e0f3c..e9f64800 100644 --- a/examples/bigquery/project/variables.tf +++ b/examples/bigquery/project/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bigquery/project/versions.tf b/examples/bigquery/project/versions.tf index a2d8820a..52e7f6fc 100644 --- a/examples/bigquery/project/versions.tf +++ b/examples/bigquery/project/versions.tf @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/bq-log-alerting/main.tf b/examples/bq-log-alerting/main.tf index fd9f1761..9ff99bb4 100644 --- a/examples/bq-log-alerting/main.tf +++ b/examples/bq-log-alerting/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ module "bq-log-alerting" { source = "terraform-google-modules/log-export/google//modules/bq-log-alerting" - version = "~> 8.0" + version = "~> 10.0" logging_project = var.logging_project bigquery_location = var.bigquery_location diff --git a/examples/bq-log-alerting/outputs.tf b/examples/bq-log-alerting/outputs.tf index a711a41c..5b496029 100644 --- a/examples/bq-log-alerting/outputs.tf +++ b/examples/bq-log-alerting/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bq-log-alerting/variables.tf b/examples/bq-log-alerting/variables.tf index f5e49bd6..e8e8d308 100644 --- a/examples/bq-log-alerting/variables.tf +++ b/examples/bq-log-alerting/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/bq-log-alerting/versions.tf b/examples/bq-log-alerting/versions.tf index db18e14d..f9368a79 100644 --- a/examples/bq-log-alerting/versions.tf +++ b/examples/bq-log-alerting/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,7 +15,7 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/datadog-sink/main.tf b/examples/datadog-sink/main.tf index 23c3b325..f8dfc027 100755 --- a/examples/datadog-sink/main.tf +++ b/examples/datadog-sink/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -54,7 +54,7 @@ resource "google_project_iam_member" "monitoring-viewer" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri log_sink_name = "test-datadog-sink" @@ -65,7 +65,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/pubsub" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id topic_name = "datadog-sink" diff --git a/examples/datadog-sink/outputs.tf b/examples/datadog-sink/outputs.tf index 660505bd..1091edd7 100755 --- a/examples/datadog-sink/outputs.tf +++ b/examples/datadog-sink/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/datadog-sink/variables.tf b/examples/datadog-sink/variables.tf index bb8a2c3d..4d7dcc54 100755 --- a/examples/datadog-sink/variables.tf +++ b/examples/datadog-sink/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/datadog-sink/versions.tf b/examples/datadog-sink/versions.tf index aabeb4fa..ee44fe33 100644 --- a/examples/datadog-sink/versions.tf +++ b/examples/datadog-sink/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/logbucket/folder/main.tf b/examples/logbucket/folder/main.tf index cd4fa4f7..c7cd7dcc 100644 --- a/examples/logbucket/folder/main.tf +++ b/examples/logbucket/folder/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/logbucket" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id name = "logbucket_folder_${random_string.suffix.result}" diff --git a/examples/logbucket/folder/outputs.tf b/examples/logbucket/folder/outputs.tf index af7102e9..a30ae0e9 100644 --- a/examples/logbucket/folder/outputs.tf +++ b/examples/logbucket/folder/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/logbucket/folder/variables.tf b/examples/logbucket/folder/variables.tf index ddb2178b..4fa9855f 100644 --- a/examples/logbucket/folder/variables.tf +++ b/examples/logbucket/folder/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/logbucket/folder/versions.tf b/examples/logbucket/folder/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/logbucket/folder/versions.tf +++ b/examples/logbucket/folder/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/logbucket/organization/main.tf b/examples/logbucket/organization/main.tf index 9ca22de9..4b71ac70 100644 --- a/examples/logbucket/organization/main.tf +++ b/examples/logbucket/organization/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/logbucket" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id name = "logbucket_org_${random_string.suffix.result}" diff --git a/examples/logbucket/organization/outputs.tf b/examples/logbucket/organization/outputs.tf index 9c090ea6..699157d9 100644 --- a/examples/logbucket/organization/outputs.tf +++ b/examples/logbucket/organization/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/logbucket/organization/variables.tf b/examples/logbucket/organization/variables.tf index 9baa7c03..0e31225c 100644 --- a/examples/logbucket/organization/variables.tf +++ b/examples/logbucket/organization/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/logbucket/organization/versions.tf b/examples/logbucket/organization/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/logbucket/organization/versions.tf +++ b/examples/logbucket/organization/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/logbucket/project/main.tf b/examples/logbucket/project/main.tf index 07df997d..21a6057d 100644 --- a/examples/logbucket/project/main.tf +++ b/examples/logbucket/project/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/logbucket" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_destination_logbkt_id name = "logbucket_from_other_prj_${random_string.suffix.result}" @@ -50,7 +50,7 @@ module "destination" { #-------------------------------------# module "log_export_same_proj" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.dest_same_proj.destination_uri filter = "resource.type = gce_instance" @@ -62,7 +62,7 @@ module "log_export_same_proj" { module "dest_same_proj" { source = "terraform-google-modules/log-export/google//modules/logbucket" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_destination_logbkt_id name = "logbucket_from_same_projct_${random_string.suffix.result}" diff --git a/examples/logbucket/project/outputs.tf b/examples/logbucket/project/outputs.tf index 34c5a117..0e255292 100644 --- a/examples/logbucket/project/outputs.tf +++ b/examples/logbucket/project/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/logbucket/project/variables.tf b/examples/logbucket/project/variables.tf index 16bb70e5..f1e3ac17 100644 --- a/examples/logbucket/project/variables.tf +++ b/examples/logbucket/project/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/logbucket/project/versions.tf b/examples/logbucket/project/versions.tf index d923f57d..ddb05391 100644 --- a/examples/logbucket/project/versions.tf +++ b/examples/logbucket/project/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/project/project/main.tf b/examples/project/project/main.tf index 8fe30124..cfd5f196 100644 --- a/examples/project/project/main.tf +++ b/examples/project/project/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2023 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/project" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id log_sink_writer_identity = module.log_export.writer_identity diff --git a/examples/project/project/outputs.tf b/examples/project/project/outputs.tf index ce9e1ee0..68a4c2d7 100644 --- a/examples/project/project/outputs.tf +++ b/examples/project/project/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/project/project/variables.tf b/examples/project/project/variables.tf index aede4a8c..01f66ef6 100644 --- a/examples/project/project/variables.tf +++ b/examples/project/project/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/project/project/versions.tf b/examples/project/project/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/project/project/versions.tf +++ b/examples/project/project/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/pubsub/billing_account/main.tf b/examples/pubsub/billing_account/main.tf index 230f202e..71c53795 100644 --- a/examples/pubsub/billing_account/main.tf +++ b/examples/pubsub/billing_account/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri log_sink_name = "pubsub_example_logsink" @@ -27,7 +27,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/pubsub" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id topic_name = "pubsub-example" diff --git a/examples/pubsub/billing_account/outputs.tf b/examples/pubsub/billing_account/outputs.tf index 4c79e8a2..94c31993 100644 --- a/examples/pubsub/billing_account/outputs.tf +++ b/examples/pubsub/billing_account/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/pubsub/billing_account/variables.tf b/examples/pubsub/billing_account/variables.tf index 32551430..0f96b512 100644 --- a/examples/pubsub/billing_account/variables.tf +++ b/examples/pubsub/billing_account/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/pubsub/billing_account/versions.tf b/examples/pubsub/billing_account/versions.tf index 45391af2..99f084d7 100644 --- a/examples/pubsub/billing_account/versions.tf +++ b/examples/pubsub/billing_account/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/pubsub/folder/main.tf b/examples/pubsub/folder/main.tf index 21f0f3f2..b508fb42 100644 --- a/examples/pubsub/folder/main.tf +++ b/examples/pubsub/folder/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/pubsub" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id topic_name = "pubsub-folder-${random_string.suffix.result}" diff --git a/examples/pubsub/folder/outputs.tf b/examples/pubsub/folder/outputs.tf index 4c79e8a2..94c31993 100644 --- a/examples/pubsub/folder/outputs.tf +++ b/examples/pubsub/folder/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/pubsub/folder/variables.tf b/examples/pubsub/folder/variables.tf index 32551430..0f96b512 100644 --- a/examples/pubsub/folder/variables.tf +++ b/examples/pubsub/folder/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/pubsub/folder/versions.tf b/examples/pubsub/folder/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/pubsub/folder/versions.tf +++ b/examples/pubsub/folder/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/pubsub/organization/main.tf b/examples/pubsub/organization/main.tf index 2ba53f41..232f96fb 100644 --- a/examples/pubsub/organization/main.tf +++ b/examples/pubsub/organization/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/pubsub" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id topic_name = "pubsub-org-${random_string.suffix.result}" diff --git a/examples/pubsub/organization/outputs.tf b/examples/pubsub/organization/outputs.tf index 4c79e8a2..94c31993 100644 --- a/examples/pubsub/organization/outputs.tf +++ b/examples/pubsub/organization/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/pubsub/organization/variables.tf b/examples/pubsub/organization/variables.tf index 32551430..0f96b512 100644 --- a/examples/pubsub/organization/variables.tf +++ b/examples/pubsub/organization/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/pubsub/organization/versions.tf b/examples/pubsub/organization/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/pubsub/organization/versions.tf +++ b/examples/pubsub/organization/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/pubsub/project/main.tf b/examples/pubsub/project/main.tf index 6bbc8828..a89a90e7 100644 --- a/examples/pubsub/project/main.tf +++ b/examples/pubsub/project/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ resource "random_string" "suffix" { module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri filter = "resource.type = gce_instance" @@ -34,7 +34,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/pubsub" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id topic_labels = { topic_key : "topic_label" } diff --git a/examples/pubsub/project/outputs.tf b/examples/pubsub/project/outputs.tf index 4c79e8a2..94c31993 100644 --- a/examples/pubsub/project/outputs.tf +++ b/examples/pubsub/project/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/pubsub/project/variables.tf b/examples/pubsub/project/variables.tf index 32551430..0f96b512 100644 --- a/examples/pubsub/project/variables.tf +++ b/examples/pubsub/project/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/pubsub/project/versions.tf b/examples/pubsub/project/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/pubsub/project/versions.tf +++ b/examples/pubsub/project/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/splunk-sink/main.tf b/examples/splunk-sink/main.tf index b5a19d3a..4a93c086 100644 --- a/examples/splunk-sink/main.tf +++ b/examples/splunk-sink/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,7 @@ module "log_export" { source = "terraform-google-modules/log-export/google" - version = "~> 8.0" + version = "~> 10.0" destination_uri = module.destination.destination_uri log_sink_name = "test-splunk-sink" @@ -27,7 +27,7 @@ module "log_export" { module "destination" { source = "terraform-google-modules/log-export/google//modules/pubsub" - version = "~> 8.0" + version = "~> 10.0" project_id = var.project_id topic_name = "splunk-sink" diff --git a/examples/splunk-sink/outputs.tf b/examples/splunk-sink/outputs.tf index 0630b765..a807786f 100644 --- a/examples/splunk-sink/outputs.tf +++ b/examples/splunk-sink/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/splunk-sink/variables.tf b/examples/splunk-sink/variables.tf index 32551430..0f96b512 100644 --- a/examples/splunk-sink/variables.tf +++ b/examples/splunk-sink/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/splunk-sink/versions.tf b/examples/splunk-sink/versions.tf index 45391af2..99f084d7 100644 --- a/examples/splunk-sink/versions.tf +++ b/examples/splunk-sink/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/storage/billing_account/main.tf b/examples/storage/billing_account/main.tf index 815aa9e4..6e928ab6 100644 --- a/examples/storage/billing_account/main.tf +++ b/examples/storage/billing_account/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/billing_account/outputs.tf b/examples/storage/billing_account/outputs.tf index a05963d4..8dbde136 100644 --- a/examples/storage/billing_account/outputs.tf +++ b/examples/storage/billing_account/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/billing_account/variables.tf b/examples/storage/billing_account/variables.tf index 4e969d3a..045eea51 100644 --- a/examples/storage/billing_account/variables.tf +++ b/examples/storage/billing_account/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/billing_account/versions.tf b/examples/storage/billing_account/versions.tf index 45391af2..99f084d7 100644 --- a/examples/storage/billing_account/versions.tf +++ b/examples/storage/billing_account/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/storage/folder/main.tf b/examples/storage/folder/main.tf index 1cd36dde..1d153eb5 100644 --- a/examples/storage/folder/main.tf +++ b/examples/storage/folder/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/folder/outputs.tf b/examples/storage/folder/outputs.tf index a05963d4..8dbde136 100644 --- a/examples/storage/folder/outputs.tf +++ b/examples/storage/folder/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/folder/variables.tf b/examples/storage/folder/variables.tf index 4e969d3a..045eea51 100644 --- a/examples/storage/folder/variables.tf +++ b/examples/storage/folder/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/folder/versions.tf b/examples/storage/folder/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/storage/folder/versions.tf +++ b/examples/storage/folder/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/storage/organization/main.tf b/examples/storage/organization/main.tf index 5fa36237..e32cfb01 100644 --- a/examples/storage/organization/main.tf +++ b/examples/storage/organization/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/organization/outputs.tf b/examples/storage/organization/outputs.tf index a05963d4..8dbde136 100644 --- a/examples/storage/organization/outputs.tf +++ b/examples/storage/organization/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/organization/variables.tf b/examples/storage/organization/variables.tf index 4e969d3a..045eea51 100644 --- a/examples/storage/organization/variables.tf +++ b/examples/storage/organization/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/organization/versions.tf b/examples/storage/organization/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/storage/organization/versions.tf +++ b/examples/storage/organization/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/examples/storage/project/main.tf b/examples/storage/project/main.tf index 7ac108db..f30c8cb6 100644 --- a/examples/storage/project/main.tf +++ b/examples/storage/project/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/project/outputs.tf b/examples/storage/project/outputs.tf index a05963d4..8dbde136 100644 --- a/examples/storage/project/outputs.tf +++ b/examples/storage/project/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/project/variables.tf b/examples/storage/project/variables.tf index 4e969d3a..045eea51 100644 --- a/examples/storage/project/variables.tf +++ b/examples/storage/project/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/examples/storage/project/versions.tf b/examples/storage/project/versions.tf index a2d8820a..ddb05391 100644 --- a/examples/storage/project/versions.tf +++ b/examples/storage/project/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,7 +16,7 @@ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" diff --git a/main.tf b/main.tf index c29d5013..286ccd96 100644 --- a/main.tf +++ b/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/metadata.yaml b/metadata.yaml index b109fb84..ecb3cde0 100644 --- a/metadata.yaml +++ b/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/bigquery/main.tf b/modules/bigquery/main.tf index 75499891..2d4baeb6 100644 --- a/modules/bigquery/main.tf +++ b/modules/bigquery/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bigquery/metadata.yaml b/modules/bigquery/metadata.yaml index 163a0041..2e1625a3 100644 --- a/modules/bigquery/metadata.yaml +++ b/modules/bigquery/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/bigquery/outputs.tf b/modules/bigquery/outputs.tf index d50953ce..07763cf0 100644 --- a/modules/bigquery/outputs.tf +++ b/modules/bigquery/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bigquery/variables.tf b/modules/bigquery/variables.tf index e263b0b0..28287001 100644 --- a/modules/bigquery/variables.tf +++ b/modules/bigquery/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bigquery/versions.tf b/modules/bigquery/versions.tf index db60b97d..162b8e41 100644 --- a/modules/bigquery/versions.tf +++ b/modules/bigquery/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2021 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,12 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" - version = ">= 3.53, < 6" + version = ">= 3.53, < 7" } } diff --git a/modules/bq-log-alerting/main.tf b/modules/bq-log-alerting/main.tf index bad885d9..02d32b23 100644 --- a/modules/bq-log-alerting/main.tf +++ b/modules/bq-log-alerting/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bq-log-alerting/metadata.yaml b/modules/bq-log-alerting/metadata.yaml index f097deaa..0475218e 100644 --- a/modules/bq-log-alerting/metadata.yaml +++ b/modules/bq-log-alerting/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/bq-log-alerting/outputs.tf b/modules/bq-log-alerting/outputs.tf index b5364147..869c4ed1 100644 --- a/modules/bq-log-alerting/outputs.tf +++ b/modules/bq-log-alerting/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bq-log-alerting/variables.tf b/modules/bq-log-alerting/variables.tf index 7d5214d4..8adb9db3 100644 --- a/modules/bq-log-alerting/variables.tf +++ b/modules/bq-log-alerting/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/bq-log-alerting/versions.tf b/modules/bq-log-alerting/versions.tf index 3b4e2c45..1ce075db 100644 --- a/modules/bq-log-alerting/versions.tf +++ b/modules/bq-log-alerting/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,12 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" - version = ">= 3.53, < 6" + version = ">= 3.53, < 7" } random = { source = "hashicorp/random" diff --git a/modules/logbucket/main.tf b/modules/logbucket/main.tf index 7b0bfece..b58d6aad 100644 --- a/modules/logbucket/main.tf +++ b/modules/logbucket/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/logbucket/metadata.yaml b/modules/logbucket/metadata.yaml index 62295e66..82b133c3 100644 --- a/modules/logbucket/metadata.yaml +++ b/modules/logbucket/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/logbucket/outputs.tf b/modules/logbucket/outputs.tf index 57955985..f48792d5 100644 --- a/modules/logbucket/outputs.tf +++ b/modules/logbucket/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/logbucket/variables.tf b/modules/logbucket/variables.tf index f98b9519..25b822e4 100644 --- a/modules/logbucket/variables.tf +++ b/modules/logbucket/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/logbucket/versions.tf b/modules/logbucket/versions.tf index bf8551b9..ede4eaab 100644 --- a/modules/logbucket/versions.tf +++ b/modules/logbucket/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2022 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,12 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" - version = ">= 4.59, < 6" + version = ">= 4.59, < 7" } } diff --git a/modules/project/main.tf b/modules/project/main.tf index 67fe517d..8844d48e 100644 --- a/modules/project/main.tf +++ b/modules/project/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/project/outputs.tf b/modules/project/outputs.tf index dbe67cef..14c0128c 100644 --- a/modules/project/outputs.tf +++ b/modules/project/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/project/variables.tf b/modules/project/variables.tf index 488be189..fbbf9b93 100644 --- a/modules/project/variables.tf +++ b/modules/project/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/project/versions.tf b/modules/project/versions.tf index 08074c41..7a9dc3cb 100644 --- a/modules/project/versions.tf +++ b/modules/project/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2021 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,12 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" - version = ">= 3.53, < 6" + version = ">= 3.53, < 7" } } diff --git a/modules/pubsub/main.tf b/modules/pubsub/main.tf index eb6237bc..b8073c2a 100755 --- a/modules/pubsub/main.tf +++ b/modules/pubsub/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/pubsub/metadata.yaml b/modules/pubsub/metadata.yaml index 02adf3c3..772fd9f6 100644 --- a/modules/pubsub/metadata.yaml +++ b/modules/pubsub/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/pubsub/outputs.tf b/modules/pubsub/outputs.tf index f0dc4662..716d75d6 100755 --- a/modules/pubsub/outputs.tf +++ b/modules/pubsub/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/pubsub/variables.tf b/modules/pubsub/variables.tf index 1f0c04fa..54fdc590 100755 --- a/modules/pubsub/variables.tf +++ b/modules/pubsub/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/pubsub/versions.tf b/modules/pubsub/versions.tf index f18468cd..8e0bf77f 100644 --- a/modules/pubsub/versions.tf +++ b/modules/pubsub/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2021 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,12 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" - version = ">= 3.53, < 6" + version = ">= 3.53, < 7" } } diff --git a/modules/storage/main.tf b/modules/storage/main.tf index 6cb9586f..76fc1a00 100644 --- a/modules/storage/main.tf +++ b/modules/storage/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/storage/metadata.yaml b/modules/storage/metadata.yaml index 4114ca9e..71b9685a 100644 --- a/modules/storage/metadata.yaml +++ b/modules/storage/metadata.yaml @@ -1,4 +1,4 @@ -# Copyright 2022 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/modules/storage/outputs.tf b/modules/storage/outputs.tf index 495776b3..6af6d5fe 100644 --- a/modules/storage/outputs.tf +++ b/modules/storage/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/storage/variables.tf b/modules/storage/variables.tf index d39f983d..a3c628a3 100644 --- a/modules/storage/variables.tf +++ b/modules/storage/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/modules/storage/versions.tf b/modules/storage/versions.tf index 49340410..b26a2d14 100644 --- a/modules/storage/versions.tf +++ b/modules/storage/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2021 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,7 +20,7 @@ terraform { google = { source = "hashicorp/google" - version = ">= 5.22, < 6" + version = ">= 5.22, < 7" } } diff --git a/outputs.tf b/outputs.tf index bcabc221..22f7be6f 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/fixtures/computed_values/main.tf b/test/fixtures/computed_values/main.tf index 02b99a8b..0902dbf4 100644 --- a/test/fixtures/computed_values/main.tf +++ b/test/fixtures/computed_values/main.tf @@ -25,6 +25,8 @@ resource "google_project" "computed" { folder_id = var.parent_resource_folder project_id = "log-exports-computed-${random_string.suffix.result}" billing_account = var.parent_resource_billing_account + deletion_policy = "DELETE" + } resource "google_project_service" "project" { diff --git a/test/setup/iam.tf b/test/setup/iam.tf index ffe3749c..21b3b818 100644 --- a/test/setup/iam.tf +++ b/test/setup/iam.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/setup/main.tf b/test/setup/main.tf index 55cbc4bd..232b1910 100644 --- a/test/setup/main.tf +++ b/test/setup/main.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,13 +44,14 @@ module "project" { module "project_destination_logbkt" { source = "terraform-google-modules/project-factory/google" - version = "~> 15.0" + version = "~> 17.0" name = "ci-destination-logbkt" random_project_id = true org_id = var.org_id folder_id = var.folder_id billing_account = var.billing_account + deletion_policy = "DELETE" activate_apis = [ "cloudapis.googleapis.com", diff --git a/test/setup/outputs.tf b/test/setup/outputs.tf index 5a4dd9bc..3377475e 100644 --- a/test/setup/outputs.tf +++ b/test/setup/outputs.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/setup/variables.tf b/test/setup/variables.tf index d35eaca5..71a6222a 100644 --- a/test/setup/variables.tf +++ b/test/setup/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/test/setup/versions.tf b/test/setup/versions.tf index 878946cf..03be1f2e 100644 --- a/test/setup/versions.tf +++ b/test/setup/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,15 +15,15 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" - version = ">= 3.53.0, < 6" + version = ">= 3.53.0, < 7" } google-beta = { source = "hashicorp/google-beta" - version = ">= 3.53.0, < 6" + version = ">= 3.53.0, < 7" } null = { source = "hashicorp/null" diff --git a/variables.tf b/variables.tf index 04acb53a..bdf2743b 100644 --- a/variables.tf +++ b/variables.tf @@ -1,5 +1,5 @@ /** - * Copyright 2019 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/versions.tf b/versions.tf index a7eda993..c9dc0f69 100644 --- a/versions.tf +++ b/versions.tf @@ -1,5 +1,5 @@ /** - * Copyright 2021 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -15,12 +15,12 @@ */ terraform { - required_version = ">= 0.13" + required_version = ">= 1.3" required_providers { google = { source = "hashicorp/google" - version = ">= 5.27, < 6" + version = ">= 5.27, < 7" } }