dataflow-core 2.1.17rc1__py3-none-any.whl → 2.1.18rc1__py3-none-any.whl

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/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/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/scripts/create_environment.sh

@@ -5,7 +5,7 @@ set -e
 # Accept new parameters
 yaml_file_path=$1
 conda_env_path=$2
-py_version=$4
+py_version=$3
 
 # Validate inputs
 if [ -z "$yaml_file_path" ] || [ -z "$conda_env_path" ]; then

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/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.17rc1.dist-info → dataflow_core-2.1.18rc1.dist-info}/METADATA

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

{dataflow_core-2.1.17rc1.dist-info → dataflow_core-2.1.18rc1.dist-info}/RECORD

@@ -34,16 +34,17 @@ dataflow/models/user.py,sha256=ggJftOVLBEs_6fhn1_13Joe9aL32KMnJwHfBMzeMAOA,2959
 dataflow/models/user_team.py,sha256=vD6BsiMfx1iIMQiT8fpwhsQ8AGuPuBO83F22Cy7j-nU,524
 dataflow/models/variables.py,sha256=qCyiVbzC3Wd2onLx-eCY36VWiVytxxWvYld6_3ki5H8,1572
 dataflow/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dataflow/schemas/connection.py,sha256=ut2sqz06yOjmFKzHry92FEt7DN09Bj30GYse35__Cuw,2467
-dataflow/schemas/git_ssh.py,sha256=N1O7HM6ZbygIBZn2rKvNR0e7IM3ZJMAH6aJtjaghDr0,1283
-dataflow/schemas/secret.py,sha256=wMSCn6zoBHS-R4NoKwljq2JUad8p9JY542UNJFa86X8,1183
+dataflow/schemas/connection.py,sha256=Cks3VaWX8dUab455lwoLMX--wRRvEIthMJ8Pa3P3-Zc,2669
+dataflow/schemas/git_ssh.py,sha256=9yB5N426CAsPGE3pfvKSVf-4vcdzCKvw4CiHcIbN_IU,1503
+dataflow/schemas/secret.py,sha256=DPzXk3EI9Gjig5EO7ymiFB3_oFW0YKPJA54gkbBlSuA,1385
 dataflow/scripts/clone_environment.sh,sha256=Qy0GylsA3kUVUL_L1MirxIWujOFhT1tikKqXNtCTWd4,506
-dataflow/scripts/create_environment.sh,sha256=lmtQZuEj4SIdN9HGgitZv1V5CaamciFTz6P_m0p4Nug,976
+dataflow/scripts/create_environment.sh,sha256=ClKdsHcN8JkGVjYpVbOnCLVKFjeg6w0JG-ldU2TR7RQ,976
 dataflow/scripts/update_environment.sh,sha256=2dtn2xlNi6frpig-sqlGE1_IKRbbkqYOCpf_qyMKKII,992
 dataflow/secrets_manager/__init__.py,sha256=idGqIDtYl0De2WIK9Obl-N7SDPSYtVM0D-wXfZjCiy4,559
 dataflow/secrets_manager/factory.py,sha256=LblshkGG9q2C3RHYp0QykianUtpOOQz7sBdlerutyWY,2479
 dataflow/secrets_manager/interface.py,sha256=HhrKpQrprWIbDsVfU_qc59OXmSIuHXv106OXv6-Epqc,506
-dataflow/secrets_manager/service.py,sha256=A4PgiSS1bzlzXPi_GvsiepChULqAa5yONGkaU-d5MLM,7419
+dataflow/secrets_manager/service.py,sha256=8j5extt3_XtYjVqSZKhxnNXUfYRzNHYU0I2gtHVnhEo,7666
+dataflow/secrets_manager/utils.py,sha256=7gteDjWgiWplnjxJeRa5QjT2WAiUUS5Ia1PZVUWK50M,2159
 dataflow/secrets_manager/providers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dataflow/secrets_manager/providers/aws_manager.py,sha256=16peXyKeuAjv2RVTMUjrzArPYENK9Zu7jREWVgMfScA,8671
 dataflow/secrets_manager/providers/azure_manager.py,sha256=sWOz-7ALnLt6vyM3lt14GBpzpmDnlH3hkdqtuApqkgU,9430
@@ -56,8 +57,8 @@ dfmigration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dfmigration/env.py,sha256=w_3Kzr3LJCU5l1zBGsNcoNGZyR8fZEtMRsxE-cEqfHQ,1110
 dfmigration/versions/001_initial_baseline_migration.py,sha256=lxjs7LZLs9-c7FQj7t7t49EOfLPPHMLI6iNp0PIBMRA,299
 dfmigration/versions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dataflow_core-2.1.17rc1.dist-info/METADATA,sha256=1Q7tsB2BtWm1Z9ooF1WK--rRbQKll8nxBgwXB5Z5MZs,466
-dataflow_core-2.1.17rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dataflow_core-2.1.17rc1.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
-dataflow_core-2.1.17rc1.dist-info/top_level.txt,sha256=-gGoIBh-bUMtzOdna2jsDOdkE2CRu3w3aA7yEFCmNAI,35
-dataflow_core-2.1.17rc1.dist-info/RECORD,,
+dataflow_core-2.1.18rc1.dist-info/METADATA,sha256=L27ISBpQ8ffzgfxkwXifxYIREQXMrSz6onWna-X6MVs,466
+dataflow_core-2.1.18rc1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dataflow_core-2.1.18rc1.dist-info/entry_points.txt,sha256=ppj_EIbYrJJwCPg1kfdsZk5q1N-Ejfis1neYrnjhO8o,117
+dataflow_core-2.1.18rc1.dist-info/top_level.txt,sha256=-gGoIBh-bUMtzOdna2jsDOdkE2CRu3w3aA7yEFCmNAI,35
+dataflow_core-2.1.18rc1.dist-info/RECORD,,