Update&fix notifier for new woodpecker version

src/discord_notifier/__main__.py

@@ -10,6 +10,13 @@ from urllib.parse import urljoin, urlparse
 from requests import Session
 from requests.models import Response
 
+logfile_webhook = DiscordWebhook(environ["PLUGIN_WEBHOOK_URL"], rate_limit_retry=True)
+logfile_webhook.username = "Woodpecker CI"
+logfile_webhook.avatar_url = "https://ci.shielddagger.com/favicons/favicon-dark-error.png"
+
+webhook = DiscordWebhook(environ["PLUGIN_WEBHOOK_URL"], rate_limit_retry=True)
+webhook.username = "Woodpecker CI"
+
 
 class APISession(Session):
     def __init__(self, base_url) -> None:
@@ -19,13 +26,44 @@ class APISession(Session):
     def request(self, method: str | bytes, url: str | bytes, *args, **kwargs) -> Response:
         url = urljoin(self.base_url, url)
         return super().request(method, url, *args, **kwargs)
+try:
+    ci_client = APISession(environ["PLUGIN_WOODPECKER_URL"].rstrip("/"))
+    ci_client.headers.setdefault("Authorization", f"Bearer {environ["PLUGIN_WOODPECKER_TOKEN"]}")
+except KeyError:
+    webhook.add_embed(DiscordEmbed(
+        "API Error",
+        "API access has not been configured.\n"\
+        "As a result, Discord Notifier is unable to retrieve job information like logs or status.\n"\
+        "Please use the `woodpecker_url` and `woodpecker_token` settings to allow API access.",
+        color="ED4345",
+        timestamp=datetime.now(UTC),
+        footer={
+            "text": "Discord Notifier",
+            "icon_url": "https://dev.shielddagger.com/repo-avatars/273e88fa2afde290121dc7b5987dc366b88325f147bf1e5766bca26296bbc1f9"
+        }
+    ))
+    webhook.execute()
+    exit(1)
 
-logfile_webhook = None
-webhook = DiscordWebhook(environ["PLUGIN_WEBHOOK_URL"], rate_limit_retry=True)
+pipeline_url = urlparse(environ["CI_PIPELINE_URL"]).path.lstrip("/").split("/")
+repo_id = pipeline_url[1]
+pipeline_number = pipeline_url[3]
 
-success = environ["CI_PIPELINE_STATUS"] != "failure"
+pipeline_info = ci_client.get(f"/api/repos/{repo_id}/pipelines/{pipeline_number}").json()
+success = None
+for workflow in pipeline_info["workflows"]:
+    if workflow["name"] != environ["CI_WORKFLOW_NAME"]:
+        continue
+    for step in workflow["children"]:
+        if step["state"] != "failure":
+            continue
+        loginfo = ci_client.get(f"/api/repos/{repo_id}/logs/{pipeline_number}/{step['id']}").json()
+        logdata = b""
+        for logline in loginfo:
+            logdata += b64decode(logline["data"]) + b"\n"
+        logfile_webhook.add_file(logdata, f"{step['name']}.ansi")
+    success = all(step["state"] != "failure" for step in workflow["children"])
 
-webhook.username = "Woodpecker CI"
 webhook.avatar_url = "https://ci.shielddagger.com/favicons/favicon-dark-success.png" if success else \
                      "https://ci.shielddagger.com/favicons/favicon-dark-error.png"
 
@@ -65,47 +103,10 @@ webhook.add_embed(DiscordEmbed(
     }]
 ))
 
-try:
-    if not success:
-        logfile_webhook = DiscordWebhook(environ["PLUGIN_WEBHOOK_URL"], rate_limit_retry=True)
-        logfile_webhook.username = "Woodpecker CI"
-        logfile_webhook.avatar_url = "https://ci.shielddagger.com/favicons/favicon-dark-error.png"
-        with APISession(environ["PLUGIN_WOODPECKER_URL"].rstrip("/")) as client:
-            client.headers.setdefault("Authorization", f"Bearer {environ["PLUGIN_WOODPECKER_TOKEN"]}")
-            
-            pipeline_url = urlparse(environ["CI_PIPELINE_URL"]).path.lstrip("/").split("/")
-            repo_id = pipeline_url[1]
-            pipeline_number = pipeline_url[3]
-            
-            pipeline_info = client.get(f"/api/repos/{repo_id}/pipelines/{pipeline_number}").json()
-            for workflow in pipeline_info["workflows"]:
-                if workflow["name"] != environ["CI_WORKFLOW_NAME"]:
-                    continue
-                for step in workflow["children"]:
-                    if step["state"] != "failure":
-                        continue
-                    loginfo = client.get(f"/api/repos/{repo_id}/logs/{pipeline_number}/{step['id']}").json()
-                    logdata = b""
-                    for logline in loginfo:
-                        logdata += b64decode(logline["data"]) + b"\n"
-                    logfile_webhook.add_file(logdata, f"{step['name']}.ansi")
-except KeyError:
-    webhook.add_embed(DiscordEmbed(
-        "API Error",
-        "API access has not been configured.\n"\
-        "As a result, Discord Notifier is unable to retrieve failed job logs to attach here.\n"\
-        "Please use the `woodpecker_url` and `woodpecker_token` settings to allow API access.",
-        color="ED4345",
-        timestamp=datetime.now(UTC),
-        footer={
-            "text": "Discord Notifier",
-            "icon_url": "https://dev.shielddagger.com/repo-avatars/273e88fa2afde290121dc7b5987dc366b88325f147bf1e5766bca26296bbc1f9"
-        }
-    ))
-
+        
 pprint(webhook.json)
 webhook.execute()
 
-if logfile_webhook is not None:
+if not success:
     pprint(logfile_webhook.json)
     logfile_webhook.execute()