Merge pull request #4 from druids/0.13-rewrite

Rewrite module to Terraform 0.13

Author: radimsuckr

cloudwatch.tf

@@ -1,9 +1,9 @@
 resource "aws_cloudwatch_event_rule" "rule" {
-  name                = "${var.cloudwatch_event_rule_name}"
-  schedule_expression = "${var.cloudwatch_event_rule_schedule_expression}"
+  name                = var.cloudwatch_event_rule_name
+  schedule_expression = var.cloudwatch_event_rule_schedule_expression
 }
 
 resource "aws_cloudwatch_event_target" "refresh_lambda" {
-  rule = "${aws_cloudwatch_event_rule.rule.id}"
-  arn  = "${aws_lambda_function.refresh.arn}"
+  rule = aws_cloudwatch_event_rule.rule.id
+  arn  = aws_lambda_function.refresh.arn
 }

example/main.tf

@@ -1,5 +1,10 @@
-provider "aws" {
-  version = "2.70.0"
+terraform {
+  required_providers {
+    aws = {
+      source  = "hashicorp/aws"
+      version = "~> 3.0"
+    }
+  }
 }
 
 resource "aws_vpc" "vpc" {
@@ -8,7 +13,7 @@ resource "aws_vpc" "vpc" {
 
 resource "aws_subnet" "subnet" {
   cidr_block = "10.0.0.0/24"
-  vpc_id     = "${aws_vpc.vpc.id}"
+  vpc_id     = aws_vpc.vpc.id
 }
 
 resource "aws_launch_template" "tpl" {
@@ -22,36 +27,37 @@ resource "aws_autoscaling_group" "grp" {
   min_size         = 1
   desired_capacity = 1
 
-  vpc_zone_identifier = ["${aws_subnet.subnet.id}"]
+  vpc_zone_identifier = [aws_subnet.subnet.id]
 
   mixed_instances_policy {
     launch_template {
       launch_template_specification {
-        launch_template_name = "${aws_launch_template.tpl.name}"
+        launch_template_name = aws_launch_template.tpl.name
       }
     }
   }
 }
 
 module "refresh" {
-  source = "../"
+  source     = "../"
+  depends_on = [aws_launch_template.tpl, aws_autoscaling_group.grp]
 
-  launch_template_name   = "${aws_launch_template.tpl.name}"
-  autoscaling_group_name = "${aws_autoscaling_group.grp.name}"
+  launch_template_name   = aws_launch_template.tpl.name
+  autoscaling_group_name = aws_autoscaling_group.grp.name
 }
 
 output "asg_arn" {
-  value = "${module.refresh.asg_arn}"
+  value = module.refresh.asg_arn
 }
 
 output "lt_arn" {
-  value = "${module.refresh.lt_arn}"
+  value = module.refresh.lt_arn
 }
 
 output "lt_id" {
-  value = "${module.refresh.lt_id}"
+  value = module.refresh.lt_id
 }
 
 output "lt_name" {
-  value = "${module.refresh.lt_name}"
+  value = module.refresh.lt_name
 }

iam.tf

@@ -29,7 +29,7 @@ data "aws_iam_policy_document" "lambda" {
     actions = ["autoscaling:StartInstanceRefresh"]
 
     resources = [
-      "${data.aws_autoscaling_group.group.arn}",
+      data.aws_autoscaling_group.group.arn,
     ]
   }
 
@@ -50,7 +50,7 @@ data "aws_iam_policy_document" "lambda" {
     ]
 
     resources = [
-      "${data.aws_launch_template.template.arn}",
+      data.aws_launch_template.template.arn,
     ]
   }
 
@@ -78,13 +78,13 @@ data "aws_iam_policy_document" "lambda" {
 }
 
 resource "aws_iam_role" "lambda" {
-  name               = "${var.lambda_role_name}"
-  assume_role_policy = "${data.aws_iam_policy_document.assume_role.json}"
-  description        = "${var.lambda_role_description}"
+  name               = var.lambda_role_name
+  assume_role_policy = data.aws_iam_policy_document.assume_role.json
+  description        = var.lambda_role_description
 }
 
 resource "aws_iam_role_policy" "lambda" {
-  name_prefix = "${var.lambda_role_name}"
-  policy      = "${data.aws_iam_policy_document.lambda.json}"
-  role        = "${aws_iam_role.lambda.id}"
+  name_prefix = var.lambda_role_name
+  policy      = data.aws_iam_policy_document.lambda.json
+  role        = aws_iam_role.lambda.id
 }

lambda.tf

@@ -1,30 +1,30 @@
 resource "aws_lambda_function" "refresh" {
-  filename = "${data.archive_file.lambda.output_path}"
+  filename = data.archive_file.lambda.output_path
 
-  function_name    = "${var.lambda_name}"
+  function_name    = var.lambda_name
   handler          = "lambda.handler"
-  role             = "${aws_iam_role.lambda.arn}"
+  role             = aws_iam_role.lambda.arn
   runtime          = "python3.8"
-  timeout          = "${var.lambda_timeout}"
-  source_code_hash = "${data.archive_file.lambda.output_base64sha256}"
+  timeout          = var.lambda_timeout
+  source_code_hash = data.archive_file.lambda.output_base64sha256
 
-  description = "${var.lambda_description}"
+  description = var.lambda_description
 
   environment {
     variables = {
-      AUTO_SCALING_GROUP_NAME                 = "${var.autoscaling_group_name}"
-      DESCRIBE_INSTANCE_REFRESHES_MAX_RECORDS = "${var.describe_instance_refreshes_max_records}"
-      REFRESH_INSTANCE_WARMUP                 = "${var.instance_refresh_instance_warmup}"
-      REFRESH_MIN_HEALTHY_PERCENTAGE          = "${var.instance_refresh_min_healthy_percentage}"
-      SSM_PARAMETER_NAME                      = "${var.ami_ssm_parameter}"
+      AUTO_SCALING_GROUP_NAME                 = var.autoscaling_group_name
+      DESCRIBE_INSTANCE_REFRESHES_MAX_RECORDS = var.describe_instance_refreshes_max_records
+      REFRESH_INSTANCE_WARMUP                 = var.instance_refresh_instance_warmup
+      REFRESH_MIN_HEALTHY_PERCENTAGE          = var.instance_refresh_min_healthy_percentage
+      SSM_PARAMETER_NAME                      = var.ami_ssm_parameter
     }
   }
 }
 
 resource "aws_lambda_permission" "allow_cloudwatch_events" {
   statement_id  = "AllowCloudWatchEventsInvokeFunction"
   action        = "lambda:InvokeFunction"
-  function_name = "${aws_lambda_function.refresh.function_name}"
+  function_name = aws_lambda_function.refresh.function_name
   principal     = "events.amazonaws.com"
-  source_arn    = "${aws_cloudwatch_event_rule.rule.arn}"
+  source_arn    = aws_cloudwatch_event_rule.rule.arn
 }

main.tf

@@ -2,27 +2,27 @@ data "aws_caller_identity" "current" {}
 data "aws_region" "current" {}
 
 data "null_data_source" "lambda_file" {
-  inputs {
-    filename = "${substr("${path.module}/functions/lambda.py", length(path.cwd) + 1, -1)}"
+  inputs = {
+    filename = "${path.module}/functions/lambda.py"
   }
 }
 
 data "null_data_source" "lambda_archive" {
-  inputs {
-    filename = "${substr("${path.module}/functions/lambda.zip", length(path.cwd) + 1, -1)}"
+  inputs = {
+    filename = "${path.module}/functions/lambda.zip"
   }
 }
 
 data "archive_file" "lambda" {
   type        = "zip"
-  source_file = "${data.null_data_source.lambda_file.outputs.filename}"
-  output_path = "${data.null_data_source.lambda_archive.outputs.filename}"
+  source_file = data.null_data_source.lambda_file.outputs.filename
+  output_path = data.null_data_source.lambda_archive.outputs.filename
 }
 
 data "aws_autoscaling_group" "group" {
-  name = "${var.autoscaling_group_name}"
+  name = var.autoscaling_group_name
 }
 
 data "aws_launch_template" "template" {
-  name = "${var.launch_template_name}"
+  name = var.launch_template_name
 }

outputs.tf

@@ -1,15 +1,15 @@
 output "asg_arn" {
-  value = "${data.aws_autoscaling_group.group.arn}"
+  value = data.aws_autoscaling_group.group.arn
 }
 
 output "lt_arn" {
-  value = "${data.aws_launch_template.template.arn}"
+  value = data.aws_launch_template.template.arn
 }
 
 output "lt_id" {
-  value = "${data.aws_launch_template.template.id}"
+  value = data.aws_launch_template.template.id
 }
 
 output "lt_name" {
-  value = "${data.aws_launch_template.template.name}"
+  value = data.aws_launch_template.template.name
 }

variables.tf

@@ -1,87 +1,87 @@
 variable "ami_ssm_parameter" {
   default     = "/aws/service/ecs/optimized-ami/amazon-linux-2/recommended"
   description = "Name of SSM parameter containing the current AMI"
-  type        = "string"
+  type        = string
 }
 
 variable "autoscaling_group_name" {
   description = "Name of the auto scaling group to refresh"
-  type        = "string"
+  type        = string
 }
 
 variable "cloudwatch_event_rule_name" {
   description = "Name of the CloudWatch Event Rule"
   default     = "ASGRefreshInstancesEventRule"
-  type        = "string"
+  type        = string
 }
 
 variable "cloudwatch_event_rule_schedule_expression" {
   description = "Schedule expression for CloudWatch Event Rule"
   default     = "cron(0 0 * * ? *)"
-  type        = "string"
+  type        = string
 }
 
 variable "describe_instance_refreshes_max_records" {
   description = "Page size for boto3 when calling autoscaling:DescribeInstanceRefreshes (max is 100)"
-  default     = "100"
-  type        = "string"
+  default     = 100
+  type        = number
 }
 
 variable "instance_refresh_instance_warmup" {
   description = "Instance warmup time for instance refresh"
-  default     = "300"
-  type        = "string"
+  default     = 300
+  type        = number
 }
 
 variable "instance_refresh_min_healthy_percentage" {
   description = "Minimum healthy percentage for instance refresh"
-  default     = "90"
-  type        = "string"
+  default     = 90
+  type        = number
 }
 
 variable "launch_template_version_description" {
   description = "Description of the new launch template version in Python's f-string format"
   default     = "Automated AMI refresh to \"{image_id}\""
-  type        = "string"
+  type        = string
 }
 
 variable "lambda_description" {
   description = "Description of the Lambda function"
   default     = "Keeps ASG Launch Template updated with most recent AMI read from SSM Parameter"
-  type        = "string"
+  type        = string
 }
 
 variable "lambda_name" {
   description = "Name of the Lambda function"
   default     = "ASGRefreshInstances"
-  type        = "string"
+  type        = string
 }
 
 variable "lambda_role_description" {
   description = "Role description for the Lambda function"
   default     = ""
-  type        = "string"
+  type        = string
 }
 
 variable "lambda_role_name" {
   description = "Role name for the Lambda function"
   default     = "ASGRefreshInstancesLambdaRole"
-  type        = "string"
+  type        = string
 }
 
 variable "lambda_timeout" {
   description = "Timeout for Lambda function in seconds"
   default     = 60
-  type        = "string"
+  type        = number
 }
 
 variable "launch_template_name" {
   description = "Name of the launch template used by auto scaling group to refresh"
-  type        = "string"
+  type        = string
 }
 
 variable "launch_template_source_version" {
   description = "Source version for the new launch template"
   default     = "$Default"
-  type        = "string"
+  type        = string
 }

versions.tf

@@ -0,0 +1,14 @@
+terraform {
+  required_providers {
+    archive = {
+      source = "hashicorp/archive"
+    }
+    aws = {
+      source = "hashicorp/aws"
+    }
+    null = {
+      source = "hashicorp/null"
+    }
+  }
+  required_version = ">= 0.13"
+}