chore: add encoding

Author: ajasnosz

.github/pre-req.sh

@@ -10,7 +10,8 @@ sudo apt-get update
 sudo apt-get install apt-transport-https ca-certificates
 sudo apt-get install cf-cli
 #CF Login
-cf login --skip-ssl-validation -a $API_ENDPOINT -u $API_USER -p $API_PASSWORD
+API_PASSWORD_DEC=$(echo $API_PASSWORD | openssl aes-256-cbc -d -a -pass pass:$ENCRYPT_KEY)
+cf login --skip-ssl-validation -a $API_ENDPOINT -u $API_USER -p $API_PASSWORD_DEC
 
 #Create splunk-ci org and space
 if [  "`cf o | grep "splunk-ci-org"`" == "splunk-ci-org" ]; then
@@ -26,7 +27,8 @@ fi
 
 gem install cf-uaac
 uaac target $API_UAA_ENDPOINT --skip-ssl-validation
-uaac token client get $API_USER -s $API_CLIENT_PASSWORD
+API_CLIENT_PASSWORD_DEC=$(echo $API_CLIENT_PASSWORD | openssl aes-256-cbc -d -a -pass pass:$ENCRYPT_KEY)
+uaac token client get $API_USER -s $API_CLIENT_PASSWORD_DEC
 
 if [ $(uaac client get $CLIENT_ID | grep -woc $CLIENT_ID) -eq 0 ]; then
   uaac client add $CLIENT_ID --name splunk-firehose --secret $CLIENT_SECRET --authorized_grant_types client_credentials,refresh_token --authorities doppler.firehose,cloud_controller.admin_read_only

.github/update_manifest.sh

@@ -2,10 +2,11 @@
 set -e
 #Set below params in github env variable settings
 # API_ENDPOINT, API_USER, API_PASSWORD, SPLUNK_TOKEN, SPLUNK_HOST, SPLUNK_INDEX, SPLUNK_METRIC_INDEX
+API_PASSWORD_DEC=$(echo $API_PASSWORD | openssl aes-256-cbc -d -a -pass pass:$ENCRYPT_KEY)
 #Update manifest for deployment
 sed -i 's@API_ENDPOINT:.*@'"API_ENDPOINT: $API_ENDPOINT"'@' scripts/ci_nozzle_manifest.yml
 sed -i 's@API_USER:.*@'"API_USER: $API_USER"'@' scripts/ci_nozzle_manifest.yml
-sed -i 's@API_PASSWORD:.*@'"API_PASSWORD: $API_PASSWORD"'@' scripts/ci_nozzle_manifest.yml
+sed -i 's@API_PASSWORD:.*@'"API_PASSWORD: $API_PASSWORD_DEC"'@' scripts/ci_nozzle_manifest.yml
 sed -i 's@CLIENT_ID:.*@'"CLIENT_ID: $CLIENT_ID"'@' scripts/ci_nozzle_manifest.yml
 sed -i 's@CLIENT_SECRET:.*@'"CLIENT_SECRET: $CLIENT_SECRET"'@' scripts/ci_nozzle_manifest.yml
 sed -i 's@SPLUNK_HOST:.*@'"SPLUNK_HOST: $SPLUNK_HOST"'@' scripts/ci_nozzle_manifest.yml

.github/workflows/main.yml

@@ -70,7 +70,6 @@ jobs:
       API_PASSWORD: ${{ steps.get-credentials.outputs.API_PASSWORD }}
       API_CLIENT_PASSWORD: ${{ steps.get-credentials.outputs.API_CLIENT_PASSWORD }}
       ENV_ID: ${{ steps.get-credentials.outputs.ENV_ID }}
-      AUTH_TOKEN: ${{ steps.get-credentials.outputs.AUTH_TOKEN }}
     steps:
       - name: Install Selfservice
         run: |
@@ -87,9 +86,7 @@ jobs:
 
       - name: Claim environment and wait
         run: |
-          ENV_ID="5092" 
-          echo "::add-mask::$ENV_ID"
-          echo ENV_ID=$ENV_ID >> "$GITHUB_ENV"
+          echo ENV_ID="$(./selfservice claimAndWait isv_ci_tas_srt_4_0 | jq -r '.id')" >> "$GITHUB_ENV"
 
       - name: Set up Go
         uses: actions/setup-go@v3
@@ -112,25 +109,20 @@ jobs:
         id: get-credentials
         run: |
           ./selfservice get $ENV_ID | jq -r '.credentials' > env.json
+          echo API_ENDPOINT="https://api.$(jq -r '.sys_domain' ./env.json)" >> "$GITHUB_OUTPUT"
+          echo API_UAA_ENDPOINT="https://uaa.$(jq -r '.sys_domain' ./env.json)" >> "$GITHUB_OUTPUT"
           
