Skip to content

Commit

Permalink
Merge pull request #15 from SadriG91/master
Browse files Browse the repository at this point in the history
Upgraded to TF 0.14
  • Loading branch information
SadriG91 authored Apr 1, 2021
2 parents a031ff6 + 75c73f1 commit 385033b
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 13 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: workflow

on: [push]
on: [push, pull_request]

jobs:
test:
Expand All @@ -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
20 changes: 20 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"
}
20 changes: 20 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: 3 additions & 5 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 All @@ -19,7 +18,6 @@ data "aws_subnet_ids" "main" {
# This has to do with the aws_s3_bucket and not the module. See e2e tests for more details.
resource "aws_s3_bucket" "bucket" {
bucket_prefix = var.name_prefix
region = var.region
acl = "private"
force_destroy = true

Expand Down Expand Up @@ -64,7 +62,7 @@ data "aws_iam_policy_document" "bucket" {

effect = "Allow"
actions = ["s3:GetBucketAcl"]
resources = ["${aws_s3_bucket.bucket.arn}"]
resources = [aws_s3_bucket.bucket.arn]
}
}

Expand Down
10 changes: 10 additions & 0 deletions examples/complete/versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
terraform {
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.0"

}
}
required_version = ">= 0.14"
}
8 changes: 7 additions & 1 deletion versions.tf
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@

terraform {
required_version = ">= 0.12"
required_version = ">= 0.14"
required_providers {
aws = {
source = "hashicorp/aws"
version = ">= 3.0"
}
}
}

0 comments on commit 385033b

Please sign in to comment.