Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Misc-updates-2024 #8

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Misc-updates-2024 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0dbfd6d
fix: update dotenv command to dotenv_if_exists in .envrc
tfhartmann Dec 6, 2024
4780a98
docs: update provider versions and fix transit gateway ID references …
tfhartmann Dec 6, 2024
ba26a8d
fix: update Terraform GitHub Actions version to 1.10.1
tfhartmann Dec 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .envrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# shellcheck shell=bash

dotenv
dotenv_if_exists

# vim: set et fenc=utf-8 ff=unix ft=sh sts=2 sw=2 ts=2 :
10 changes: 5 additions & 5 deletions .github/workflows/terraform.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ jobs:
- name: 'Terraform Format'
uses: hashicorp/terraform-github-actions@master
with:
tf_actions_version: 0.12.13
tf_actions_version: 1.10.1
tf_actions_subcommand: 'fmt'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: 'Terraform Init'
uses: hashicorp/terraform-github-actions@master
with:
tf_actions_version: 0.12.13
tf_actions_version: 1.10.1
tf_actions_subcommand: 'init'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: 'Terraform Validate'
uses: hashicorp/terraform-github-actions@master
with:
tf_actions_version: 0.12.13
tf_actions_version: 1.10.1
tf_actions_subcommand: 'validate'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -34,7 +34,7 @@ jobs:
# - name: 'Terraform Plan'
# uses: hashicorp/terraform-github-actions@master
# with:
# tf_actions_version: 0.12.13
# tf_actions_version: 1.10.1
# tf_actions_subcommand: 'plan'
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
26 changes: 20 additions & 6 deletions examples/multi-region/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,31 @@
*
*/

terraform {
required_providers {
google = {
source = "hashicorp/google"
version = "6.12.0"
}
google-beta = {
source = "hashicorp/google-beta"
version = "6.12.0"
}
aws = {
source = "hashicorp/aws"
version = "~> 5.0"
}
}
}

provider "google" {
project = "project"
region = "us-central1"
version = "3.11.0"
}

provider "google-beta" {
project = "project"
region = "us-central1"
version = "3.13.0"
}

provider "google" {
Expand Down Expand Up @@ -50,8 +65,7 @@ provider "google-beta" {
}

provider "aws" {
region = "us-east-1"
version = "2.51.0"
region = "us-east-1"
}

# N. Virginia / USA
Expand Down Expand Up @@ -87,7 +101,7 @@ module "tgw-us-east-1" {

module "cb-us-east-1" {
source = "github.com/spotify/terraform-google-aws-hybrid-cloud-vpn"
transit_gateway_id = module.tgw-us-east-1.this_ec2_transit_gateway_id
transit_gateway_id = module.tgw-us-east-1.ec2_transit_gateway_id
google_network = "default"
amazon_side_asn = 64512
google_side_asn = 65534
Expand Down Expand Up @@ -126,7 +140,7 @@ module "tgw-eu-central-1" {
}
module "cb-eu-central-1" {
source = "github.com/spotify/terraform-google-aws-hybrid-cloud-vpn"
transit_gateway_id = module.tgw-eu-central-1.this_ec2_transit_gateway_id
transit_gateway_id = module.tgw-eu-central-1.ec2_transit_gateway_id
google_network = "default"
amazon_side_asn = 64513
google_side_asn = 65533
Expand Down
21 changes: 16 additions & 5 deletions examples/simple/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,31 @@
*
*/

terraform {
required_providers {
google-beta = {
source = "hashicorp/google-beta"
version = "6.12.0"
}
aws = {
source = "hashicorp/aws"
version = "~> 5.0"
}
}
}

provider "google-beta" {
project = "project"
region = "us-central1"
version = "3.11.0"
}

provider "aws" {
region = "us-east-1"
version = "2.51.0"
region = "us-east-1"
}

module "tgw-us-east-1" {
source = "terraform-aws-modules/transit-gateway/aws"
version = "1.1.0"
version = "2.12.2"
name = "tgw-example-us-east-1"
description = "TGW example shared with several other AWS accounts"
amazon_side_asn = "64512"
Expand All @@ -38,7 +49,7 @@ module "tgw-us-east-1" {

module "cb-us-east-1" {
source = "github.com/spotify/terraform-google-aws-hybrid-cloud-vpn"
transit_gateway_id = module.tgw-us-east-1.this_ec2_transit_gateway_id
transit_gateway_id = module.tgw-us-east-1.ec2_transit_gateway_id
google_network = default
amazon_side_asn = 64512
google_side_asn = 65534
Expand Down
Loading