polish

apache · Dec 25, 2024 · 9afdfa8 · 9afdfa8
1 parent c2d1b1e
commit 9afdfa8
Show file tree

Hide file tree

Showing 9 changed files with 257 additions and 83 deletions.
diff --git a/clients/client-python/gravitino/api/credential/adls_token_credential.py b/clients/client-python/gravitino/api/credential/adls_token_credential.py
@@ -27,12 +27,12 @@ class ADLSTokenCredential(Credential, ABC):
 
     ADLS_SAS_TOKEN_CREDENTIAL_TYPE: str = "adls-sas-token"
     ADLS_DOMAIN: str = "dfs.core.windows.net"
-    _STORAGE_ACCOUNT_NAME: str = "azure-storage-account-name"
-    _SAS_TOKEN: str = "adls-sas-token"
+    STORAGE_ACCOUNT_NAME: str = "azure-storage-account-name"
+    SAS_TOKEN: str = "adls-sas-token"
 
     def __init__(self, credential_info: Dict[str, str], expire_time_in_ms: int):
-        self._account_name = credential_info.get(self._STORAGE_ACCOUNT_NAME, None)
-        self._sas_token = credential_info.get(self._SAS_TOKEN, None)
+        self._account_name = credential_info.get(self.STORAGE_ACCOUNT_NAME, None)
+        self._sas_token = credential_info.get(self.SAS_TOKEN, None)
         self._expire_time_in_ms = expire_time_in_ms
         Precondition.check_string_not_empty(
             self._account_name, "The ADLS account name should not be empty."
@@ -69,8 +69,8 @@ def credential_info(self) -> Dict[str, str]:
              The credential information.
         """
         return {
-            self._STORAGE_ACCOUNT_NAME: self._account_name,
-            self._SAS_TOKEN: self._sas_token,
+            self.STORAGE_ACCOUNT_NAME: self._account_name,
+            self.SAS_TOKEN: self._sas_token,
         }
 
     def account_name(self) -> str:

diff --git a/clients/client-python/gravitino/api/credential/azure_account_key_credential.py b/clients/client-python/gravitino/api/credential/azure_account_key_credential.py
@@ -26,12 +26,12 @@ class AzureAccountKeyCredential(Credential, ABC):
     """Represents Azure account key credential."""
 
     AZURE_ACCOUNT_KEY_CREDENTIAL_TYPE: str = "azure-account-key"
-    _STORAGE_ACCOUNT_NAME: str = "azure-storage-account-name"
-    _STORAGE_ACCOUNT_KEY: str = "azure-storage-account-key"
+    STORAGE_ACCOUNT_NAME: str = "azure-storage-account-name"
+    STORAGE_ACCOUNT_KEY: str = "azure-storage-account-key"
 
     def __init__(self, credential_info: Dict[str, str], expire_time_in_ms: int):
-        self._account_name = credential_info.get(self._STORAGE_ACCOUNT_NAME, None)
-        self._account_key = credential_info.get(self._STORAGE_ACCOUNT_KEY, None)
+        self._account_name = credential_info.get(self.STORAGE_ACCOUNT_NAME, None)
+        self._account_key = credential_info.get(self.STORAGE_ACCOUNT_KEY, None)
         Precondition.check_string_not_empty(
             self._account_name, "The Azure account name should not be empty"
         )
@@ -67,8 +67,8 @@ def credential_info(self) -> Dict[str, str]:
             The credential information.
         """
         return {
-            self._STORAGE_ACCOUNT_NAME: self._account_name,
-            self._STORAGE_ACCOUNT_KEY: self._account_key,
+            self.STORAGE_ACCOUNT_NAME: self._account_name,
+            self.STORAGE_ACCOUNT_KEY: self._account_key,
         }
 
     def account_name(self) -> str:

diff --git a/clients/client-python/gravitino/api/credential/oss_secret_key_credential.py b/clients/client-python/gravitino/api/credential/oss_secret_key_credential.py
@@ -26,13 +26,13 @@ class OSSSecretKeyCredential(Credential, ABC):
     """Represents OSS secret key credential."""
 
     OSS_SECRET_KEY_CREDENTIAL_TYPE: str = "oss-secret-key"
-    _STATIC_ACCESS_KEY_ID: str = "oss-access-key-id"
-    _STATIC_SECRET_ACCESS_KEY: str = "oss-secret-access-key"
+    STATIC_ACCESS_KEY_ID: str = "oss-access-key-id"
+    STATIC_SECRET_ACCESS_KEY: str = "oss-secret-access-key"
 
     def __init__(self, credential_info: Dict[str, str], expire_time_in_ms: int):
-        self._access_key_id = credential_info.get(self._STATIC_ACCESS_KEY_ID, None)
+        self._access_key_id = credential_info.get(self.STATIC_ACCESS_KEY_ID, None)
         self._secret_access_key = credential_info.get(
-            self._STATIC_SECRET_ACCESS_KEY, None
+            self.STATIC_SECRET_ACCESS_KEY, None
         )
         Precondition.check_string_not_empty(
             self._access_key_id, "The OSS access key ID should not be empty"
@@ -69,8 +69,8 @@ def credential_info(self) -> Dict[str, str]:
             The credential information.
         """
         return {
-            self._STATIC_ACCESS_KEY_ID: self._access_key_id,
-            self._STATIC_SECRET_ACCESS_KEY: self._secret_access_key,
+            self.STATIC_ACCESS_KEY_ID: self._access_key_id,
+            self.STATIC_SECRET_ACCESS_KEY: self._secret_access_key,
         }
 
     def access_key_id(self) -> str:

diff --git a/clients/client-python/gravitino/api/credential/oss_token_credential.py b/clients/client-python/gravitino/api/credential/oss_token_credential.py
@@ -26,16 +26,16 @@ class OSSTokenCredential(Credential, ABC):
     """Represents OSS token credential."""
 
     OSS_TOKEN_CREDENTIAL_TYPE: str = "oss-token"
-    _STATIC_ACCESS_KEY_ID: str = "oss-access-key-id"
-    _STATIC_SECRET_ACCESS_KEY: str = "oss-secret-access-key"
-    _OSS_TOKEN: str = "oss-security-token"
+    STATIC_ACCESS_KEY_ID: str = "oss-access-key-id"
+    STATIC_SECRET_ACCESS_KEY: str = "oss-secret-access-key"
+    OSS_TOKEN: str = "oss-security-token"
 
     def __init__(self, credential_info: Dict[str, str], expire_time_in_ms: int):
-        self._access_key_id = credential_info.get(self._STATIC_ACCESS_KEY_ID, None)
+        self._access_key_id = credential_info.get(self.STATIC_ACCESS_KEY_ID, None)
         self._secret_access_key = credential_info.get(
-            self._STATIC_SECRET_ACCESS_KEY, None
+            self.STATIC_SECRET_ACCESS_KEY, None
         )
-        self._security_token = credential_info.get(self._OSS_TOKEN, None)
+        self._security_token = credential_info.get(self.OSS_TOKEN, None)
         self._expire_time_in_ms = expire_time_in_ms
         Precondition.check_string_not_empty(
             self._access_key_id, "The OSS access key ID should not be empty"
@@ -75,9 +75,9 @@ def credential_info(self) -> Dict[str, str]:
              The credential information.
         """
         return {
-            self._STATIC_ACCESS_KEY_ID: self._access_key_id,
-            self._STATIC_SECRET_ACCESS_KEY: self._secret_access_key,
-            self._OSS_TOKEN: self._security_token,
+            self.STATIC_ACCESS_KEY_ID: self._access_key_id,
+            self.STATIC_SECRET_ACCESS_KEY: self._secret_access_key,
+            self.OSS_TOKEN: self._security_token,
         }
 
     def access_key_id(self) -> str:

diff --git a/clients/client-python/gravitino/api/credential/s3_secret_key_credential.py b/clients/client-python/gravitino/api/credential/s3_secret_key_credential.py
@@ -26,13 +26,13 @@ class S3SecretKeyCredential(Credential, ABC):
     """Represents S3 secret key credential."""
 
     S3_SECRET_KEY_CREDENTIAL_TYPE: str = "s3-secret-key"
-    _STATIC_ACCESS_KEY_ID: str = "s3-access-key-id"
-    _STATIC_SECRET_ACCESS_KEY: str = "s3-secret-access-key"
+    STATIC_ACCESS_KEY_ID: str = "s3-access-key-id"
+    STATIC_SECRET_ACCESS_KEY: str = "s3-secret-access-key"
 
     def __init__(self, credential_info: Dict[str, str], expire_time: int):
-        self._access_key_id = credential_info.get(self._STATIC_ACCESS_KEY_ID, None)
+        self._access_key_id = credential_info.get(self.STATIC_ACCESS_KEY_ID, None)
         self._secret_access_key = credential_info.get(
-            self._STATIC_SECRET_ACCESS_KEY, None
+            self.STATIC_SECRET_ACCESS_KEY, None
         )
         Precondition.check_string_not_empty(
             self._access_key_id, "S3 access key id should not be empty"
@@ -70,8 +70,8 @@ def credential_info(self) -> Dict[str, str]:
              The credential information.
         """
         return {
-            self._STATIC_ACCESS_KEY_ID: self._access_key_id,
-            self._STATIC_SECRET_ACCESS_KEY: self._secret_access_key,
+            self.STATIC_ACCESS_KEY_ID: self._access_key_id,
+            self.STATIC_SECRET_ACCESS_KEY: self._secret_access_key,
         }
 
     def access_key_id(self) -> str:

diff --git a/clients/client-python/gravitino/api/credential/s3_token_credential.py b/clients/client-python/gravitino/api/credential/s3_token_credential.py
@@ -26,21 +26,21 @@ class S3TokenCredential(Credential, ABC):
     """Represents the S3 token credential."""
 
     S3_TOKEN_CREDENTIAL_TYPE: str = "s3-token"
-    _SESSION_ACCESS_KEY_ID: str = "s3-access-key-id"
-    _SESSION_SECRET_ACCESS_KEY: str = "s3-secret-access-key"
-    _SESSION_TOKEN: str = "s3-session-token"
+    SESSION_ACCESS_KEY_ID: str = "s3-access-key-id"
+    SESSION_SECRET_ACCESS_KEY: str = "s3-secret-access-key"
+    SESSION_TOKEN: str = "s3-session-token"
 
     _expire_time_in_ms: int = 0
     _access_key_id: str = None
     _secret_access_key: str = None
     _session_token: str = None
 
     def __init__(self, credential_info: Dict[str, str], expire_time_in_ms: int):
-        self._access_key_id = credential_info.get(self._SESSION_ACCESS_KEY_ID, None)
+        self._access_key_id = credential_info.get(self.SESSION_ACCESS_KEY_ID, None)
         self._secret_access_key = credential_info.get(
-            self._SESSION_SECRET_ACCESS_KEY, None
+            self.SESSION_SECRET_ACCESS_KEY, None
         )
-        self._session_token = credential_info.get(self._SESSION_TOKEN, None)
+        self._session_token = credential_info.get(self.SESSION_TOKEN, None)
         self._expire_time_in_ms = expire_time_in_ms
         Precondition.check_string_not_empty(
             self._access_key_id, "The S3 access key ID should not be empty"
@@ -80,9 +80,9 @@ def credential_info(self) -> Dict[str, str]:
              The credential information.
         """
         return {
-            self._SESSION_ACCESS_KEY_ID: self._access_key_id,
-            self._SESSION_SECRET_ACCESS_KEY: self._secret_access_key,
-            self._SESSION_TOKEN: self._session_token,
+            self.SESSION_ACCESS_KEY_ID: self._access_key_id,
+            self.SESSION_SECRET_ACCESS_KEY: self._secret_access_key,
+            self.SESSION_TOKEN: self._session_token,
         }
 
     def access_key_id(self) -> str: