Merge pull request #19 from rhythmictech/remove_additional_pkgs

move additional packages var to setup/teardown modules

Author: dgoodellrhy

README.md

@@ -112,7 +112,6 @@ This module bridges the gap allowing Terraform to create EC2 Image Builder compo
 | component\_version | Version of the component | `string` | n/a | yes |
 | name | name to use for component | `string` | n/a | yes |
 | playbook\_repo | git url for repo where ansible code lives with provisioning playbook and requirements file<br>can append with `-b BRANCH_NAME` to clone a specific branch | `string` | n/a | yes |
-| additional\_packages | Space separate list of additional packages that may be needed for your ansible | `string` | `""` | no |
 | change\_description | description of changes since last version | `string` | `null` | no |
 | cloudformation\_timeout | How long to wait (in minutes) for CFN to apply before giving up | `number` | `10` | no |
 | data\_uri | Use this to override the component document with one at a particualar URL endpoint | `string` | `null` | no |

main.tf

@@ -3,15 +3,14 @@ locals {
   latest_component_minor_version = "${split(".", var.component_version)[0]}.${split(".", var.component_version)[1]}.x"
 
   data = templatefile("${path.module}/component.yml.tpl", {
-    additional_pkgs = var.additional_packages
-    description     = var.description
-    name            = var.name
-    playbook_dir    = var.playbook_dir
-    playbook_file   = var.playbook_file
-    playbook_repo   = var.playbook_repo
-    repo_host       = try(local.repo_parts.host, null)
-    repo_port       = coalesce(local.repo_parts.port, 22)
-    ssh_key_name    = try(data.aws_secretsmanager_secret.ssh_key[0].name, null)
+    description   = var.description
+    name          = var.name
+    playbook_dir  = var.playbook_dir
+    playbook_file = var.playbook_file
+    playbook_repo = var.playbook_repo
+    repo_host     = try(local.repo_parts.host, null)
+    repo_port     = coalesce(local.repo_parts.port, 22)
+    ssh_key_name  = try(data.aws_secretsmanager_secret.ssh_key[0].name, null)
   })
 
   repo_parts = try(

variables.tf

@@ -1,9 +1,3 @@
-variable "additional_packages" {
-  default     = ""
-  description = "Space separate list of additional packages that may be needed for your ansible"
-  type        = string
-}
-
 variable "change_description" {
   default     = null
   description = "description of changes since last version"