fixup! Deprecate ADLFS prefix in favor of ADLS

Author: ndrluis

pyiceberg/io/__init__.py

@@ -46,14 +46,14 @@
 
 logger = logging.getLogger(__name__)
 
-DEPRECATED_ADLFS_CONNECTION_STRING = "adlfs.connection-string"
-DEPRECATED_ADLFS_ACCOUNT_NAME = "adlfs.account-name"
-DEPRECATED_ADLFS_ACCOUNT_KEY = "adlfs.account-key"
-DEPRECATED_ADLFS_SAS_TOKEN = "adlfs.sas-token"
-DEPRECATED_ADLFS_TENANT_ID = "adlfs.tenant-id"
-DEPRECATED_ADLFS_CLIENT_ID = "adlfs.client-id"
-DEPRECATED_ADLFS_ClIENT_SECRET = "adlfs.client-secret"
-DEPRECATED_ADLFS_PREFIX = "adlfs"
+ADLFS_CONNECTION_STRING = "adlfs.connection-string"
+ADLFS_ACCOUNT_NAME = "adlfs.account-name"
+ADLFS_ACCOUNT_KEY = "adlfs.account-key"
+ADLFS_SAS_TOKEN = "adlfs.sas-token"
+ADLFS_TENANT_ID = "adlfs.tenant-id"
+ADLFS_CLIENT_ID = "adlfs.client-id"
+ADLFS_ClIENT_SECRET = "adlfs.client-secret"
+ADLFS_PREFIX = "adlfs"
 AWS_REGION = "client.region"
 AWS_ACCESS_KEY_ID = "client.access-key-id"
 AWS_SECRET_ACCESS_KEY = "client.secret-access-key"
@@ -70,13 +70,13 @@
 HDFS_PORT = "hdfs.port"
 HDFS_USER = "hdfs.user"
 HDFS_KERB_TICKET = "hdfs.kerberos_ticket"
-ADLFS_CONNECTION_STRING = "adls.connection-string"
-ADLFS_ACCOUNT_NAME = "adls.account-name"
-ADLFS_ACCOUNT_KEY = "adls.account-key"
-ADLFS_SAS_TOKEN = "adls.sas-token"
-ADLFS_TENANT_ID = "adls.tenant-id"
-ADLFS_CLIENT_ID = "adls.client-id"
-ADLFS_ClIENT_SECRET = "adls.client-secret"
+ADLS_CONNECTION_STRING = "adls.connection-string"
+ADLS_ACCOUNT_NAME = "adls.account-name"
+ADLS_ACCOUNT_KEY = "adls.account-key"
+ADLS_SAS_TOKEN = "adls.sas-token"
+ADLS_TENANT_ID = "adls.tenant-id"
+ADLS_CLIENT_ID = "adls.client-id"
+ADLS_ClIENT_SECRET = "adls.client-secret"
 GCS_TOKEN = "gcs.oauth2.token"
 GCS_TOKEN_EXPIRES_AT_MS = "gcs.oauth2.token-expires-at"
 GCS_PROJECT_ID = "gcs.project-id"

pyiceberg/io/fsspec.py

@@ -44,19 +44,19 @@
     ADLFS_ACCOUNT_NAME,
     ADLFS_CLIENT_ID,
     ADLFS_CONNECTION_STRING,
+    ADLFS_PREFIX,
     ADLFS_SAS_TOKEN,
     ADLFS_TENANT_ID,
+    ADLS_ACCOUNT_KEY,
+    ADLS_ACCOUNT_NAME,
+    ADLS_CLIENT_ID,
+    ADLS_CONNECTION_STRING,
+    ADLS_SAS_TOKEN,
+    ADLS_TENANT_ID,
     AWS_ACCESS_KEY_ID,
     AWS_REGION,
     AWS_SECRET_ACCESS_KEY,
     AWS_SESSION_TOKEN,
-    DEPRECATED_ADLFS_ACCOUNT_KEY,
-    DEPRECATED_ADLFS_ACCOUNT_NAME,
-    DEPRECATED_ADLFS_CLIENT_ID,
-    DEPRECATED_ADLFS_CONNECTION_STRING,
-    DEPRECATED_ADLFS_PREFIX,
-    DEPRECATED_ADLFS_SAS_TOKEN,
-    DEPRECATED_ADLFS_TENANT_ID,
     GCS_ACCESS,
     GCS_CACHE_TIMEOUT,
     GCS_CONSISTENCY,
@@ -76,7 +76,7 @@
     S3_SESSION_TOKEN,
     S3_SIGNER_URI,
     ADLFS_ClIENT_SECRET,
-    DEPRECATED_ADLFS_ClIENT_SECRET,
+    ADLS_ClIENT_SECRET,
     FileIO,
     InputFile,
     InputStream,
@@ -187,7 +187,7 @@ def _adlfs(properties: Properties) -> AbstractFileSystem:
     from adlfs import AzureBlobFileSystem
 
     for property_name in properties:
-        if property_name.startswith(DEPRECATED_ADLFS_PREFIX):
+        if property_name.startswith(ADLFS_PREFIX):
             deprecated(
                 deprecated_in="0.7.0",
                 removed_in="0.8.0",
@@ -197,38 +197,38 @@ def _adlfs(properties: Properties) -> AbstractFileSystem:
     return AzureBlobFileSystem(
         connection_string=PropertyUtil.get_first_property_value(
             properties,
+            ADLS_CONNECTION_STRING,
             ADLFS_CONNECTION_STRING,
-            DEPRECATED_ADLFS_CONNECTION_STRING,
         ),
         account_name=PropertyUtil.get_first_property_value(
             properties,
+            ADLS_ACCOUNT_NAME,
             ADLFS_ACCOUNT_NAME,
-            DEPRECATED_ADLFS_ACCOUNT_NAME,
         ),
         account_key=PropertyUtil.get_first_property_value(
             properties,
+            ADLS_ACCOUNT_KEY,
             ADLFS_ACCOUNT_KEY,
-            DEPRECATED_ADLFS_ACCOUNT_KEY,
         ),
         sas_token=PropertyUtil.get_first_property_value(
             properties,
+            ADLS_SAS_TOKEN,
             ADLFS_SAS_TOKEN,
-            DEPRECATED_ADLFS_SAS_TOKEN,
         ),
         tenant_id=PropertyUtil.get_first_property_value(
             properties,
+            ADLS_TENANT_ID,
             ADLFS_TENANT_ID,
-            DEPRECATED_ADLFS_TENANT_ID,
         ),
         client_id=PropertyUtil.get_first_property_value(
             properties,
+            ADLS_CLIENT_ID,
             ADLFS_CLIENT_ID,
-            DEPRECATED_ADLFS_CLIENT_ID,
         ),
         client_secret=PropertyUtil.get_first_property_value(
             properties,
+            ADLS_ClIENT_SECRET,
             ADLFS_ClIENT_SECRET,
-            DEPRECATED_ADLFS_ClIENT_SECRET,
         ),
     )