csspin-python 3.1.0__py3-none-any.whl → 3.1.1__py3-none-any.whl

csspin_python/python.py

@@ -159,33 +159,12 @@ defaults = config(
         key_duration=3600 * 10,  # 10 hours
         static_oidc=False,
         index="16.0/simple",
+        # Need to set client secret to empty string, otherwise the string "None"
+        # would be handled as secret and obfucsated in logs.
+        client_secret="",  # nosec: B106
     ),
     index_url="https://pypi.org/simple",
-    requires=config(
-        python=["build", "wheel"],
-        system=config(
-            debian=config(
-                apt=[
-                    "build-essential",
-                    "curl",
-                    "git",
-                    "libbz2-dev",
-                    "libffi-dev",
-                    "libkrb5-dev",
-                    "liblzma-dev",
-                    "libncursesw5-dev",
-                    "libreadline-dev",
-                    "libsqlite3-dev",
-                    "libssl-dev",
-                    "libxml2-dev",
-                    "libxmlsec1-dev",
-                    "make",
-                    "xz-utils",
-                    "zlib1g-dev",
-                ]
-            )
-        ),
-    ),
+    requires=config(python=["build", "wheel"]),
 )
 
 
@@ -1018,7 +997,9 @@ def _obfuscate_index_url(index_url: str) -> None:
     secrets.add(index_url.split(":")[2].split("@")[0])  # Codeartifact token
 
 
