Skip to content

Commit

Permalink
fix!: Terraform version 1.3+ required and allow max provider version …
Browse files Browse the repository at this point in the history
…6.X (#235)
  • Loading branch information
imrannayer authored Sep 20, 2024
1 parent 59e738a commit 4ad56e1
Show file tree
Hide file tree
Showing 118 changed files with 191 additions and 183 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
7 changes: 6 additions & 1 deletion docs/upgrading_to_v10.0.md
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions examples/bigquery/billing_account/main.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/billing_account/outputs.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/billing_account/variables.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions examples/bigquery/billing_account/versions.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -15,7 +15,7 @@
*/

terraform {
required_version = ">= 0.13"
required_version = ">= 1.3"
required_providers {
google = {
source = "hashicorp/google"
Expand Down
6 changes: 3 additions & 3 deletions examples/bigquery/folder/main.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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"
Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/folder/outputs.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/folder/variables.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions examples/bigquery/folder/versions.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -16,7 +16,7 @@


terraform {
required_version = ">= 0.13"
required_version = ">= 1.3"
required_providers {
google = {
source = "hashicorp/google"
Expand Down
6 changes: 3 additions & 3 deletions examples/bigquery/organization/main.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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"
Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/organization/outputs.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/organization/variables.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions examples/bigquery/organization/versions.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -16,7 +16,7 @@


terraform {
required_version = ">= 0.13"
required_version = ">= 1.3"
required_providers {
google = {
source = "hashicorp/google"
Expand Down
6 changes: 3 additions & 3 deletions examples/bigquery/project/main.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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"
Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/project/outputs.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/project/variables.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/bigquery/project/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@


terraform {
required_version = ">= 0.13"
required_version = ">= 1.3"
required_providers {
google = {
source = "hashicorp/google"
Expand Down
4 changes: 2 additions & 2 deletions examples/bq-log-alerting/main.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion examples/bq-log-alerting/outputs.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/bq-log-alerting/variables.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions examples/bq-log-alerting/versions.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -15,7 +15,7 @@
*/

terraform {
required_version = ">= 0.13"
required_version = ">= 1.3"
required_providers {
google = {
source = "hashicorp/google"
Expand Down
6 changes: 3 additions & 3 deletions examples/datadog-sink/main.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog-sink/outputs.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/datadog-sink/variables.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions examples/datadog-sink/versions.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -16,7 +16,7 @@


terraform {
required_version = ">= 0.13"
required_version = ">= 1.3"
required_providers {
google = {
source = "hashicorp/google"
Expand Down
6 changes: 3 additions & 3 deletions examples/logbucket/folder/main.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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"
Expand All @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion examples/logbucket/folder/outputs.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion examples/logbucket/folder/variables.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
4 changes: 2 additions & 2 deletions examples/logbucket/folder/versions.tf
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -16,7 +16,7 @@


terraform {
required_version = ">= 0.13"
required_version = ">= 1.3"
required_providers {
google = {
source = "hashicorp/google"
Expand Down
Loading

0 comments on commit 4ad56e1

Please sign in to comment.