Merge pull request #2 from rhythmictech/private-default

[ENG-897] make private by default, allow public

Author: smiller171

cloudformation.yml.tpl

@@ -9,17 +9,20 @@ Resources:
       Distributions:
         %{~ for region in regions ~}
         - AmiDistributionConfiguration:
-            Name: '${name} - AmiCopyConfiguration - {{ imagebuilder:buildDate }}'
+            Name: '${name} - ${region} - AmiCopyConfiguration - {{ imagebuilder:buildDate }}'
             %{~ if description != null ~}
             Description: ${description}
             %{~ endif ~}
             AmiTags:
               ${ indent(14, chomp(yamlencode(tags))) }
-            %{~ if shared_account_ids != null ~}
             LaunchPermissionConfiguration:
+              %{~ if public == false ~}
               UserIds:
-                ${ indent(14, chomp(yamlencode(shared_account_ids))) }
-            %{~ endif ~}
+                ${ indent(16, chomp(yamlencode(shared_account_ids))) }
+              %{~ else ~}
+              UserGroups:
+                - all
+              %{~ endif ~}
           %{~ if license_config_arns != null ~}
           LicenseConfigurationArns:
             ${ indent(12, chomp(yamlencode(license_config_arns)))}

main.tf

@@ -93,6 +93,7 @@ resource "aws_cloudformation_stack" "this" {
     log_bucket           = var.log_bucket
     log_prefix           = var.log_prefix
     name                 = var.name
+    public               = var.public
     recipe_arn           = var.recipe_arn
     regions              = var.regions
     schedule             = var.schedule

variables.tf

@@ -57,6 +57,12 @@ variable "name" {
   type        = string
 }
 
+variable "public" {
+  default     = false
+  description = "Whether resulting AMI should be public"
+  type        = bool
+}
+
 variable "recipe_arn" {
   description = "ARN of the recipe to use. Must change with Recipe version"
   type        = string
@@ -91,7 +97,7 @@ variable "security_group_ids" {
 }
 
 variable "shared_account_ids" {
-  default     = null
+  default     = []
   description = "AWS accounts to share AMIs with. If this is left null AMIs will be public"
   type        = list(string)
 }