-def _check_aws_token_validity(cfg: ConfigTree) -> None:
+def _check_aws_token_validity(  # pylint: disable=too-many-locals
+    cfg: ConfigTree,
+) -> None:
     """
     If csspin-python[aws_auth] is installed, we can use csaccess to get the
     CodeArtifact authentication token.
@@ -1034,6 +1015,17 @@ def _check_aws_token_validity(cfg: ConfigTree) -> None:
 
     import time
 
+    if not (
+        client_secret := (
+            interpolate1(cfg.python.aws_auth.client_secret)
+            or os.getenv("CS_AWS_OIDC_CLIENT_SECRET")
+        )
+    ):
+        die(
+            "Please provide a client secret for CodeArtifact access via"
+            " 'python.aws_auth.client_secret'."
+        )
+
     current_time = int(time.time())
     timestamp_key = "aws_auth_timestamp"
 
@@ -1059,18 +1051,24 @@ def _check_aws_token_validity(cfg: ConfigTree) -> None:
                 memo.items().remove(item)
         else:
             info("Updating Codeartifact token.")
+            from urllib.error import HTTPError
             from urllib.parse import urljoin
 
             opts = {
+                "client_secret": client_secret,
                 "static_oidc": interpolate1(cfg.python.aws_auth.static_oidc).lower()
-                == "true"
+                == "true",
             }
             if cfg.python.aws_auth.client_id:
                 opts["client_id"] = interpolate1(cfg.python.aws_auth.client_id)
             if cfg.python.aws_auth.role_arn:
                 opts["aws_role_arn"] = interpolate1(cfg.python.aws_auth.role_arn)
 
-            index_base_url = get_ca_pypi_url_programmatic(**opts)
+            try:
+                index_base_url = get_ca_pypi_url_programmatic(**opts)
+            except HTTPError as e:
+                die(f"Failed to establish CodeArtifact connection: {e}")
+
             index_url = urljoin(
                 index_base_url + "/", interpolate1(cfg.python.aws_auth.index)
             )

csspin_python/python_schema.yaml

@@ -148,10 +148,15 @@ python:
                         CodeArtifact.
                 index:
                     type: str
-                    help: The Codeartifact repository index (e.g. "16.0/simple").
+                    help: The CodeArtifact repository index (e.g. "16.0/simple").
                 client_id:
                     type: str
                     help: The OIDC client ID to use.
+                client_secret:
+                    type: secret
+                    help: |
+                        The OIDC client secret to use, defaults to the
+                        environment variable 'CS_AWS_OIDC_CLIENT_SECRET'.
                 role_arn:
                     type: str
                     help: The role ARN to assume when authenticating.

csspin_python/uv_provisioner.py

@@ -180,7 +180,7 @@ def _update_index_url_in_toml(cfg: ConfigTree) -> None:
     """
     Update the index-url in the uv.toml in case it changed.
     """
-    if (uv_toml_path := interpolate1(cfg.uv_provisioner.uv_toml_path)).exists():
+    if (uv_toml_path := interpolate1(Path(cfg.uv_provisioner.uv_toml_path))).exists():
         with open(uv_toml_path, mode="r+b") as fd:
             toml_content = tomllib.load(fd)
             if toml_content.get("index-url") != cfg.python.index_url:

{csspin_python-3.1.0.dist-info → csspin_python-3.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csspin-python
-Version: 3.1.0
+Version: 3.1.1
 Summary: Plugin-package for csspin providing Python related plugins
 Author-email: CONTACT Software GmbH <info@contact-software.com>
 Maintainer-email: Waleri Enns <waleri.enns@contact-software.com>, Benjamin Thomas Schwertfeger <benjaminthomas.schwertfeger@contact-software.com>, Fabian Hafer <fabian.hafer@contact-software.com>

{csspin_python-3.1.0.dist-info → csspin_python-3.1.1.dist-info}/RECORD

@@ -8,14 +8,14 @@ csspin_python/playwright.py,sha256=oFfphLqa4AB6K9vasCUFHN0kFXu63n3ocrsqVuRp4-0,5
 csspin_python/playwright_schema.yaml,sha256=TSeR16YHa7m7bfO59F2eMV-jXcglluTJdEpUeL16saY,1178
 csspin_python/pytest.py,sha256=pTOb5zFd9RINZwJsHNaRuSGVDkPMABzaAhwpAJo1nQE,4574
 csspin_python/pytest_schema.yaml,sha256=tzXtdF6MvGC9v59EVRJFfLeMMHqPsXcFXy2zJtRECBI,1535
-csspin_python/python.py,sha256=Hht9TcBhIcHU4PdicB5W7s-9OYepUnxK1bdpxzob1Ro,34697
-csspin_python/python_schema.yaml,sha256=J9GEr5023cUHvfvSRiD1572eSVvfXt8-XEk9uhowhlc,5939
+csspin_python/python.py,sha256=32L4S6fKMWh5tbU-Rv5l6NVqrjjPLAiL25cB5gfeiC4,34784
+csspin_python/python_schema.yaml,sha256=_EBDglOM9AuXOvYUjFRJkUmtezCHcObEYmO64f-FOHI,6176
 csspin_python/radon.py,sha256=uFqm6FEi5oWj-_XVaAm3s9cam0cUmr1_FwRf40K6xWs,1876
 csspin_python/radon_schema.yaml,sha256=rlRzXw5z4XbjOVznRiUxWGP4E9hx1Jm-gGw1iQiYzE0,548
-csspin_python/uv_provisioner.py,sha256=8d_24xyofO_6wU7bkomAH1FfY6P_Am0Yy6CXbzLxWN4,5993
+csspin_python/uv_provisioner.py,sha256=MGedx4e286ZE1miwh70y6b3wePw3mmc0m1kG6H_738I,5999
 csspin_python/uv_provisioner_schema.yaml,sha256=Y8ZNC2OMnhR8Us3WUXAXK9hMjqGWAKFJB2puX4X5XNQ,727
-csspin_python-3.1.0.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
-csspin_python-3.1.0.dist-info/METADATA,sha256=YIDI67iYHouz4I8dVqCkMtcpXgQTXqmXlz3yUwjbeaM,4715
-csspin_python-3.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-csspin_python-3.1.0.dist-info/top_level.txt,sha256=QSeglMEGbFu1z4L6MCQYwo01NgL0KojWvC4rzgMQ8gU,14
-csspin_python-3.1.0.dist-info/RECORD,,
+csspin_python-3.1.1.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
+csspin_python-3.1.1.dist-info/METADATA,sha256=OsIblHbaQVC9ybAydVQ1L-YEzqKtzw3qyJZnXqc-nZs,4715
+csspin_python-3.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+csspin_python-3.1.1.dist-info/top_level.txt,sha256=QSeglMEGbFu1z4L6MCQYwo01NgL0KojWvC4rzgMQ8gU,14
+csspin_python-3.1.1.dist-info/RECORD,,