Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions README.md

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

5 changes: 1 addition & 4 deletions src/README.md

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

15 changes: 5 additions & 10 deletions src/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ locals {
# basic usage picks the first private subnet from the vpc component
vpc_private_subnet_ids = sort(module.vpc.outputs.private_subnet_ids)
subnet_id = local.vpc_private_subnet_ids[0]

userdata = local.enabled ? templatefile("${path.module}/templates/userdata.sh.tmpl", {
user_data = var.user_data
}) : ""
}

data "aws_ami" "this" {
Expand All @@ -23,15 +27,6 @@ data "aws_ami" "this" {
}
}

data "template_file" "userdata" {
count = local.enabled ? 1 : 0
template = file("${path.module}/templates/userdata.sh.tmpl")

vars = {
user_data = var.user_data
}
}

module "ec2_instance" {
source = "cloudposse/ec2-instance/aws"
version = "2.0.0"
Expand All @@ -41,7 +36,7 @@ module "ec2_instance" {
ami = local.enabled ? data.aws_ami.this[0].id : ""
ami_owner = var.ami_owner
instance_type = var.instance_type
user_data_base64 = local.enabled ? base64encode(data.template_file.userdata[0].rendered) : ""
user_data_base64 = local.enabled ? base64encode(local.userdata) : ""

subnet = local.subnet_id
vpc_id = local.vpc_id
Expand Down
2 changes: 1 addition & 1 deletion src/remote-state.tf
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module "vpc" {
source = "cloudposse/stack-config/yaml//modules/remote-state"
version = "1.8.0"
version = "2.0.0"

component = "vpc"

Expand Down
4 changes: 0 additions & 4 deletions src/versions.tf
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,5 @@ terraform {
source = "hashicorp/aws"
version = ">= 4.0, < 6.0.0"
}
template = {
source = "cloudposse/template"
version = ">= 2.2"
}
}
}
6 changes: 3 additions & 3 deletions test/fixtures/vendor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ metadata:
spec:
sources:
- component: "account-map"
source: github.com/cloudposse/terraform-aws-components.git//modules/account-map?ref={{.Version}}
version: 1.520.0
source: github.com/cloudposse-terraform-components/aws-account-map.git//src?ref={{.Version}}
version: v1.537.2
targets:
- "components/terraform/account-map"
included_paths:
Expand All @@ -19,7 +19,7 @@ spec:

- component: "vpc"
source: github.com/cloudposse-terraform-components/aws-vpc.git//src?ref={{.Version}}
version: v1.536.0
version: v2.2.0
targets:
- "components/terraform/vpc"
included_paths:
Expand Down
Loading
Loading