Ensure argument --release_id for gl-gh-release is handled as int

Signed-off-by: Tobias Wolf <wolf@b1-systems.de>
On-behalf-of: SAP <tobias.wolf@sap.com>

Author: NotTheEvilOne

.github/actions/setup/action.yml

@@ -4,7 +4,7 @@ description: Installs the given GardenLinux Python library
 inputs:
   version:
     description: GardenLinux Python library version
-    default: "0.10.19"
+    default: "0.10.20"
   python_version:
     description: Python version to setup
     default: "3.13"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "gardenlinux"
-version = "0.10.19"
+version = "0.10.20"
 description = "Contains tools to work with the features directory of gardenlinux, for example deducting dependencies from feature sets or validating cnames"
 authors = ["Garden Linux Maintainers <contact@gardenlinux.io>"]
 license = "Apache-2.0"

src/gardenlinux/github/release/__main__.py

@@ -131,6 +131,7 @@ def get_parser() -> argparse.ArgumentParser:
 
     upload_parser.add_argument(
         "--release_id",
+        type=int,
         required=True,
         help="GitHub release ID to upload the file to (required).",
     )
@@ -149,7 +150,10 @@ def get_parser() -> argparse.ArgumentParser:
     )
 
     upload_parser.add_argument(
-        "--overwrite-same-name", action="store_true", default=False
+        "--overwrite-same-name",
+        action="store_true",
+        default=False,
+        help="Overwrite assets with the same name.",
     )
 
     return parser

tests/github/constants.py

@@ -1,10 +1,12 @@
 from ..constants import TEST_COMMIT, TEST_GARDENLINUX_RELEASE
 
+TEST_GARDENLINUX_RELEASE_ID = 1
+
 RELEASE_JSON = {
-    "url": "https://api.github.com/repos/gardenlinux/gardenlinux/releases/1",
+    "url": f"https://api.github.com/repos/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE_ID}",
     "html_url": f"https://github.com/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE}",
-    "assets_url": "https://api.github.com/repos/gardenlinux/gardenlinux/releases/1/assets",
-    "upload_url": "https://uploads.github.com/repos/gardenlinux/gardenlinux/releases/1/assets{?name,label}",
+    "assets_url": f"https://api.github.com/repos/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE_ID}/assets",
+    "upload_url": f"https://uploads.github.com/repos/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE_ID}/assets{{?name,label}}",
     "tarball_url": "https://api.github.com/repos/gardenlinux/gardenlinux/tarball/{TEST_GARDENLINUX_RELEASE}",
     "zipball_url": "https://api.github.com/repos/gardenlinux/gardenlinux/zipball/{TEST_GARDENLINUX_RELEASE}",
     "discussion_url": "https://github.com/gardenlinux/gardenlinux/discussions/1",

tests/github/test_github_script.py

@@ -8,7 +8,7 @@
 from gardenlinux.constants import GARDENLINUX_GITHUB_RELEASE_BUCKET_NAME
 
 from ..constants import TEST_GARDENLINUX_COMMIT, TEST_GARDENLINUX_RELEASE
-from .constants import RELEASE_JSON, REPO_JSON
+from .constants import RELEASE_JSON, REPO_JSON, TEST_GARDENLINUX_RELEASE_ID
 
 
 def test_script_parse_args_wrong_command(
@@ -145,7 +145,7 @@ def test_script_upload_needs_github_token(
                 "--repo",
                 "gardenlinux",
                 "--release_id",
-                TEST_GARDENLINUX_RELEASE,
+                str(TEST_GARDENLINUX_RELEASE_ID),
                 "--file_path",
                 str(artifact_for_upload),
                 "--dry-run",
@@ -190,7 +190,7 @@ def test_script_upload_dry_run(
         )
 
         m.get(
-            f"//api.github.com:443/repos/gardenlinux/gardenlinux/releases/tags/{TEST_GARDENLINUX_RELEASE}",
+            f"//api.github.com:443/repos/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE_ID}",
             json=RELEASE_JSON,
             status_code=200,
         )
@@ -206,7 +206,7 @@ def test_script_upload_dry_run(
                 "--repo",
                 "gardenlinux",
                 "--release_id",
-                TEST_GARDENLINUX_RELEASE,
+                str(TEST_GARDENLINUX_RELEASE_ID),
                 "--file_path",
                 str(artifact_for_upload),
                 "--dry-run",
@@ -237,23 +237,11 @@ def test_script_upload_inaccessible_file(
         )
 
         m.get(
-            "//api.github.com:443/repos/gardenlinux/gardenlinux/releases/1",
+            f"//api.github.com:443/repos/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE_ID}",
             json=RELEASE_JSON,
             status_code=200,
         )
 
-        m.get(
-            f"//api.github.com:443/repos/gardenlinux/gardenlinux/releases/tags/{TEST_GARDENLINUX_RELEASE}",
-            json=RELEASE_JSON,
-            status_code=200,
-        )
-
-        m.post(
-            f"//uploads.github.com:443/repos/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE}/assets?name=artifact.log",
-            text="{}",
-            status_code=201,
-        )
-
         monkeypatch.setattr(
             sys,
             "argv",
@@ -265,7 +253,7 @@ def test_script_upload_inaccessible_file(
                 "--repo",
                 "gardenlinux",
                 "--release_id",
-                TEST_GARDENLINUX_RELEASE,
+                str(TEST_GARDENLINUX_RELEASE_ID),
                 "--file_path",
                 str(artifact_for_upload),
             ],
@@ -289,19 +277,13 @@ def test_script_upload(
         )
 
         m.get(
-            "//api.github.com:443/repos/gardenlinux/gardenlinux/releases/1",
-            json=RELEASE_JSON,
-            status_code=200,
-        )
-
-        m.get(
-            f"//api.github.com:443/repos/gardenlinux/gardenlinux/releases/tags/{TEST_GARDENLINUX_RELEASE}",
+            f"//api.github.com:443/repos/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE_ID}",
             json=RELEASE_JSON,
             status_code=200,
         )
 
         m.post(
-            "//uploads.github.com:443/repos/gardenlinux/gardenlinux/releases/1/assets?label=&name=artifact.log",
+            f"//uploads.github.com:443/repos/gardenlinux/gardenlinux/releases/{TEST_GARDENLINUX_RELEASE_ID}/assets?label=&name=artifact.log",
             json={},
             status_code=201,
         )
@@ -317,7 +299,7 @@ def test_script_upload(
                 "--repo",
                 "gardenlinux",
                 "--release_id",
-                TEST_GARDENLINUX_RELEASE,
+                str(TEST_GARDENLINUX_RELEASE_ID),
                 "--file_path",
                 str(artifact_for_upload),
             ],