From 12c37086fb22eaa238aa21a9e092e4a51e88bec6 Mon Sep 17 00:00:00 2001 From: Radek Golan Date: Wed, 24 Apr 2024 13:23:48 +0200 Subject: [PATCH] More API fixes --- .woodpecker/scans.yml | 2 +- src/discord_notifier/__main__.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.woodpecker/scans.yml b/.woodpecker/scans.yml index 6718c62..b1daf05 100644 --- a/.woodpecker/scans.yml +++ b/.woodpecker/scans.yml @@ -25,7 +25,7 @@ steps: settings: webhook_url: from_secret: discord_webhook - woodpecker_url: https://ci.shielddagger.com + woodpecker_url: https://ci.shielddagger.com/api woodpecker_token: from_secret: woodpecker_token icon_url: https://dev.shielddagger.com/repo-avatars/273e88fa2afde290121dc7b5987dc366b88325f147bf1e5766bca26296bbc1f9 diff --git a/src/discord_notifier/__main__.py b/src/discord_notifier/__main__.py index 4067b66..76e8331 100644 --- a/src/discord_notifier/__main__.py +++ b/src/discord_notifier/__main__.py @@ -16,7 +16,7 @@ class APISession(Session): super().__init__() def request(self, method: str | bytes, url: str | bytes, *args, **kwargs) -> Response: - url = urljoin(self.base_url, url) + url = self.base_url + url return super().request(method, url, *args, **kwargs) @@ -66,17 +66,17 @@ webhook.add_embed(DiscordEmbed( try: if not success: - with APISession(urljoin(environ["PLUGIN_WOODPECKER_URL"], "/api")) as client: + 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 - pipeline_info = client.get("./" + pipeline_url.lstrip("/")).json() + pipeline_info = client.get(pipeline_url).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 - logdata = client.get("./" + urljoin(pipeline_url, step["id"]).lstrip("/")) + logdata = client.get(urljoin(pipeline_url, step["id"])) webhook.add_file(logdata.content, f"{step['name']}.log") except KeyError: webhook.add_embed(DiscordEmbed(