dataflow-core 2.1.17__tar.gz → 2.1.18rc1__tar.gz

{dataflow_core-2.1.17 → dataflow_core-2.1.18rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.17
+Version: 2.1.18rc1
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 

{dataflow_core-2.1.17 → dataflow_core-2.1.18rc1}/dataflow/schemas/connection.py

@@ -31,9 +31,12 @@ class ConnectionBase(BaseModel):
             raise ValueError("Connection ID must be a string.")
         if len(v) > 30:
             raise ValueError("Connection ID must be at most 30 characters long.")
-        if not re.fullmatch(r"[A-Za-z0-9_-]+", v):
+        # Must start with letter, end with letter or digit
+        # Can contain letters, numbers, and underscores
+        if not re.fullmatch(r"[A-Za-z][A-Za-z0-9_]*[A-Za-z0-9]|[A-Za-z]", v):
             raise ValueError(
-                "Connection ID can only contain letters, numbers, underscores (_), and hyphens (-)!"
+                "Connection ID must start with a letter, end with a letter or digit, "
+                "and contain only letters, numbers, and underscores (_)!"
             )
         return v
 

{dataflow_core-2.1.17 → dataflow_core-2.1.18rc1}/dataflow/schemas/git_ssh.py

@@ -17,9 +17,12 @@ class SSHBase(BaseModel):
             raise ValueError("SSH key name must be a string.")
         if len(v) > 20:
             raise ValueError("SSH key name must be at most 20 characters long.")
-        if not re.fullmatch(r"[A-Za-z0-9-]+", v):
+        # Must start with letter, end with letter or digit
+        # Can contain letters, numbers, and underscores
+        if not re.fullmatch(r"[A-Za-z][A-Za-z0-9_]*[A-Za-z0-9]|[A-Za-z]", v):
             raise ValueError(
-                "SSH key name can only contain letters, numbers, and hyphens (-)!"
+                "SSH key name must start with a letter, end with a letter or digit, "
+                "and contain only letters, numbers, and underscores (_)!"
             )
         return v
 

{dataflow_core-2.1.17 → dataflow_core-2.1.18rc1}/dataflow/schemas/secret.py

@@ -18,9 +18,12 @@ class SecretBase(BaseModel):
             raise ValueError("Secret key must be a string.")
         if len(v) > 30:
             raise ValueError("Secret key must be at most 30 characters long.")
-        if not re.fullmatch(r"[A-Za-z0-9_-]+", v):
+        # Must start with letter, end with letter or digit
+        # Can contain letters, numbers, and underscores
+        if not re.fullmatch(r"[A-Za-z][A-Za-z0-9_]*[A-Za-z0-9]|[A-Za-z]", v):
             raise ValueError(
-                "Secret key can only contain letters, numbers, underscores (_), and hyphens (-)!"
+                "Secret key must start with a letter, end with a letter or digit, "
+                "and contain only letters, numbers, and underscores (_)!"
             )
         return v
 

{dataflow_core-2.1.17 → dataflow_core-2.1.18rc1}/dataflow/secrets_manager/service.py

@@ -1,4 +1,5 @@
 from .interface import SecretManager
+from .utils import encode_vault_key
 from ..schemas.connection import ConnectionSave, ConnectionUpdate, ConnectionRead
 from ..schemas.secret import SecretSave, SecretUpdate, SecretRead
 from ..schemas.git_ssh import SSHSave, SSHRead
@@ -124,13 +125,16 @@ class _RuntimeAccessor(_BaseAccessor):
         self.slug = slug
 
     def _get_vault_path(self, secret_type: str, key: str) -> str:
+        # Encode the key for cloud compatibility
+        encoded_key = encode_vault_key(key)
+        
         # Special case for git-ssh in runtime context
         if secret_type == "git-ssh":
             return f"{self.org_id}-{self.runtime_env}-{secret_type}-{self.slug}"
 
         # Standard format for all other secret types
         context = self.slug if self.slug else "global"
-        return f"{self.org_id}-{self.runtime_env}-{context}-{secret_type}-{key}"
+        return f"{self.org_id}-{self.runtime_env}-{context}-{secret_type}-{encoded_key}"
 
 class _StudioAccessor(_BaseAccessor):
     def __init__(self, secret_manager: SecretManager, org_id: str, user_name: str):
@@ -139,7 +143,9 @@ class _StudioAccessor(_BaseAccessor):
         self.user_name = user_name
 
     def _get_vault_path(self, secret_type: str, key: str) -> str:
-        return f"{self.org_id}-{self.user_name}-{secret_type}-{key}"
+        # Encode the key for cloud compatibility
+        encoded_key = encode_vault_key(key)
+        return f"{self.org_id}-{self.user_name}-{secret_type}-{encoded_key}"
 
 # --------------------------------------------------------------------------
 # PUBLIC INTERFACE CLASS

dataflow_core-2.1.18rc1/dataflow/secrets_manager/utils.py

@@ -0,0 +1,58 @@
+"""
+Utility functions for secrets manager.
+"""
+
+
+def encode_vault_key(key: str) -> str:
+    """
+    Encode key for cloud-safe storage.
+    
+    Converts to lowercase and replaces underscores with hyphens
+    to ensure compatibility with all cloud providers (AWS, Azure, GCP).
+    
+    Cloud providers have different naming restrictions:
+    - AWS: Allows a-z, A-Z, 0-9, /_+=.@-
+    - Azure: Only lowercase letters, digits, and hyphens (a-z, 0-9, -)
+            Must START with letter, END with letter or digit
+    - GCP: Lowercase letters, digits, hyphens, and underscores (a-z, 0-9, -, _)
+           Must START with letter or underscore
+    
+    This encoding ensures compatibility with the most restrictive provider (Azure).
+    
+    Input validation (done in schemas) ensures:
+    - Key starts with a letter (A-Z, a-z)
+    - Key ends with a letter or digit (A-Z, a-z, 0-9)
+    - Key contains only letters, numbers, and underscores
+    
+    After encoding (lowercase + underscore→hyphen):
+    - Starts with lowercase letter (a-z) ✓
+    - Ends with lowercase letter or digit (a-z, 0-9) ✓
+    - Contains only lowercase letters, digits, and hyphens ✓
+    
+    Args:
+        key: Original key name (e.g., "My_Secret", "DB_CONNECTION")
+             Must start with letter and end with letter/digit
+    
+    Returns:
+        Encoded key in lowercase with hyphens (e.g., "my-secret", "db-connection")
+    
+    Examples:
+        >>> encode_vault_key("My_Secret")
+        'my-secret'
+        >>> encode_vault_key("DB_CONNECTION")
+        'db-connection'
+        >>> encode_vault_key("apiKey123")
+        'apikey123'
+        >>> encode_vault_key("test_API_v2")
+        'test-api-v2'
+        >>> encode_vault_key("A")
+        'a'
+    
+    Note:
+        This encoding is case-insensitive. Both "My_Secret" and "my_secret"
+        will map to the same vault path. The original key (with case) is 
+        preserved in the secret's data payload for reference.
+    """
+    # Simple encoding: lowercase and replace underscores with hyphens
+    # No need for prefix/suffix handling since validation ensures correct start/end
+    return key.lower().replace('_', '-')

{dataflow_core-2.1.17 → dataflow_core-2.1.18rc1}/dataflow_core.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dataflow-core
-Version: 2.1.17
+Version: 2.1.18rc1
 Summary: Dataflow core package
 Author: Dataflow
 Author-email: 

{dataflow_core-2.1.17 → dataflow_core-2.1.18rc1}/dataflow_core.egg-info/SOURCES.txt

@@ -46,6 +46,7 @@ dataflow/secrets_manager/__init__.py
 dataflow/secrets_manager/factory.py
 dataflow/secrets_manager/interface.py
 dataflow/secrets_manager/service.py
+dataflow/secrets_manager/utils.py
 dataflow/secrets_manager/providers/__init__.py
 dataflow/secrets_manager/providers/aws_manager.py
 dataflow/secrets_manager/providers/azure_manager.py

{dataflow_core-2.1.17 → dataflow_core-2.1.18rc1}/setup.py

@@ -14,7 +14,7 @@ class PostInstall(install):
 
 setup(
     name="dataflow-core",
-    version="2.1.17",
+    version="2.1.18rc1",
     packages=find_packages(include=["dataflow", "dataflow.*", "authenticator", "authenticator.*", "dfmigration", "dfmigration.*"]),
     include_package_data=True,
     package_data={