Skip to content

Commit 7a7b087

Browse files
committed
use env file
1 parent 7258c2f commit 7a7b087

File tree

2 files changed

+23
-5
lines changed

2 files changed

+23
-5
lines changed

.github/workflows/zhook.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,32 @@ jobs:
5858
&& ((github.event_name != 'pull_request_review')
5959
|| (github.event_name == 'pull_request_review' && github.event.review.state == 'approved'))
6060
shell: bash
61+
env:
62+
INPUT_ZITIID: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
63+
INPUT_WEBHOOKURL: ${{ secrets.ZHOOK_URL_DEV_NOTIFICATIONS }}
64+
INPUT_EVENTJSON: ${{ toJson(github.event) }}
65+
INPUT_SENDERUSERNAME: GitHubZ
66+
INPUT_SENDERICONURL: https://github.com/fluidicon.png
67+
INPUT_ZITILOGLEVEL: 6
6168
run: |
6269
set -o pipefail
6370
set -o xtrace
71+
72+
# Create environment file for Docker
73+
cat > /tmp/docker.env << 'EOF'
74+
INPUT_ZITIID=${INPUT_ZITIID}
75+
INPUT_WEBHOOKURL=${INPUT_WEBHOOKURL}
76+
INPUT_EVENTJSON=${INPUT_EVENTJSON}
77+
INPUT_SENDERUSERNAME=${INPUT_SENDERUSERNAME}
78+
INPUT_SENDERICONURL=${INPUT_SENDERICONURL}
79+
INPUT_ZITILOGLEVEL=${INPUT_ZITILOGLEVEL}
80+
EOF
81+
6482
docker build -t zhook-action .
6583
docker run --rm \
6684
-v "${{ github.workspace }}:${{ github.workspace }}" \
6785
-w "${{ github.workspace }}" \
68-
-e "INPUT_ZITIID=${{ secrets.ZITI_MATTERMOST_IDENTITY }}" \
69-
-e "INPUT_WEBHOOKURL=${{ secrets.ZHOOK_URL_DEV_NOTIFICATIONS }}" \
70-
-e "INPUT_EVENTJSON=${{ toJson(github.event) }}" \
71-
-e "INPUT_SENDERUSERNAME=GitHubZ" \
72-
-e "INPUT_ZITILOGLEVEL=6" \
86+
--env-file /tmp/docker.env \
7387
--entrypoint /bin/sh \
7488
zhook-action -xc "
7589
ulimit -c unlimited

zhook.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,10 @@ def dumpJson(self):
354354
icon = os.getenv("INPUT_SENDERICONURL")
355355
actionRepo = os.getenv("GITHUB_ACTION_REPOSITORY")
356356
eventName = os.getenv("GITHUB_EVENT_NAME")
357+
zitiLogLevel = os.getenv("INPUT_ZITILOGLEVEL")
358+
if zitiLogLevel is not None:
359+
os.environ["ZITI_LOG"] = zitiLogLevel
360+
os.environ["TLSUV_DEBUG"] = zitiLogLevel
357361

358362
# Setup Ziti identity
359363
zitiJwt = os.getenv("INPUT_ZITIJWT")

0 commit comments

Comments
 (0)