kiarina-lib-google-auth 1.6.2__py3-none-any.whl → 1.6.3__py3-none-any.whl

kiarina/lib/google/auth/_helpers/get_credentials.py

@@ -19,7 +19,7 @@ def get_credentials(
     cache: CredentialsCache | None = None,
 ) -> Credentials:
     if settings is None:
-        settings = settings_manager.get_settings_by_key(config_key)
+        settings = settings_manager.get_settings(config_key)
 
     credentials: Credentials
 

kiarina/lib/google/auth/settings.py

@@ -12,6 +12,34 @@ class GoogleAuthSettings(BaseSettings):
 
     type: Literal["default", "service_account", "user_account"] = "default"
 
+    # --------------------------------------------------
+    # Fields (common)
+    # --------------------------------------------------
+
+    project_id: str | None = None
+
+    impersonate_service_account: str | None = None
+    """
+    Email address of the service account to impersonate
+
+    The source principal requires the roles/iam.serviceAccountTokenCreator role.
+    Note that this required permission is not included in the roles/owner role.
+    """
+
+    scopes: list[str] = Field(
+        default_factory=lambda: [
+            "https://www.googleapis.com/auth/cloud-platform",  # All GCP resources
+            "https://www.googleapis.com/auth/drive",  # Google Drive resources
+            "https://www.googleapis.com/auth/spreadsheets",  # Google Sheets resources
+        ]
+    )
+    """
+    List of scopes to request during the authentication
+
+    Specify the scopes required for impersonation authentication.
+    Specify the scopes required for user account authentication.
+    """
+
     # --------------------------------------------------
     # Fields (service_account)
     # --------------------------------------------------
