stackit-core 0.0.1a2__tar.gz → 0.1.0__tar.gz

{stackit_core-0.0.1a2 → stackit_core-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: stackit-core
-Version: 0.0.1a2
+Version: 0.1.0
 Summary: Core functionality for the STACKIT SDK for Python
 Author: STACKIT Developer Tools
 Author-email: developer-tools@stackit.cloud

{stackit_core-0.0.1a2 → stackit_core-0.1.0}/pyproject.toml

@@ -1,19 +1,15 @@
 [tool.poetry]
 name = "stackit-core"
-version = "v0.0.1a2"
-authors = [
-  "STACKIT Developer Tools <developer-tools@stackit.cloud>",
-]
+version = "v0.1.0"
+authors = ["STACKIT Developer Tools <developer-tools@stackit.cloud>"]
 description = "Core functionality for the STACKIT SDK for Python"
 readme = "README.md"
 classifiers = [
-    "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: Apache Software License",
-    "Operating System :: OS Independent",
-]
-packages = [
-  { include = "stackit", from="src" }
+  "Programming Language :: Python :: 3",
+  "License :: OSI Approved :: Apache Software License",
+  "Operating System :: OS Independent",
 ]
+packages = [{ include = "stackit", from = "src" }]
 
 
 [tool.poetry.dependencies]
@@ -29,8 +25,8 @@ requests = ">=2.32.3"
 black = ">=24.8.0"
 pytest = ">=8.3.3"
 flake8 = [
-  { version= ">=5.0.3", python="<3.12"},
-  { version= ">=6.0.1", python=">=3.12"}
+  { version = ">=5.0.3", python = "<3.12" },
+  { version = ">=6.0.1", python = ">=3.12" },
 ]
 flake8-black = ">=0.3.6"
 flake8-pyproject = ">=1.2.3"
@@ -51,12 +47,8 @@ requires = ["setuptools", "poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.pytest.ini_options]
-pythonpath = [
-    "src"
-]
-testpaths = [
-    "tests"
-]
+pythonpath = ["src"]
+testpaths = ["tests"]
 
 [tool.black]
 line-length = 120
@@ -83,7 +75,20 @@ exclude = """
 profile = 'black'
 
 [tool.flake8]
-exclude= [".eggs", ".git", ".hg", ".mypy_cache", ".tox", ".venv", ".devcontainer", "venv", "_build", "buck-out", "build", "dist"]
+exclude = [
+  ".eggs",
+  ".git",
+  ".hg",
+  ".mypy_cache",
+  ".tox",
+  ".venv",
+  ".devcontainer",
+  "venv",
+  "_build",
+  "buck-out",
+  "build",
+  "dist",
+]
 statistics = true
 show-source = false
 max-line-length = 120

{stackit_core-0.0.1a2 → stackit_core-0.1.0}/src/stackit/core/authorization.py

@@ -1,7 +1,7 @@
 import json
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any, Optional
+from typing import Optional
 
 from requests.auth import AuthBase
 
@@ -22,6 +22,7 @@ class Credentials:
         STACKIT_SERVICE_ACCOUNT_TOKEN: str = None,
         STACKIT_SERVICE_ACCOUNT_KEY_PATH: str = None,
         STACKIT_PRIVATE_KEY_PATH: str = None,
+        **kwargs,
     ):
         self.service_account_mail = STACKIT_SERVICE_ACCOUNT_EMAIL
         self.service_account_token = STACKIT_SERVICE_ACCOUNT_TOKEN
@@ -29,10 +30,6 @@ class Credentials:
         self.private_key_path = STACKIT_PRIVATE_KEY_PATH
 
 
-def either_this_or_that(this: Any, that: Any) -> Optional[Any]:
-    return this if this else that
-
-
 class Authorization:
     DEFAULT_CREDENTIALS_FILE_PATH = ".stackit/credentials.json"
     service_account_mail: Optional[str] = None
@@ -45,16 +42,26 @@ class Authorization:
 
     def __init__(self, configuration: Configuration):
         credentials = self.__read_credentials_file(configuration.credentials_file_path)
-        self.service_account_mail = either_this_or_that(
-            configuration.service_account_mail, credentials.service_account_mail
+        self.service_account_mail = (
+            configuration.service_account_mail
+            if configuration.service_account_mail is not None
+            else credentials.service_account_mail
+        )
+        self.service_account_token = (
+            configuration.service_account_token
+            if configuration.service_account_token is not None
+            else credentials.service_account_token
         )
-        self.service_account_token = either_this_or_that(
-            configuration.service_account_token, credentials.service_account_token
+        self.service_account_key_path = (
+            configuration.service_account_key_path
+            if configuration.service_account_key_path is not None
+            else credentials.service_account_key_path
         )
-        self.service_account_key_path = either_this_or_that(
-            configuration.service_account_key_path, credentials.service_account_key_path
+        self.private_key_path = (
+            configuration.private_key_path
+            if configuration.private_key_path is not None
+            else credentials.private_key_path
         )
-        self.private_key_path = either_this_or_that(configuration.private_key_path, credentials.private_key_path)
         self.auth_method = configuration.custom_auth
         self.token_endpoint = configuration.token_endpoint
         self.__read_keys()