updates for PR feedback

Author: smiller171

.gitignore

@@ -7,7 +7,7 @@
 
 # .tfvars files
 *.tfvars
-!example/*.tfvars
+!example/**/*.tfvars
 
 # pem files
 *.pem

cloudformation.yml.tpl

@@ -15,10 +15,10 @@ Resources:
             %{~ endif ~}
             AmiTags:
               ${ indent(14, chomp(yamlencode(tags))) }
-            %{~ if shared_accounts != null ~}
+            %{~ if shared_account_ids != null ~}
             LaunchPermissionConfiguration:
               UserIds:
-                ${ indent(14, chomp(yamlencode(shared_accounts))) }
+                ${ indent(14, chomp(yamlencode(shared_account_ids))) }
             %{~ endif ~}
           %{~ if license_config_arns != null ~}
           LicenseConfigurationArns:
@@ -51,12 +51,12 @@ Resources:
           S3KeyPrefix: ${log_prefix}
           %{~ endif ~}
       %{~ endif ~}
-      %{~ if security_groups != null ~}
+      %{~ if security_group_ids != null ~}
       SecurityGroupIds:
-        ${ indent(8, chomp(yamlencode(security_groups))) }
+        ${ indent(8, chomp(yamlencode(security_group_ids))) }
       %{~ endif ~}
-      %{~ if sns_topic != null ~}
-      SnsTopicArn: ${sns_topic}
+      %{~ if sns_topic_arn != null ~}
+      SnsTopicArn: ${sns_topic_arn}
       %{~ endif ~}
       %{~ if subnet != null ~}
       SubnetId: ${subnet}

example/common.tf example/basic/common.tfexample/common.tf renamed to example/basic/common.tf

@@ -22,7 +22,7 @@ module "tags" {
   }, var.additional_tags)
 }
 
-module "test-component" {
+module "test_component" {
   source = "git::https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible.git?ref=init"
 
   component_version = "1.0.0"
@@ -33,7 +33,7 @@ module "test-component" {
   tags              = local.tags
 }
 
-module "test-recipe" {
+module "test_recipe" {
   source = "git::https://github.com/rhythmictech/terraform-aws-imagebuilder-recipe.git?ref=init"
 
   description    = "Testing recipe"
@@ -43,18 +43,18 @@ module "test-recipe" {
   tags           = local.tags
   update         = true
 
-  components = [
-    module.test-component.component_arn,
+  component_arns = [
+    module.test_component.component_arn,
     "arn:aws:imagebuilder:us-east-1:aws:component/simple-boot-test-linux/1.0.0/1",
     "arn:aws:imagebuilder:us-east-1:aws:component/reboot-test-linux/1.0.0/1"
   ]
 }
 
-module "test-pipeline" {
-  source = "git::https://github.com/rhythmictech/terraform-aws-imagebuilder-pipeline.git?ref=init"
+module "test_pipeline" {
+  source = "../../"
 
   description = "Testing pipeline"
   name        = "test-pipeline"
   tags        = local.tags
-  recipe_arn  = module.test-recipe.recipe_arn
+  recipe_arn  = module.test_recipe.recipe_arn
 }

example/global.auto.tfvars example/basic/global.auto.tfvarsexample/global.auto.tfvars renamed to example/basic/global.auto.tfvars

@@ -35,8 +35,8 @@ resource "aws_iam_role" "this" {
 resource "aws_iam_role_policy_attachment" "this" {
   count = length(local.iam_policies)
 
-  role       = aws_iam_role.this.name
   policy_arn = local.iam_policies[count.index]
+  role       = aws_iam_role.this.name
 }
 
 resource "aws_iam_instance_profile" "this" {
@@ -47,7 +47,12 @@ resource "aws_iam_instance_profile" "this" {
 resource "aws_cloudformation_stack" "this" {
   name               = var.name
   on_failure         = "ROLLBACK"
-  timeout_in_minutes = var.timeout
+  timeout_in_minutes = var.cloudformation_timeout
+
+  tags = merge(
+    var.tags,
+    { Name : "${var.name}-stack" }
+  )
 
   template_body = templatefile("${path.module}/cloudformation.yml.tpl", {
     description          = var.description
@@ -61,10 +66,10 @@ resource "aws_cloudformation_stack" "this" {
     recipe_arn           = var.recipe_arn
     regions              = var.regions
     schedule             = var.schedule
-    security_groups      = var.security_groups
-    shared_accounts      = var.shared_accounts
-    sns_topic            = var.sns_topic
-    status               = var.status
+    security_group_ids   = var.security_group_ids
+    shared_account_ids   = var.shared_account_ids
+    sns_topic_arn        = var.sns_topic_arn
+    status               = var.enabled ? "ENABLED" : "DISABLED"
     subnet               = var.subnet
     terminate_on_failure = var.terminate_on_failure
     test_config          = var.test_config
@@ -74,9 +79,4 @@ resource "aws_cloudformation_stack" "this" {
       { Name : var.name }
     )
   })
-
-  tags = merge(
-    var.tags,
-    { Name : "${var.name}-stack" }
-  )
 }

example/main.tf example/basic/main.tfexample/main.tf renamed to example/basic/main.tf

@@ -4,12 +4,24 @@ variable "additional_iam_policy_arns" {
   type        = list(string)
 }
 
+variable "cloudformation_timeout" {
+  default     = 10
+  description = "How long to wait (in minutes) for CFN to apply before giving up"
+  type        = number
+}
+
 variable "description" {
   default     = null
   description = "description of component"
   type        = string
 }
 
+variable "enabled" {
+  default     = true
+  description = "Whether pipeline is ENABLED or DISABLED"
+  type        = bool
+}
+
 variable "instance_types" {
   default     = ["t3.medium"]
   description = "Instance types to create images from. It's unclear why this is a list. Possibly because different types can result in different images (like ARM instances)"
@@ -72,31 +84,24 @@ variable "schedule" {
   })
 }
 
-variable "security_groups" {
+variable "security_group_ids" {
   default     = null
-  description = "Security groups for the Image Builder"
+  description = "Security group IDs for the Image Builder"
   type        = list(string)
 }
 
-variable "shared_accounts" {
+variable "shared_account_ids" {
   default     = null
   description = "AWS accounts to share AMIs with. If this is left null AMIs will be public"
   type        = list(string)
 }
 
-variable "sns_topic" {
+variable "sns_topic_arn" {
   default     = null
   description = "SNS topic to notify when new images are created"
   type        = string
 }
 
-# TODO: Add validation
-variable "status" {
-  default     = "ENABLED"
-  description = "Whether pipeline is ENABLED or DISABLED"
-  type        = string
-}
-
 variable "subnet" {
   default     = null
   description = "Subnet ID to use for builder"
@@ -126,9 +131,3 @@ variable "test_config" {
     TimeoutMinutes    = number
   })
 }
-
-variable "timeout" {
-  default     = 10
-  description = "How long to wait (in minutes) for CFN to apply before giving up"
-  type        = number
-}