@@ -48,34 +76,6 @@ class GoogleAuthSettings(BaseSettings):
     Refreshed credentials will be cached.
     """
 
-    # --------------------------------------------------
-    # Fields (common)
-    # --------------------------------------------------
-
-    impersonate_service_account: str | None = None
-    """
-    Email address of the service account to impersonate
-
-    The source principal requires the roles/iam.serviceAccountTokenCreator role.
-    Note that this required permission is not included in the roles/owner role.
-    """
-
-    scopes: list[str] = Field(
-        default_factory=lambda: [
-            "https://www.googleapis.com/auth/cloud-platform",  # All GCP resources
-            "https://www.googleapis.com/auth/drive",  # Google Drive resources
-            "https://www.googleapis.com/auth/spreadsheets",  # Google Sheets resources
-        ]
-    )
-    """
-    List of scopes to request during the authentication
-
-    Specify the scopes required for impersonation authentication.
-    Specify the scopes required for user account authentication.
-    """
-
-    project_id: str | None = None
-
     # --------------------------------------------------
     # Validators
     # --------------------------------------------------

{kiarina_lib_google_auth-1.6.2.dist-info → kiarina_lib_google_auth-1.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kiarina-lib-google-auth
-Version: 1.6.2
+Version: 1.6.3
 Summary: Google Cloud client library for kiarina namespace
 Project-URL: Homepage, https://github.com/kiarina/kiarina-python
 Project-URL: Repository, https://github.com/kiarina/kiarina-python
@@ -21,7 +21,7 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
 Requires-Python: >=3.12
 Requires-Dist: google-api-python-client>=2.184.0
-Requires-Dist: pydantic-settings-manager>=2.1.0
+Requires-Dist: pydantic-settings-manager>=2.3.0
 Requires-Dist: pydantic-settings>=2.10.1
 Description-Content-Type: text/markdown
 
@@ -461,26 +461,53 @@ mise run package:test kiarina-lib-google-auth --coverage
 
 ### Test Configuration
 
-Some tests require actual GCP credentials. Set the following environment variables:
+Some tests require actual GCP credentials. Create a test settings file and set the environment variable to point to it:
 
 ```bash
-# Service account key file
-export KIARINA_LIB_GOOGLE_AUTH_TEST_GCP_SA_KEY_FILE="~/path/to/sa-key.json"
+# Create test settings file from sample
+cp packages/kiarina-lib-google-auth/test_settings.sample.yaml \
+   packages/kiarina-lib-google-auth/test_settings.yaml
 
-# Service account key data (JSON string)
-export KIARINA_LIB_GOOGLE_AUTH_TEST_GCP_SA_KEY_DATA='{"type": "service_account", ...}'
-
-# Authorized user file
-export KIARINA_LIB_GOOGLE_AUTH_TEST_GCP_AUTHORIZED_USER_FILE="~/.config/gcloud/application_default_credentials.json"
-
-# Authorized user data (JSON string)
-export KIARINA_LIB_GOOGLE_AUTH_TEST_GCP_AUTHORIZED_USER_DATA='{"type": "authorized_user", ...}'
+# Edit the file with your actual credentials
+# Then set the environment variable
+export KIARINA_LIB_GOOGLE_AUTH_TEST_SETTINGS_FILE="packages/kiarina-lib-google-auth/test_settings.yaml"
+```
 
-# Target service account for impersonation tests
-export KIARINA_LIB_GOOGLE_AUTH_TEST_GCP_IMPERSONATE_SA="target-sa@project.iam.gserviceaccount.com"
+The test settings file should contain multiple named configurations for different authentication scenarios:
+
+```yaml
+kiarina.lib.google.auth:
+  default:
+    type: default
+  service_account_file:
+    type: service_account
+    project_id: your-project-id
+    service_account_email: your-service-account@your-project.iam.gserviceaccount.com
+    service_account_file: ~/.gcp/service-account/your-project/your-service-account/key.json
+  service_account_data:
+    type: service_account
+    project_id: your-project-id
+    service_account_email: your-service-account@your-project.iam.gserviceaccount.com
+    service_account_data: '{"type":"service_account","project_id":"...","private_key":"...","client_email":"..."}'
+  service_account_impersonate:
+    type: service_account
+    project_id: your-project-id
+    service_account_email: your-service-account@your-project.iam.gserviceaccount.com
+    service_account_file: ~/.gcp/service-account/your-project/your-service-account/key.json
+    impersonate_service_account: impersonated-account@your-project.iam.gserviceaccount.com
+  user_account_file:
+    type: user_account
+    project_id: your-project-id
+    user_account_email: your-email@example.com
+    authorized_user_file: ~/.gcp/oauth2/your-project/authorized_user.json
+  user_account_data:
+    type: user_account
+    project_id: your-project-id
+    user_account_email: your-email@example.com
+    authorized_user_data: '{"type":"authorized_user","client_id":"...","client_secret":"...","refresh_token":"..."}'
 ```
 
-Tests will be skipped (xfail) if these environment variables are not set.
+**Note**: The `test_settings.yaml` file is gitignored to prevent accidental credential exposure.
 
 ## Dependencies
 

{kiarina_lib_google_auth-1.6.2.dist-info → kiarina_lib_google_auth-1.6.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 kiarina/lib/google/auth/__init__.py,sha256=SdD3zDQ0MebC3qbtyjpZx3HZeUL5G-4fQ3mtqQT32us,2014
 kiarina/lib/google/auth/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kiarina/lib/google/auth/settings.py,sha256=kaOFOLl7xGQ6jOiBSjUZWLdWzj_Gic-lOAKZEE6yasg,3803
+kiarina/lib/google/auth/settings.py,sha256=npwaCRkyuHJwrhRANdnq1stgowDMHplpQJPqGvx-DoE,3803
 kiarina/lib/google/auth/_helpers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kiarina/lib/google/auth/_helpers/get_credentials.py,sha256=htDgNumKBwX3b11LHjRjSR-Ciou3NBWek8f7-caPy1g,2298
+kiarina/lib/google/auth/_helpers/get_credentials.py,sha256=RWTqvH1hhh1dl3R6XE71swal2t-KduHdEhGBFBVN6hY,2291
 kiarina/lib/google/auth/_helpers/get_self_signed_jwt.py,sha256=rAFZXBk-xM5YNCiwi9bJzY4CxpR96NRUMJbCJ8bdH4k,756
 kiarina/lib/google/auth/_types/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kiarina/lib/google/auth/_types/credentials.py,sha256=8gjsjUydlbhW56JHfMHymbeoej5zp8ZopMQ2dYSvT70,415
@@ -11,6 +11,6 @@ kiarina/lib/google/auth/_utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 kiarina/lib/google/auth/_utils/get_default_credentials.py,sha256=2mkQ4eWM-lpM-1L7aprw9O2U3ZB-DE75cmpYj6d2fQs,1230
 kiarina/lib/google/auth/_utils/get_service_account_credentials.py,sha256=XGV8VRTHB9fNLKN9q66cV27lBPDExYG0UUag8mU3mEg,945
 kiarina/lib/google/auth/_utils/get_user_account_credentials.py,sha256=ihko1Xf_e5EkZ1c5CjAYl8NOvjj6dKtvHl8TH_oLbTU,2353
-kiarina_lib_google_auth-1.6.2.dist-info/METADATA,sha256=VMlX1i6c1wAFVXr4YQ9jeK0NidJFAIGGj7eXR6IiR-A,15973
-kiarina_lib_google_auth-1.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-kiarina_lib_google_auth-1.6.2.dist-info/RECORD,,
+kiarina_lib_google_auth-1.6.3.dist-info/METADATA,sha256=uobseVUVBX_xCwjo6Z9_1Je4G2mZ-gfI-PbPpRkpVqI,17232
+kiarina_lib_google_auth-1.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+kiarina_lib_google_auth-1.6.3.dist-info/RECORD,,