Merge pull request #13 from rhythmictech/ENG-1058-as-an-engineer-i-d-…

…like-to-be-able-to-install-and move Ansible setup and teardown to separate components
rhythmictech · Sep 22, 2020 · b4de5eb · b4de5eb
2 parents bd067a8 + f79e0b4
commit b4de5eb
Show file tree

Hide file tree

Showing 12 changed files with 186 additions and 53 deletions.
diff --git a/.github/workflows/pre-commit.yaml b/.github/workflows/pre-commit.yaml
@@ -16,6 +16,10 @@ jobs:
         uses: actions/setup-python@v2
       - name: Install prerequisites
         run: ./bin/install-ubuntu.sh
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v1
+        with:
+          terraform_version: ~0.12.29
       - name: initialize Terraform
         run: terraform init --backend=false
       - name: pre-commit

diff --git a/.github/workflows/pullRequest.yaml b/.github/workflows/pullRequest.yaml
@@ -12,6 +12,10 @@ jobs:
         uses: actions/setup-python@v2
       - name: Install prerequisites
         run: ./bin/install-ubuntu.sh
+      - name: Setup Terraform
+        uses: hashicorp/setup-terraform@v1
+        with:
+          terraform_version: ~0.12.29
       - name: initialize Terraform
         run: terraform init --backend=false
       - name: pre-commit
@@ -40,7 +44,7 @@ jobs:
       - name: setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 0.12.26
+          terraform_version: ~0.12.29
       - name: Terraform init
         run: terraform init --backend=false
       - name: tflint
@@ -58,7 +62,7 @@ jobs:
       - name: setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 0.12.26
+          terraform_version: ~0.12.29
       - name: Terraform init
         run: terraform init --backend=false
       - name: tfsec

diff --git a/.github/workflows/tflint.yaml b/.github/workflows/tflint.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 0.12.26
+          terraform_version: ~0.12.29
       - name: Terraform init
         run: terraform init --backend=false
       - name: tflint

diff --git a/.github/workflows/tfsec.yaml b/.github/workflows/tfsec.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: setup Terraform
         uses: hashicorp/setup-terraform@v1
         with:
-          terraform_version: 0.12.26
+          terraform_version: ~0.12.29
       - name: Terraform init
         run: terraform init --backend=false
       - name: tfsec

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -33,6 +33,7 @@ repos:
               cd $(dirname "$FILE")
               terraform init --backend=false
               terraform validate .
+              cd ..
             done
           '
         language: system

