Skip to content

Commit 12766b9

Browse files
committed
chore: add encoding
1 parent 991bf1b commit 12766b9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

.github/pre-req.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ sudo apt-get update
1010
sudo apt-get install apt-transport-https ca-certificates
1111
sudo apt-get install cf-cli
1212
#CF Login
13-
API_PASSWORD_DEC=$(echo $API_PASSWORD | openssl aes-256-cbc -d -a -pass pass:$ENCRYPT_KEY)
13+
API_PASSWORD_DEC=$(echo $API_PASSWORD | openssl aes-256-cbc -d -pbkdf2 -a -pass pass:$ENCRYPT_KEY)
1414
cf login --skip-ssl-validation -a $API_ENDPOINT -u $API_USER -p $API_PASSWORD_DEC
1515

1616
#Create splunk-ci org and space
@@ -27,7 +27,7 @@ fi
2727

2828
gem install cf-uaac
2929
uaac target $API_UAA_ENDPOINT --skip-ssl-validation
30-
API_CLIENT_PASSWORD_DEC=$(echo $API_CLIENT_PASSWORD | openssl aes-256-cbc -d -a -pass pass:$ENCRYPT_KEY)
30+
API_CLIENT_PASSWORD_DEC=$(echo $API_CLIENT_PASSWORD | openssl aes-256-cbc -d -pbkdf2 -a -pass pass:$ENCRYPT_KEY)
3131
uaac token client get $API_USER -s $API_CLIENT_PASSWORD_DEC
3232

3333
if [ $(uaac client get $CLIENT_ID | grep -woc $CLIENT_ID) -eq 0 ]; then

.github/update_manifest.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -e
33
#Set below params in github env variable settings
44
# API_ENDPOINT, API_USER, API_PASSWORD, SPLUNK_TOKEN, SPLUNK_HOST, SPLUNK_INDEX, SPLUNK_METRIC_INDEX
5-
API_PASSWORD_DEC=$(echo $API_PASSWORD | openssl aes-256-cbc -d -a -pass pass:$ENCRYPT_KEY)
5+
API_PASSWORD_DEC=$(echo $API_PASSWORD | openssl aes-256-cbc -d -pbkdf2 -a -pass pass:$ENCRYPT_KEY)
66
#Update manifest for deployment
77
sed -i 's@API_ENDPOINT:.*@'"API_ENDPOINT: $API_ENDPOINT"'@' scripts/ci_nozzle_manifest.yml
88
sed -i 's@API_USER:.*@'"API_USER: $API_USER"'@' scripts/ci_nozzle_manifest.yml

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ jobs:
112112
echo API_ENDPOINT="https://api.$(jq -r '.sys_domain' ./env.json)" >> "$GITHUB_OUTPUT"
113113
echo API_UAA_ENDPOINT="https://uaa.$(jq -r '.sys_domain' ./env.json)" >> "$GITHUB_OUTPUT"
114114
115-
echo API_PASSWORD="$(hammer -t ./env.json om credentials -- -p cf -t json -c .uaa.admin_credentials | jq -r '.password')" >> "$GITHUB_OUTPUT"
116-
echo $API_PASSWORD | openssl aes-256-cbc -a -salt -pass pass:$ENCRYPT_KEY
115+
API_PASSWORD="$(hammer -t ./env.json om credentials -- -p cf -t json -c .uaa.admin_credentials | jq -r '.password')"
116+
echo $API_PASSWORD | openssl aes-256-cbc -a -pbkdf2 -salt -pass pass:$ENCRYPT_KEY
117117
echo API_PASSWORD=$API_PASSWORD >> "$GITHUB_OUTPUT"
118118
119119
API_CLIENT_PASSWORD="$(hammer -t ./env.json om credentials -- -p cf -t json -c .uaa.admin_client_credentials | jq -r '.password')"
120-
echo $API_CLIENT_PASSWORD | openssl aes-256-cbc -a -salt -pass pass:$ENCRYPT_KEY
120+
echo $API_CLIENT_PASSWORD | openssl aes-256-cbc -a -pbkdf2 -salt -pass pass:$ENCRYPT_KEY
121121
echo API_CLIENT_PASSWORD=$API_CLIENT_PASSWORD >> "$GITHUB_OUTPUT"
122122
123123
echo ENV_ID=$ENV_ID >> "$GITHUB_OUTPUT"

0 commit comments

Comments
 (0)