Skip to content

Commit

Permalink
Merge pull request #28 from SadriG91/master
Browse files Browse the repository at this point in the history
upgraded to TF 0.14
  • Loading branch information
rickardl authored Feb 15, 2021
2 parents e53abd9 + f2493c4 commit 3b7fda2
Show file tree
Hide file tree
Showing 8 changed files with 112 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 @@ -11,9 +11,8 @@ jobs:
uses: actions/setup-go@v1
with: { go-version: 1.13 }
- name: Install Terraform
run: |
curl -sL https://releases.hashicorp.com/terraform/0.12.8/terraform_0.12.8_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.6 }
- name: Install Taskfile
run: curl -sL https://taskfile.dev/install.sh | sh
- name: Run tests
Expand Down
38 changes: 38 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.

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

provider "aws" {
version = ">= 2.17"
region = var.region
#version = ">= 3.0" ##This is moved to the required providers block on TF 0.14
region = var.region
}

module "lambda" {
Expand Down
13 changes: 13 additions & 0 deletions examples/basic/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
terraform {
required_providers {
archive = {
version = "~> 2.0.0"
source = "hashicorp/archive"
}
aws = {
version = ">= 3.0"
source = "hashicorp/aws"
}
}
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.

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

provider "aws" {
version = ">= 2.17"
region = var.region
#version = ">= 3.0" ##This is moved to the required providers block on TF 0.14
region = var.region
}

data "aws_vpc" "main" {
Expand All @@ -18,7 +18,7 @@ data "aws_subnet_ids" "main" {

resource "aws_s3_bucket" "bucket" {
bucket_prefix = var.name_prefix
region = var.region
#region = var.region ##Not needed anymore follows defaults to provider region
acl = "private"
force_destroy = true

Expand Down
13 changes: 13 additions & 0 deletions examples/complete/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
terraform {
required_providers {
archive = {
version = "~> 2.0.0"
source = "hashicorp/archive"
}
aws = {
version = ">= 3.0"
source = "hashicorp/aws"
}
}
required_version = ">= 0.14"
}
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 3b7fda2

Please sign in to comment.