From 23a4ef7dc7342c4fa1153ac979d62756de9cdce6 Mon Sep 17 00:00:00 2001
From: andrew-jameson <ajameson@teamraft.com>
Date: Wed, 4 Dec 2024 12:08:16 -0500
Subject: [PATCH 1/2] Standardizing on use of cf-check on older workflow

---
 .circleci/deployment/commands.yml | 11 +----------
 scripts/cf-check.sh               |  2 +-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml
index d1aa82b7d..6bbf55543 100644
--- a/.circleci/deployment/commands.yml
+++ b/.circleci/deployment/commands.yml
@@ -285,16 +285,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/scripts/cf-check.sh b/scripts/cf-check.sh
index 5a2c84be7..8e0c5872b 100755
--- a/scripts/cf-check.sh
+++ b/scripts/cf-check.sh
@@ -4,7 +4,7 @@ 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
+    apt-get install wget gnupg2 apt-transport-https jq
 
     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"

From a9543910fa69014e7b1cf171b8a2b60abcbd9ff2 Mon Sep 17 00:00:00 2001
From: andrew-jameson <ajameson@teamraft.com>
Date: Wed, 4 Dec 2024 12:09:18 -0500
Subject: [PATCH 2/2] Standardizing use of cf-check on older workflows

---
 .circleci/deployment/commands.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.circleci/deployment/commands.yml b/.circleci/deployment/commands.yml
index 6bbf55543..180d0847e 100644
--- a/.circleci/deployment/commands.yml
+++ b/.circleci/deployment/commands.yml
@@ -226,15 +226,7 @@
         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
+      - cf-check
       - login-cloud-dot-gov:
           cf-password: <<parameters.cf-password>>
           cf-username: <<parameters.cf-username>>