Merge branch '3320-ssp-cat3' of https://github.com/raft-tech/TANF-app …

…into 3320-ssp-cat3
raft-tech · Dec 6, 2024 · bb1f5e0 · bb1f5e0
2 parents 627345e + 7df4027
commit bb1f5e0
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 25 deletions.
diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml
@@ -226,15 +226,8 @@
         default: CF_APP
     steps:
       - checkout
-      - run:
-          name: Install dependencies
-          command: |
-            apk update
-            apk add jq
-            apk add curl
-            # TODO: Add Signature check
-            curl -L "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=v7&source=github" | tar -zx
-            mv cf7 /usr/local/bin/cf
+      - sudo-check
+      - cf-check
       - login-cloud-dot-gov:
           cf-password: <<parameters.cf-password>>
           cf-username: <<parameters.cf-username>>
@@ -285,16 +278,7 @@
         type: string
     steps:
       - checkout
-      - run:
-          name: Install dependencies
-          command: |
-            sudo apt update
-            sudo apt install jq
-            sudo apt install curl
-            # TODO: Add Signature check
-            curl -L "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=v7&source=github" | tar -zx
-            sudo mv cf7 /usr/local/bin/cf
-            sudo chmod +x /usr/local/bin/cf
+      - cf-check
       - login-cloud-dot-gov:
           cf-password: <<parameters.cf-password>>
           cf-username: <<parameters.cf-username>>

diff --git a/.github/ISSUE_TEMPLATE/design-deliverable-issue-template.md b/.github/ISSUE_TEMPLATE/design-deliverable-issue-template.md
@@ -24,7 +24,7 @@ assignees: ''
 - [ ] Documentation work for the following has occurred:
    - [ ] Relevant User stories.
    - [ ] Recommended pa11y checks.
-   - [ ] Updating living UX documents, e.g. User Flows or Personas(if relevant).
+   - [ ] Updating living UX documents, e.g. User Flows, Personas, [Service Blueprint](https://www.figma.com/design/irgQPLTrajxCXNiYBTEnMV/TDP-Mockups-For-Feedback?node-id=9080-4762) (if relevant).
 - [ ] Internal Raft Review has occurred to ensure DoD standards and QA
 - [ ] Dev/Design sync has occurred; resulting tickets created
 - [ ] The design is usable and accessible, meaning it adheres to definition of done standards for design work.

diff --git a/scripts/cf-check.sh b/scripts/cf-check.sh
@@ -3,14 +3,20 @@ set -e
 if command -v cf /dev/null 2>&1; then
     echo The command cf is available
 else
-    apt-get update
-    apt-get install wget gnupg2 apt-transport-https
+    if [[ -f /bin/terraform ]]; then
+        echo "This is our Terraform executor, Alpine Linux v3.13"
+        apk update
+        apk add curl jq
+
+    else
+        apt-get update
+        apt-get install curl wget gnupg2 apt-transport-https jq
+    fi
 
     NEXUS_ARCHIVE="cf7-cli_7.7.13_linux_x86-64.tgz"
     NEXUS_URL="https://tdp-nexus.dev.raftlabs.tech/repository/tdp-bin/cloudfoundry-cli/$NEXUS_ARCHIVE"
     curl $NEXUS_URL -o $NEXUS_ARCHIVE  # prefers anonymous, use of -u failed.
     tar xzf $NEXUS_ARCHIVE
     mv ./cf7 /usr/local/bin/cf
     cf --version
-
 fi
diff --git a/scripts/sudo-check.sh b/scripts/sudo-check.sh
@@ -4,6 +4,12 @@ if command -v sudo /dev/null 2>&1; then
     echo The command sudo is available
 else
     echo The command sudo is not available installing...
-    apt-get update && apt-get install -y sudo
-    ls -al /bin/sh && sudo rm /bin/sh && sudo ln -s /bin/bash /bin/sh && ls -al /bin/sh
+    if [ -f /bin/terraform ]; then
+        echo "This is our Terraform executor, Alpine Linux v3.13"
+        apk update
+        apk add sudo
+    else
+        apt-get update && apt-get install -y sudo
+        ls -al /bin/sh && sudo rm /bin/sh && sudo ln -s /bin/bash /bin/sh && ls -al /bin/sh
+    fi
 fi