Skip to content

Commit 95e8d47

Browse files
CR-12940-poor-env (#55)
* CR-12940 use solution of : -e var Co-authored-by: Saffi <saffi.hartal@codefresh.io>
1 parent b2302e3 commit 95e8d47

File tree

4 files changed

+18
-35
lines changed

4 files changed

+18
-35
lines changed

action.yaml

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ inputs:
44
VERSION:
55
description: specify client version
66
required: false
7-
default: 0.0.71
7+
default: 0.0.80
88
CF_API_KEY:
99
description: "Codefresh API KEY"
1010
required: true
@@ -144,19 +144,22 @@ runs:
144144

145145
run: |
146146
# add defaults
147-
CF_GIT_BRANCH="${CF_GIT_BRANCH:-$CF_GITHUB_REF_NAME}"
148-
CF_GIT_REPO="${CF_GIT_REPO:-$CF_GITHUB_REPOSITORY}"
147+
export CF_GIT_BRANCH="${CF_GIT_BRANCH:-$CF_GITHUB_REF_NAME}"
148+
export CF_GIT_REPO="${CF_GIT_REPO:-$CF_GITHUB_REPOSITORY}"
149149
# built vars
150-
CF_WORKFLOW_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
151-
CF_GIT_PROVIDER="${CF_GIT_PROVIDER:-github}"
152-
CF_CI_TYPE=github-actions
150+
export CF_WORKFLOW_URL="${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
151+
export CF_GIT_PROVIDER="${CF_GIT_PROVIDER:-github}"
152+
export CF_CI_TYPE=github-actions
153153
154-
env>cf_env
155-
echo "CF_CI_TYPE=$CF_CI_TYPE" >> cf_env
156-
echo "CF_WORKFLOW_URL=$CF_WORKFLOW_URL" >> cf_env
157-
echo "CF_GIT_PROVIDER=${CF_GIT_PROVIDER}" >> cf_env
158-
# EXTERNAL_ENV=$(jq -n 'env'|base64)
159-
echo "EXTERNAL_ENV=$EXTERNAL_ENV">>cf_env
154+
# convert env vars to -e var1 -e var 2 string
155+
KEYS=($(jq -n 'env' -S -M -c | jq 'keys' -M -c))
156+
arr=()
157+
for i in $(echo $KEYS | tr "[" "\n" | tr "]" "\n" | tr '"' '\n' | tr "," "\n")
158+
do
159+
if [[ $i == CF_* ]]
160+
then
161+
arr+=" -e $i "
162+
fi
163+
done
160164
161-
docker run --env-file=cf_env "quay.io/codefresh/codefresh-report-image:$VERSION"
162-
165+
docker run $arr "quay.io/codefresh/codefresh-report-image:$VERSION"

service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
name: csdp-report-image
2-
version: 0.0.71
2+
version: 0.0.80
33

src/__tests__/external.spec.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/validate.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
import { errors } from './utils'
2-
import { atob } from 'buffer'
32

43
/**
54
* Validate mandatory env vars. address host default
65
*/
76
export function validate(payload: Record<string, string|undefined>): Record<string, string|undefined> {
8-
if (payload['EXTERNAL_ENV']) {
9-
try {
10-
payload = JSON.parse(atob(payload['EXTERNAL_ENV']))
11-
} catch (error) {
12-
console.log(`could not handle ${JSON.stringify(payload['EXTERNAL_ENV'])} , Error ${JSON.stringify(error)} `)
13-
}
14-
}
157
const filtered = filterEnvVarPattern(payload)
168
const messages: string[] = []
179
if (!filtered['CF_API_KEY']) {

0 commit comments

Comments
 (0)