diff --git a/README.md b/README.md
@@ -1,28 +1,91 @@
-# terraform-aws-imagebuilder-component-ansible
-
-[![tflint](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/workflows/tflint/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/actions?query=workflow%3Atflint+event%3Apush+branch%3Amaster)
-[![tfsec](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/workflows/tfsec/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/actions?query=workflow%3Atfsec+event%3Apush+branch%3Amaster)
-[![yamllint](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/workflows/yamllint/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/actions?query=workflow%3Ayamllint+event%3Apush+branch%3Amaster)
-[![misspell](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/workflows/misspell/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/actions?query=workflow%3Amisspell+event%3Apush+branch%3Amaster)
-[![pre-commit-check](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/workflows/pre-commit-check/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-imagebuilder-component-ansible/actions?query=workflow%3Apre-commit-check+event%3Apush+branch%3Amaster)
+# terraform-aws-component-ansible
+Template repository for terraform modules. Good for any cloud and any provider.
+
+[![tflint](https://github.com/rhythmictech/terraform-aws-component-ansible/workflows/tflint/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-component-ansible/actions?query=workflow%3Atflint+event%3Apush+branch%3Amaster)
+[![tfsec](https://github.com/rhythmictech/terraform-aws-component-ansible/workflows/tfsec/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-component-ansible/actions?query=workflow%3Atfsec+event%3Apush+branch%3Amaster)
+[![yamllint](https://github.com/rhythmictech/terraform-aws-component-ansible/workflows/yamllint/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-component-ansible/actions?query=workflow%3Ayamllint+event%3Apush+branch%3Amaster)
+[![misspell](https://github.com/rhythmictech/terraform-aws-component-ansible/workflows/misspell/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-component-ansible/actions?query=workflow%3Amisspell+event%3Apush+branch%3Amaster)
+[![pre-commit-check](https://github.com/rhythmictech/terraform-aws-component-ansible/workflows/pre-commit-check/badge.svg?branch=master&event=push)](https://github.com/rhythmictech/terraform-aws-component-ansible/actions?query=workflow%3Apre-commit-check+event%3Apush+branch%3Amaster)
 <a href="https://twitter.com/intent/follow?screen_name=RhythmicTech"><img src="https://img.shields.io/twitter/follow/RhythmicTech?style=social&logo=twitter" alt="follow on Twitter"></a>
 
-
 Terraform module that creates EC2 Image Builder components with CloudFormation
 
 ## Example
 ```hcl
-module "test_component" {
+data "aws_caller_identity" "current" {
+}
+
+locals {
+  account_id = data.aws_caller_identity.current.account_id
+  tags       = module.tags.tags_no_name
+}
+
+module "tags" {
+  source = "git::https://github.com/rhythmictech/terraform-terraform-tags.git?ref=v1.0.0"
+
+  names = [
+    "smiller",
+    "imagebuilder-test"
+  ]
+
+  tags = merge({
+    "Env"       = "test"
+    "Namespace" = "smiller"
+    "notes"     = "Testing only - Can be safely deleted"
+    "Owner"     = var.owner
+  }, var.additional_tags)
+}
+
+module "component_ansible_setup" {
+  source  = "rhythmictech/imagebuilder-component-ansible-setup/aws"
+  version = "~> 1.0.0-rc1"
+
+  component_version = "1.0.0"
+  description       = "Testing ansible setup"
+  name              = "testing-setup-component"
+  tags              = local.tags
+}
+
+module "component_ansible" {
   source  = "rhythmictech/imagebuilder-component-ansible/aws"
-  version = "~> 0.2.0"
+  version = "~> 2.0.0-rc1"
 
   component_version = "1.0.0"
   description       = "Testing component"
   name              = "testing-component"
-  playbook_dir      = "packer-generic-images/base"
-  playbook_repo     = "https://github.com/rhythmictech/packer-generic-images.git"
   tags              = local.tags
 }
+
+module "test_recipe" {
+  source  = "rhythmictech/imagebuilder-recipe/aws"
+  version = "~> 0.2.0"
+
+  description    = "Testing recipe"
+  name           = "test-recipe"
+  parent_image   = "arn:aws:imagebuilder:us-east-1:aws:image/amazon-linux-2-x86/x.x.x"
+  recipe_version = "1.0.0"
+  tags           = local.tags
+  update         = true
+
+  component_arns = [
+    module.component_ansible_setup.component_arn,
+    module.component_ansible.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  = "rhythmictech/imagebuilder-pipeline/aws"
+  version = "~> 0.3.0"
+
+  description = "Testing pipeline"
+  name        = "test-pipeline"
+  tags        = local.tags
+  recipe_arn  = module.test_recipe.recipe_arn
+  public      = false
+}
+
 ```
 
 ## About
@@ -33,14 +96,14 @@ This module bridges the gap allowing Terraform to create EC2 Image Builder compo
 
 | Name | Version |
 |------|---------|
-| terraform | >= 0.12.20 |
-| aws | ~> 2.44 |
+| terraform | >= 0.12.28 |
+| aws | >= 2.44, < 4.0.0 |
 
 ## Providers
 
 | Name | Version |
 |------|---------|
-| aws | ~> 2.44 |
+| aws | >= 2.44, < 4.0.0 |
 
 ## Inputs
 

diff --git a/bin/install-macos.sh b/bin/install-macos.sh
@@ -14,5 +14,5 @@ git config --global init.templateDir ~/.git-template
 pre-commit init-templatedir ~/.git-template
 
 echo 'installing terraform with tfenv'
-tfenv install min-required
-tfenv use min-required
+tfenv install latest:^0.12
+tfenv use latest:^0.12
diff --git a/bin/install-ubuntu.sh b/bin/install-ubuntu.sh
@@ -19,5 +19,5 @@ git config --global init.templateDir ~/.git-template
 pre-commit init-templatedir ~/.git-template
 
 echo 'installing terraform with tfenv'
-tfenv install min-required
-tfenv use min-required
+tfenv install latest:^0.12
+tfenv use latest:^0.12
diff --git a/component.yml.tpl b/component.yml.tpl
@@ -6,16 +6,6 @@ schemaVersion: 1.0
 phases:
   - name: build
     steps:
-      - name: ansible-install
-        action: ExecuteBash
-        inputs:
-          commands:
-            # Install Ansible dependencies
-            - sudo yum install -y python python3 python-pip python3-pip git ${additional_pkgs}
-            # Enable Ansible repository
-            - sudo amazon-linux-extras enable ansible2
-            # Install Ansible
-            - sudo yum install -y ansible
       - name: get-playbook
         action: ExecuteBash
         inputs:
@@ -60,11 +50,3 @@ phases:
             - while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo 'Waiting for cloud-init...'; sleep 1; done
             # Run playbook
             - ansible-playbook ${playbook_file}
-      - name: cleanup
-        action: ExecuteBash
-        inputs:
-          commands:
-            - sudo yum remove -y ansible
-            - sudo yum autoremove -y
-            - sudo rm -rf ansible-repo
-            - sudo rm -rf ~/.ansible/roles /usr/share/ansible/roles /etc/ansible/roles
diff --git a/examples/basic/README.md b/examples/basic/README.md
@@ -3,17 +3,82 @@ A basic example for this repository
 
 ## Code
 ```hcl
-module "test_component" {
+data "aws_caller_identity" "current" {
+}
+
+locals {
+  account_id = data.aws_caller_identity.current.account_id
+  tags       = module.tags.tags_no_name
+}
+
+module "tags" {
+  source  = "rhythmictech/tags"
+  version = "~> 1.1.0"
+
+
+  names = [
+    "smiller",
+    "imagebuilder-test"
+  ]
+
+  tags = merge({
+    "Env"       = "test"
+    "Namespace" = "smiller"
+    "notes"     = "Testing only - Can be safely deleted"
+    "Owner"     = var.owner
+  }, var.additional_tags)
+}
+
+module "component_ansible_setup" {
+  source  = "rhythmictech/imagebuilder-component-ansible-setup/aws"
+  version = "~> 1.0.0-rc1"
+
+  component_version = "1.0.0"
+  description       = "Testing ansible setup"
+  name              = "testing-setup-component"
+  tags              = local.tags
+}
+
+module "component_ansible" {
   source  = "rhythmictech/imagebuilder-component-ansible/aws"
-  version = "~> 0.2.0"
+  version = "~> 2.0.0-rc1"
 
   component_version = "1.0.0"
   description       = "Testing component"
   name              = "testing-component"
-  playbook_dir      = "packer-generic-images/base"
-  playbook_repo     = "https://github.com/rhythmictech/packer-generic-images.git"
   tags              = local.tags
 }
+
+module "test_recipe" {
+  source  = "rhythmictech/imagebuilder-recipe/aws"
+  version = "~> 0.2.0"
+
+  description    = "Testing recipe"
+  name           = "test-recipe"
+  parent_image   = "arn:aws:imagebuilder:us-east-1:aws:image/amazon-linux-2-x86/x.x.x"
+  recipe_version = "1.0.0"
+  tags           = local.tags
+  update         = true
+
+  component_arns = [
+    module.component_ansible_setup.component_arn,
+    module.component_ansible.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  = "rhythmictech/imagebuilder-pipeline/aws"
+  version = "~> 0.3.0"
+
+  description = "Testing pipeline"
+  name        = "test-pipeline"
+  tags        = local.tags
+  recipe_arn  = module.test_recipe.recipe_arn
+  public      = false
+}
+
 ```
 
 ## Applying

diff --git a/examples/basic/main.tf b/examples/basic/main.tf
@@ -7,7 +7,9 @@ locals {
 }
 
 module "tags" {
-  source = "git::https://github.com/rhythmictech/terraform-terraform-tags.git?ref=v1.0.0"
+  source  = "rhythmictech/tags"
+  version = "~> 1.1.0"
+
 
   names = [
     "smiller",
@@ -22,15 +24,23 @@ module "tags" {
   }, var.additional_tags)
 }
 
-module "test_component" {
+module "component_ansible_setup" {
+  source  = "rhythmictech/imagebuilder-component-ansible-setup/aws"
+  version = "~> 1.0.0-rc1"
+
+  component_version = "1.0.0"
+  description       = "Testing ansible setup"
+  name              = "testing-setup-component"
+  tags              = local.tags
+}
+
+module "component_ansible" {
   source  = "rhythmictech/imagebuilder-component-ansible/aws"
-  version = "~> 0.2.0"
+  version = "~> 2.0.0-rc1"
 
   component_version = "1.0.0"
   description       = "Testing component"
   name              = "testing-component"
-  playbook_dir      = "packer-generic-images/base"
-  playbook_repo     = "https://github.com/rhythmictech/packer-generic-images.git"
   tags              = local.tags
 }
 
@@ -46,7 +56,8 @@ module "test_recipe" {
   update         = true
 
   component_arns = [
-    module.test_component.component_arn,
+    module.component_ansible_setup.component_arn,
+    module.component_ansible.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"
   ]

diff --git a/versions.tf b/versions.tf
@@ -1,7 +1,10 @@
 terraform {
-  required_version = ">= 0.12.20"
+  required_version = ">= 0.12.28"
 
   required_providers {
-    aws = "~> 2.44"
+    aws = {
+      source  = "hashicorp/aws",
+      version = ">= 2.44, < 4.0.0"
+    }
   }
 }