Merge pull request #17 from openziti/fix-loading

fix loading of ziti identity

Author: ekoby

.github/workflows/python.yml

@@ -5,12 +5,12 @@ jobs:
     name: Lint
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Python 3.10
-        uses: actions/setup-python@v1
+      - name: Set up Python 3.12
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.10"
+          python-version: "3.12"
 
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Lint
         run: |

.github/workflows/zhook.yml

@@ -20,8 +20,26 @@ jobs:
     runs-on: ubuntu-latest
     name: POST Webhook
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
+      - name: run hook directly
+        if: |
+          github.repository_owner == 'openziti'
+          && ((github.event_name != 'pull_request_review')
+          || (github.event_name == 'pull_request_review' && github.event.review.state == 'approved'))
+        env:
+          INPUT_ZITIID: ${{ secrets.ZITI_MATTERMOST_IDENTITY }}
+          INPUT_WEBHOOKURL: ${{ secrets.ZHOOK_URL }}
+          INPUT_EVENTJSON: ${{ toJson(github.event) }}
+          INPUT_SENDERUSERNAME: GitHubZ
+          INPUT_DESTCHANNEL: dev-notifications
+          INPUT_SENDERICONURL: https://github.com/fluidicon.png
+        run: |
+          pip install --upgrade requests openziti
+          python ./zhook.py
+          
+
       - uses: ./  # use self to bring the pain forward
+        name: run action
         if: |
           github.repository_owner == 'openziti'
           && ((github.event_name != 'pull_request_review')

Dockerfile

@@ -2,10 +2,10 @@ FROM python:3-slim AS builder
 ADD . /app
 WORKDIR /app
 
-RUN pip install --target=/app requests openziti==0.7.2
+RUN pip install --target=/app requests openziti
 
 # https://github.com/GoogleContainerTools/distroless
-FROM gcr.io/distroless/python3-debian10
+FROM gcr.io/distroless/python3-debian12
 COPY --from=builder /app /app
 WORKDIR /app
 ENV PYTHONPATH /app

zhook.py

@@ -86,7 +86,7 @@ def createTitle(self):
     # starCount = self.repoJson["stargazers_count"]
     # starUrl = f"{repoUrl}/stargazers"
 
-    title = f"{self.eventName.capitalize().replace('_',' ')}"
+    title = f"{self.eventName.capitalize().replace('_', ' ')}"
 
     try:
       action = self.eventJson["action"]
@@ -344,7 +344,7 @@ def addWatchDetails(self):
   def addDefaultDetails(self):
     self.attachment["color"] = self.todoColor
     self.attachment["text"] = self.createTitle()
-    self.attachment["fallback"] = f"{eventName.capitalize().replace('_',' ')} by {self.senderJson['login']} in {self.repoJson['full_name']}"
+    self.attachment["fallback"] = f"{eventName.capitalize().replace('_', ' ')} by {self.senderJson['login']} in {self.repoJson['full_name']}"
 
   def dumpJson(self):
     return json.dumps(self.body)
@@ -362,9 +362,9 @@ def dumpJson(self):
 
   # Setup Ziti identity
   idFilename = "id.json"
-  os.environ["ZITI_IDENTITIES"] = idFilename
   with open(idFilename, 'w') as f:
     f.write(zitiId)
+    openziti.load(idFilename)
 
   # Create webhook body
   try: