Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rickardl authored Nov 15, 2023
2 parents 7636ff3 + 3a47217 commit ac071e6
Show file tree
Hide file tree
Showing 9 changed files with 88 additions and 11 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ jobs:
with: { go-version: 1.14 }

- name: Install Terraform
run: |
curl -sL https://releases.hashicorp.com/terraform/0.12.21/terraform_0.12.21_linux_amd64.zip -o terraform.zip
sudo unzip terraform.zip -d /usr/bin && rm -f terraform.zip
uses: hashicorp/setup-terraform@v1
with: { terraform_version: 0.14.7 }

- name: Install Taskfile
run: curl -sL https://taskfile.dev/install.sh | sh
Expand Down
21 changes: 21 additions & 0 deletions examples/basic/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions examples/basic/main.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.14"
}

provider "aws" {
version = ">= 2.17"
region = "${var.region}"
region = var.region
}

data "aws_vpc" "main" {
Expand Down
9 changes: 9 additions & 0 deletions examples/basic/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.0"
}
}
required_version = ">= 0.14"
}
38 changes: 38 additions & 0 deletions examples/complete/.terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions examples/complete/main.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
terraform {
required_version = ">= 0.12"
required_version = ">= 0.14"
}

provider "aws" {
version = ">= 2.17"
region = "${var.region}"
region = var.region
}

data "aws_vpc" "main" {
Expand Down
12 changes: 12 additions & 0 deletions examples/complete/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.0"
}
template = {
source = "hashicorp/template"
}
}
required_version = ">= 0.14"
}
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ resource "aws_launch_configuration" "main" {

locals {
asg_tags = [
for k, v in merge(var.tags, { "Name" = "${var.name_prefix}" }) : {
for k, v in merge(var.tags, { "Name" = var.name_prefix }) : {
Key = k
Value = v
PropagateAtLaunch = "TRUE"
Expand Down
2 changes: 1 addition & 1 deletion versions.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

terraform {
required_version = ">= 0.12"
required_version = ">= 0.14"
}

0 comments on commit ac071e6

Please sign in to comment.