Merge pull request #2 from cisagov/bugfix/resolve_terraform_issues

Update GitHub Actions Steps for Terraform Installation and Initialization

Author: mcdonnnj

.github/workflows/build.yml

@@ -41,10 +41,11 @@ jobs:
         uses: actions/cache@v2
         with:
           # Note that the .terraform directory IS NOT included in the
-          # cache because we use the -upgrade=true option when we run
-          # terraform below.  That option pulls down the latest
-          # modules and providers no matter what, so there is no point
-          # in caching the .terraform directory.
+          # cache because if we were caching, then we would need to use
+          # the `-upgrade=true` option. This option blindly pulls down the
+          # latest modules and providers instead of checking to see if an
+          # update is required. That behavior defeats the benefits of caching.
+          # so there is no point in doing it for the .terraform directory.
           path: |
             ${{ env.PIP_CACHE_DIR }}
             ${{ env.PRE_COMMIT_CACHE_DIR }}
@@ -73,14 +74,16 @@ jobs:
           sudo unzip -d /opt/terraform \
             ${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}"
           sudo ln -s /opt/terraform/terraform /usr/bin/terraform
+          sudo mv /usr/local/bin/terraform /usr/local/bin/terraform-default
+          sudo ln -s /opt/terraform/terraform /usr/local/bin/terraform
       - name: Install Terraform-docs
         run: GO111MODULE=on go get github.com/segmentio/terraform-docs
       - name: Find and initialize Terraform directories
         run: |
-          for path in $(find . -type f -iname "*.tf" -exec dirname "{}" \; \
-            | sort -u); do \
+          for path in $(find . -not \( -type d -name ".terraform" -prune \) \
+            -type f -iname "*.tf" -exec dirname "{}" \; | sort -u); do \
             echo "Initializing '$path'..."; \
-            terraform init -upgrade=true -input=false -backend=false "$path"; \
+            terraform init -input=false -backend=false "$path"; \
             done
       - name: Install dependencies
         run: |

meta/main.yml

@@ -1,8 +1,10 @@
 ---
 galaxy_info:
   author: First Last
-  description: Skeleton Ansible role
+  description: Skeleton Ansible role with test user
   company: CISA Cyber Assessments
+  galaxy_tags:
+    - skeleton
   license: CC0
   min_ansible_version: 2.0
   platforms:
@@ -25,7 +27,6 @@ galaxy_info:
       versions:
         - bionic
         - xenial
-  galaxy_tags:
-    - skeleton
+  role_name: skeleton_with_test_user
 
 dependencies: []