Skip to content

Commit

Permalink
Terraform 0.14 upgrade (#68)
Browse files Browse the repository at this point in the history
* Terraform 0.14 upgrade

* Update examples/complete/main.tf

* Update examples/complete/main.tf

* Updates

Co-authored-by: Andriy Knysh <[email protected]>
Co-authored-by: aknysh <[email protected]>
  • Loading branch information
3 people authored Jan 15, 2021
1 parent f988993 commit 5ddd35e
Show file tree
Hide file tree
Showing 7 changed files with 70 additions and 11 deletions.
41 changes: 41 additions & 0 deletions .github/workflows/auto-readme.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: "auto-readme"
on:
schedule:
# Update README.md nightly
- cron: '0 4 * * *'

jobs:
update:
if: github.event_name == 'schedule'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Update readme
shell: bash
id: update
env:
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
run: |
make init
make readme/build
- name: Create Pull Request
uses: cloudposse/actions/github/[email protected]
with:
token: ${{ secrets.PUBLIC_REPO_ACCESS_TOKEN }}
commit-message: Update README.md and docs
title: Update README.md and docs
body: |-
## what
This is an auto-generated PR that updates the README.md and docs
## why
To have most recent changes of README.md and doc from origin templates
branch: auto-update/readme
base: master
delete-branch: true
labels: |
auto-update
readme
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2018-2019 Cloud Posse, LLC
Copyright 2018-2021 Cloud Posse, 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: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,9 @@ For automated test of the complete example using `bats` and `Terratest`, see [te
}
module "alb" {
source = "git::https://github.com/cloudposse/terraform-aws-alb.git?ref=master"
source = "cloudposse/alb/aws"
# Cloud Posse recommends pinning every module to a specific version
# version = "x.x.x"
namespace = var.namespace
stage = var.stage
name = var.name
Expand Down
4 changes: 3 additions & 1 deletion README.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ usage: |-
}
module "alb" {
source = "git::https://github.com/cloudposse/terraform-aws-alb.git?ref=master"
source = "cloudposse/alb/aws"
# Cloud Posse recommends pinning every module to a specific version
# version = "x.x.x"
namespace = var.namespace
stage = var.stage
name = var.name
Expand Down
6 changes: 4 additions & 2 deletions examples/complete/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,15 @@ provider "aws" {
}

module "vpc" {
source = "git::https://github.com/cloudposse/terraform-aws-vpc.git?ref=tags/0.17.0"
source = "cloudposse/vpc/aws"
version = "0.18.2"
cidr_block = var.vpc_cidr_block
context = module.this.context
}

module "subnets" {
source = "git::https://github.com/cloudposse/terraform-aws-dynamic-subnets.git?ref=tags/0.30.0"
source = "cloudposse/dynamic-subnets/aws"
version = "0.34.0"
availability_zones = var.availability_zones
vpc_id = module.vpc.vpc_id
igw_id = module.vpc.igw_id
Expand Down
22 changes: 17 additions & 5 deletions examples/complete/versions.tf
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
terraform {
required_version = ">= 0.12.0, < 0.14.0"
required_version = ">= 0.12.26"

required_providers {
aws = "~> 2.0"
template = "~> 2.0"
null = "~> 2.0"
local = "~> 1.3"
aws = {
source = "hashicorp/aws"
version = ">= 2.0"
}
template = {
source = "hashicorp/template"
version = ">= 2.0"
}
null = {
source = "hashicorp/null"
version = ">= 2.0"
}
local = {
source = "hashicorp/local"
version = ">= 1.3"
}
}
}
2 changes: 1 addition & 1 deletion main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ resource "aws_security_group_rule" "https_ingress" {

module "access_logs" {
source = "cloudposse/lb-s3-bucket/aws"
version = "0.9.0"
version = "0.10.0"
enabled = module.this.enabled && var.access_logs_enabled
name = module.this.name
namespace = module.this.namespace
Expand Down

0 comments on commit 5ddd35e

Please sign in to comment.