Rework arguments parsing logic for SHOW FUNCTIONS and SHOW PROCEDURES; Resource constraint is now required for SNOWPARK-OPTIMIZED warehouse; Display active bundles

Author: littleK0i

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.52.0] - 2025-05-23
+
+- Reworked data type parsing logic for `SHOW FUNCTIONS` and `SHOW PROCEDURES` to prepare for bundle `2025_03` [changes](https://docs.snowflake.com/en/release-notes/bcr-bundles/2025_03/bcr-1944).
+- Parameter `resource_constraint` is now required for `SNOWPARK-OPTIMIZED` warehouse. It is necessary to protect from future random changes in default values.
+- Added `Active bundles` to context and logging.
+- Skipped some checks in tests until bundle `2025_03` is fully deployed. Proposed change is so problematic, I expect it to be partially reverted.
+
 ## [0.51.1] - 2025-05-20
 
 - Added temporary workaround for potential new default `resource_constraint=STANDARD_GEN_1` for `STANDARD` warehouses. Previously it was `null`.

snowddl/app/base.py

@@ -635,24 +635,25 @@ def execute(self):
                 exit(8)
 
     def output_engine_context(self, engine: SnowDDLEngine):
-        roles = []
+        system_roles = []
 
         if engine.context.is_account_admin:
-            roles.append("ACCOUNTADMIN")
+            system_roles.append("ACCOUNTADMIN")
 
         if engine.context.is_sys_admin:
-            roles.append("SYSADMIN")
+            system_roles.append("SYSADMIN")
 
         if engine.context.is_security_admin:
-            roles.append("SECURITYADMIN")
+            system_roles.append("SECURITYADMIN")
 
         self.logger.info(
             f"Snowflake version = {engine.context.version} ({engine.context.edition.name}), SnowDDL version = {__version__}"
         )
         self.logger.info(f"Account = {engine.context.current_account}, Region = {engine.context.current_region}")
         self.logger.info(f"Session = {engine.context.current_session}, User = {engine.context.current_user}")
         self.logger.info(f"Role = {engine.context.current_role}, Warehouse = {engine.context.current_warehouse}")
-        self.logger.info(f"Roles in session = {','.join(roles)}")
+        self.logger.info(f"System roles = {','.join(system_roles)}")
+        self.logger.info(f"Active bundles = {','.join(engine.context.active_bundles)}")
         self.logger.info("---")
 
     def get_placeholder_path(self):

snowddl/context.py

@@ -23,6 +23,7 @@ def __init__(self, engine: "SnowDDLEngine"):
                 , IS_ROLE_IN_SESSION('SYSADMIN') AS is_sys_admin
                 , IS_ROLE_IN_SESSION('SECURITYADMIN') AS is_security_admin
                 , SYSTEM$BOOTSTRAP_DATA_REQUEST('ACCOUNT') AS bootstrap_account
+                , SYSTEM$SHOW_ACTIVE_BEHAVIOR_CHANGE_BUNDLES() AS active_bundles
         """
         )
 
@@ -42,9 +43,11 @@ def __init__(self, engine: "SnowDDLEngine"):
         self.is_security_admin = r["IS_SECURITY_ADMIN"]
 
         bootstrap_account = loads(r["BOOTSTRAP_ACCOUNT"])
+        active_bundles = loads(r["ACTIVE_BUNDLES"])
 
         self.version = bootstrap_account["serverVersion"]
         self.edition = Edition[bootstrap_account["accountInfo"]["serviceLevelName"]]
+        self.active_bundles = [bundle["name"] for bundle in active_bundles if bundle["isEnabled"]]
 
         self._validate()
 

snowddl/resolver/_utils.py

@@ -29,10 +29,46 @@ def compare_dynamic_param_value(bp_value: Union[bool, int, float, str], existing
 
 
 def dtypes_from_arguments(arguments: str) -> str:
-    arguments = arguments.replace("DEFAULT ", "")
-    arguments = arguments.translate(str.maketrans("", "", "[] "))
+    all_dtypes = []
 
     start_dtypes_idx = arguments.index("(")
-    finish_dtypes_idx = arguments.index(")")
+    finish_dtypes_idx = arguments.index(") RETURN ")
 
-    return ",".join(a for a in arguments[start_dtypes_idx + 1 : finish_dtypes_idx].split(","))
+    for dtype_part in split_by_comma_outside_parentheses(arguments[start_dtypes_idx + 1 : finish_dtypes_idx]):
+        # Remove optional DEFAULT prefix from the beginning
+        dtype_part = dtype_part.removeprefix("DEFAULT ")
+
+        # Remove optional data type size introduced in bundle 2025_03
+        # https://docs.snowflake.com/en/release-notes/bcr-bundles/2025_03/bcr-1944
+        dtype_size_start_idx = dtype_part.find("(")
+
+        if dtype_size_start_idx > -1:
+            dtype_part = dtype_part[:dtype_size_start_idx]
+
+        all_dtypes.append(dtype_part)
+
+    return ",".join(all_dtypes)
+
+
+def split_by_comma_outside_parentheses(s: str):
+    parts = []
+    current = []
+    depth = 0
+
+    for char in s:
+        if char == "," and depth == 0:
+            parts.append("".join(current).strip())
+            current = []
+
+        else:
+            if char == "(":
+                depth += 1
+            elif char == ")":
+                depth -= 1
+
+            current.append(char)
+
+    if current:
+        parts.append("".join(current).strip())
+
+    return parts

snowddl/resolver/warehouse.py

@@ -276,12 +276,8 @@ def _compare_resource_constraint(self, bp: WarehouseBlueprint, row: dict):
             return False
 
         # Special rules for RESOURCE_CONSTRAINT are required to take both old and new default logic into account
-        if bp.resource_constraint is None:
-            if bp.type == "STANDARD" and row["resource_constraint"] == "STANDARD_GEN_1":
-                return False
-
-            if bp.type == "SNOWPARK-OPTIMIZED" and row["resource_constraint"] == "MEMORY_16X":
-                return False
+        if bp.resource_constraint is None and bp.type == "STANDARD" and row["resource_constraint"] == "STANDARD_GEN_1":
+            return False
 
         return True
 

snowddl/validator/__init__.py

@@ -9,9 +9,11 @@
 from .technical_role import TechnicalRoleValidator
 from .user import UserValidator
 from .view import ViewValidator
+from .warehouse import WarehouseValidator
 
 
 default_validate_sequence = [
+    WarehouseValidator,
     DatabaseValidator,
     SchemaValidator,
     DynamicTableValidator,

snowddl/validator/warehouse.py

@@ -0,0 +1,14 @@
+from snowddl.blueprint import WarehouseBlueprint
+from snowddl.validator.abc_validator import AbstractValidator
+
+
+class WarehouseValidator(AbstractValidator):
+    def get_blueprints(self):
+        return self.config.get_blueprints_by_type(WarehouseBlueprint)
+
+    def validate_blueprint(self, bp: WarehouseBlueprint):
+        self._validate_resource_constraint(bp)
+
+    def _validate_resource_constraint(self, bp: WarehouseBlueprint):
+        if bp.type == "SNOWPARK-OPTIMIZED" and bp.resource_constraint is None:
+            raise ValueError(f"Resource constraint must be defined for SNOWPARK-OPTIMIZED warehouse [{bp.full_name}]")

snowddl/version.py

@@ -1 +1 @@
-__version__ = "0.51.1"
+__version__ = "0.52.0"

test/_config/step1/warehouse.yaml

@@ -55,3 +55,4 @@ wh002_wh1:
 wh003_wh1:
   size: MEDIUM
   type: SNOWPARK-OPTIMIZED
+  resource_constraint: MEMORY_16X

test/_config/step3/warehouse.yaml

@@ -28,3 +28,4 @@ wh002_wh1:
 wh003_wh1:
   size: MEDIUM
   type: SNOWPARK-OPTIMIZED
+  resource_constraint: MEMORY_16X