-          API_ENDPOINT="https://api.$(jq -r '.sys_domain' ./env.json)" 
-          echo "::add-mask::$API_ENDPOINT"
-          echo API_ENDPOINT=$API_ENDPOINT >> "$GITHUB_OUTPUT"
-          
-          API_UAA_ENDPOINT="https://uaa.$(jq -r '.sys_domain' ./env.json)"
-          echo "::add-mask::$API_UAA_ENDPOINT"
-          echo API_UAA_ENDPOINT=$API_UAA_ENDPOINT >> "$GITHUB_OUTPUT"
-          
-          API_PASSWORD="$(hammer -t ./env.json om credentials -- -p cf -t json -c .uaa.admin_credentials | jq -r '.password')"
-          echo "::add-mask::$API_PASSWORD"
+          echo API_PASSWORD="$(hammer -t ./env.json om credentials -- -p cf -t json -c .uaa.admin_credentials | jq -r '.password')" >> "$GITHUB_OUTPUT"
+          echo $API_PASSWORD | openssl aes-256-cbc -a -salt -pass pass:$ENCRYPT_KEY
           echo API_PASSWORD=$API_PASSWORD >> "$GITHUB_OUTPUT"
           
           API_CLIENT_PASSWORD="$(hammer -t ./env.json om credentials -- -p cf -t json -c .uaa.admin_client_credentials | jq -r '.password')"
-          echo "::add-mask::$API_CLIENT_PASSWORD"
+          echo $API_CLIENT_PASSWORD | openssl aes-256-cbc -a -salt -pass pass:$ENCRYPT_KEY
           echo API_CLIENT_PASSWORD=$API_CLIENT_PASSWORD >> "$GITHUB_OUTPUT"
           
           echo ENV_ID=$ENV_ID >> "$GITHUB_OUTPUT"
-          echo AUTH_TOKEN="$AUTH_TOKEN" >> "$GITHUB_OUTPUT"
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
 
 
   build:
@@ -176,7 +168,6 @@ jobs:
       API_PASSWORD: ${{ needs.create-env.outputs.API_PASSWORD  }}
       API_CLIENT_PASSWORD: ${{ needs.create-env.outputs.API_CLIENT_PASSWORD  }}
       API_UAA_ENDPOINT: ${{ needs.create-env.outputs.API_UAA_ENDPOINT  }}
-      AUTH_TOKEN: ${{ needs.create-env.outputs.AUTH_TOKEN  }}
       API_USER: ${{ secrets.API_USER  }}
       CLIENT_ID: ${{ secrets.CLIENT_ID  }}
       CLIENT_SECRET: ${{ secrets.CLIENT_SECRET  }}
@@ -190,6 +181,10 @@ jobs:
       - create-env
     runs-on: ubuntu-latest
     steps:
+      - name: Mask environments
+        run: |
+          echo "::add-mask::$API_PASSWORD"
+          echo "::add-mask::$API_CLIENT_PASSWORD"
 
       - name:  Checkout
         uses: actions/checkout@v3
@@ -223,6 +218,8 @@ jobs:
           .github/pre-req.sh
           cf push -f scripts/ci_nozzle_manifest.yml -u process --random-route
           cf apps
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
 
         # Nozzle Log
       - name: Nozzle Log
@@ -236,7 +233,6 @@ jobs:
       API_PASSWORD: ${{ needs.create-env.outputs.API_PASSWORD  }}
       API_CLIENT_PASSWORD: ${{ needs.create-env.outputs.API_CLIENT_PASSWORD  }}
       API_UAA_ENDPOINT: ${{ needs.create-env.outputs.API_UAA_ENDPOINT  }}
-      AUTH_TOKEN: ${{ needs.create-env.outputs.AUTH_TOKEN  }}
       API_USER: ${{ secrets.API_USER  }}
       CLIENT_ID: ${{ secrets.CLIENT_ID  }}
       CLIENT_SECRET: ${{ secrets.CLIENT_SECRET  }}
@@ -299,7 +295,6 @@ jobs:
       API_PASSWORD: ${{ needs.create-env.outputs.API_PASSWORD  }}
       API_CLIENT_PASSWORD: ${{ needs.create-env.outputs.API_CLIENT_PASSWORD  }}
       API_UAA_ENDPOINT: ${{ needs.create-env.outputs.API_UAA_ENDPOINT  }}
-      AUTH_TOKEN: ${{ needs.create-env.outputs.AUTH_TOKEN  }}
       API_USER: ${{ secrets.API_USER  }}
       CLIENT_ID: ${{ secrets.CLIENT_ID  }}
       CLIENT_SECRET: ${{ secrets.CLIENT_SECRET  }}
@@ -346,6 +341,8 @@ jobs:
           cf push -f scripts/data_gen_manifest.yml -u process -p tools/data_gen --random-route
           sleep 10
           cf apps
+        env:
+          ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }}
 
       # Nozzle Log
       - name: Nozzle Log
@@ -393,6 +390,6 @@ jobs:
           echo "$(./selfservice auth $API_TOKEN  | cut -c 8-)" >> "$GITHUB_ENV"
         env:
           API_TOKEN: ${{ secrets.API_TOKEN }}
-#      - name: release environment
-#        run: |
-#          ./selfservice release $ENV_ID
+      - name: release environment
+        run: |
+          ./selfservice release $ENV_ID