Skip to content
This repository has been archived by the owner on Feb 5, 2024. It is now read-only.

Infra: Upgrade project to terraform 0.12 #66

Merged
merged 12 commits into from
Jan 16, 2020
Merged

Infra: Upgrade project to terraform 0.12 #66

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d481e1a
Upgrade to tf 12
kevinmstephens Dec 27, 2019
871d51c
Switch to local terraform-serverless-references
kevinmstephens Dec 27, 2019
41f66f1
update travis to use tf 12
kevinmstephens Dec 27, 2019
2a7bcd9
terraform-aws-modules to v2 for TF 12 support
kevinmstephens Dec 27, 2019
2986738
revert to published module versions
kevinmstephens Dec 27, 2019
17c63c2
Bump tf-aws-serverless to 0.8.8
kevinmstephens Dec 27, 2019
4735a80
Merge pull request #56 from FormidableLabs/feat/terraform-12-upgrade
kevinmstephens Dec 30, 2019
73ef2d7
Regenerate yarn.lock for node12
ryan-roemer Jan 14, 2020
f0c45f8
Add new yarn dev script.
ryan-roemer Jan 14, 2020
4d9ac5c
Upgrade deps. Temp testing.
ryan-roemer Jan 14, 2020
30854eb
Manually merge master
ryan-roemer Jan 14, 2020
45529e5
Update to published tf-aws-sls 1.0 module.
ryan-roemer Jan 15, 2020
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
Prev Previous commit
Update to published tf-aws-sls 1.0 module.
  • Loading branch information
@ryan-roemer
ryan-roemer committed Jan 15, 2020
commit 45529e562ebe106fceb3f9e19aa355d448b72c45
16 changes: 8 additions & 8 deletions terraform/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ JSON
# Base `serverless` IAM support
###############################################################################
module "serverless" {
source = "../../terraform-aws-serverless"
# version = "0.8.8"
source = "FormidableLabs/serverless/aws"
version = "1.0.0"

region = var.region
service_name = var.service_name
Expand Down Expand Up @@ -77,8 +77,8 @@ module "serverless" {
# OPTION(xray): Add X-ray support to lambda execution roles.
###############################################################################
module "serverless_xray" {
source = "../../terraform-aws-serverless//modules/xray"
# version = "0.8.8"
source = "FormidableLabs/serverless/aws//modules/xray"
version = "1.0.0"

# Same variables as for `serverless` module.
region = var.region
Expand Down Expand Up @@ -216,8 +216,8 @@ STACK

# OPTION(vpc): Add in IAM permissions to humans + lambda execution role.
module "serverless_vpc" {
source = "../../terraform-aws-serverless//modules/vpc"
# version = "0.8.8"
source = "FormidableLabs/serverless/aws//modules/vpc"
version = "1.0.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👏


# Same variables as for `serverless` module.
region = var.region
Expand Down Expand Up @@ -287,8 +287,8 @@ STACK

# OPTION(canary): Add serverless-plugin-canary-deployments to lambda execution roles.
module "serverless_canary" {
source = "../../terraform-aws-serverless//modules/canary"
# version = "0.8.8"
source = "FormidableLabs/serverless/aws//modules/canary"
version = "1.0.0"

# Same variables as for `serverless` module.
region = var.region
Expand Down