From ff6ef9f26aea9cefdd84d5491ef38a7cb8a66eb3 Mon Sep 17 00:00:00 2001 From: Ryan Ahearn Date: Fri, 27 Jan 2023 14:28:17 -0500 Subject: [PATCH 1/2] Tweak tail & jq usage to parse cf-cli@8 output --- terraform/create_service_account.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/create_service_account.sh b/terraform/create_service_account.sh index d69a90796..0ac5b0844 100755 --- a/terraform/create_service_account.sh +++ b/terraform/create_service_account.sh @@ -67,7 +67,7 @@ cf create-service cloud-gov-service-account $role $service 1>&2 cf create-service-key $service service-account-key 1>&2 # output service key to stdout in secrets.auto.tfvars format -creds=`cf service-key $service service-account-key | tail -n 4` +creds=`cf service-key $service service-account-key | tail -n +2 | jq '.credentials'` username=`echo $creds | jq -r '.username'` password=`echo $creds | jq -r '.password'` From 873c9caf219be99f6d0d55f8939e40900bbaf614 Mon Sep 17 00:00:00 2001 From: Ryan Ahearn Date: Fri, 27 Jan 2023 14:54:29 -0500 Subject: [PATCH 2/2] Add cf-cli version check to create_service_account --- terraform/create_service_account.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/terraform/create_service_account.sh b/terraform/create_service_account.sh index 0ac5b0844..cee07591e 100755 --- a/terraform/create_service_account.sh +++ b/terraform/create_service_account.sh @@ -18,9 +18,16 @@ Options: -o : configure the organization to act on. Default: $org Notes: -OrgManager is required for terraform to create -egress spaces +* OrgManager is required for terraform to create -egress spaces +* Requires cf-cli@8 " +cf_version=`cf --version | cut -d " " -f 3` +if [[ $cf_version != 8.* ]]; then + echo "$usage" + exit 1 +fi + set -e set -o pipefail