cdk-factory 0.8.1__py3-none-any.whl → 0.8.2__py3-none-any.whl

cdk_factory/interfaces/enhanced_ssm_parameter_mixin.py

@@ -142,28 +142,39 @@ class EnhancedSsmParameterMixin:
         Returns:
             Created SSM parameter
         """
-        # Handle different value types
-        if isinstance(value, list):
-            string_value = ",".join(str(v) for v in value)
-            cdk_param_type = ssm.ParameterType.STRING_LIST
-        elif param_type == "SecureString":
-            string_value = str(value)
-            cdk_param_type = ssm.ParameterType.SECURE_STRING
-        else:
-            string_value = str(value)
-            cdk_param_type = ssm.ParameterType.STRING
-            
         # Generate a unique construct ID from the path
         construct_id = f"ssm-param-{path.replace('/', '-').replace('_', '-')}"
         
-        return ssm.StringParameter(
-            self.scope,
-            construct_id,
-            parameter_name=path,
-            string_value=string_value,
-            description=description,
-            type=cdk_param_type
-        )
+        # Handle different value types - use appropriate CDK constructs
+        if isinstance(value, list):
+            # For list values, use StringListParameter
+            return ssm.StringListParameter(
+                self.scope,
+                construct_id,
+                parameter_name=path,
+                string_list_value=value,
+                description=description
+            )
+        elif param_type == "SecureString":
+            # For secure strings, use L1 CfnParameter with Type=SecureString
+            return ssm.CfnParameter(
+                self.scope,
+                construct_id,
+                name=path,
+                value=str(value),
+                type="SecureString",
+                description=description
+            )
+        else:
+            # For regular strings, use StringParameter (no type parameter needed in CDK v2)
+            return ssm.StringParameter(
+                self.scope,
+                construct_id,
+                parameter_name=path,
+                string_value=str(value),
+                description=description
+                # Note: 'type' parameter removed - deprecated in CDK v2
+            )
     
     def _import_enhanced_ssm_parameter(self, path: str, attribute: str) -> Optional[str]:
         """

cdk_factory/utilities/json_loading_utility.py

@@ -61,35 +61,63 @@ class JsonLoadingUtility:
         """Resolve references in a configuration section."""
         if isinstance(section, dict):
             if self.nested_key in section:
-                nested_path = str(section.pop(self.nested_key))
-                # print(f"Resolving parent path: {nested_path}")
-                if nested_path.endswith(".json"):
-                    nested_root_path = os.path.join(self.base_path, nested_path)
-                    nested_section = self.__load_json_file(nested_root_path)
-                elif os.path.isdir(os.path.join(self.base_path, nested_path)):
-                    nested_section = []
-                    dir_path = os.path.join(self.base_path, nested_path)
-                    for filename in os.listdir(dir_path):
-                        if filename.endswith(".json"):
-                            file_path = os.path.join(dir_path, filename)
-                            # print(f"Loading file: {file_path}")
-                            file_section = self.__load_json_file(file_path)
-                            nested_section.append(file_section)
-
-                    # print("done with nested sections")
-                else:
-                    nested_section = self.get_nested_config(root_config, nested_path)
-
-                nested_section_resolved = self.resolve_references(
-                    nested_section, root_config
-                )
-                if len(section) > 0 and isinstance(nested_section_resolved, dict):
-                    nested_section_resolved.update(section)
-                elif len(section) > 0 and isinstance(nested_section_resolved, list):
+                nested_paths = section.pop(self.nested_key)
+                
+                # Support both single path (string) and multiple paths (list)
+                if isinstance(nested_paths, str):
+                    nested_paths = [nested_paths]
+                elif not isinstance(nested_paths, list):
+                    raise ValueError(f"__inherits__ must be a string or list, got {type(nested_paths)}")
+                
+                # Process each path and merge results
+                merged_section = None
+                
+                for nested_path in nested_paths:
+                    nested_path = str(nested_path)
+                    # print(f"Resolving parent path: {nested_path}")
+                    
+                    if nested_path.endswith(".json"):
+                        nested_root_path = os.path.join(self.base_path, nested_path)
+                        nested_section = self.__load_json_file(nested_root_path)
+                    elif os.path.isdir(os.path.join(self.base_path, nested_path)):
+                        nested_section = []
+                        dir_path = os.path.join(self.base_path, nested_path)
+                        for filename in os.listdir(dir_path):
+                            if filename.endswith(".json"):
+                                file_path = os.path.join(dir_path, filename)
+                                # print(f"Loading file: {file_path}")
+                                file_section = self.__load_json_file(file_path)
+                                nested_section.append(file_section)
+                        # print("done with nested sections")
+                    else:
+                        nested_section = self.get_nested_config(root_config, nested_path)
+
+                    nested_section_resolved = self.resolve_references(
+                        nested_section, root_config
+                    )
+                    
+                    # Merge resolved sections
+                    if merged_section is None:
+                        merged_section = nested_section_resolved
+                    else:
+                        # Merge logic based on type
+                        if isinstance(merged_section, dict) and isinstance(nested_section_resolved, dict):
+                            self.merge_sections(merged_section, nested_section_resolved)
+                        elif isinstance(merged_section, list) and isinstance(nested_section_resolved, list):
+                            merged_section.extend(nested_section_resolved)
+                        else:
+                            raise RuntimeError(
+                                f"Cannot merge incompatible types: {type(merged_section)} and {type(nested_section_resolved)}"
+                            )
+                
+                # Apply any additional properties from the section
+                if len(section) > 0 and isinstance(merged_section, dict):
+                    merged_section.update(section)
+                elif len(section) > 0 and isinstance(merged_section, list):
                     raise RuntimeError("we need to resolve this section")
-                    # nested_section_resolved.append(section)
+                    # merged_section.append(section)
 
-                section = nested_section_resolved
+                section = merged_section
 
             if isinstance(section, dict):
                 for key, value in section.items():

cdk_factory/version.py

@@ -1 +1 @@
-__version__ = "0.8.1"
+__version__ = "0.8.2"

{cdk_factory-0.8.1.dist-info → cdk_factory-0.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.8.1
+Version: 0.8.2
 Summary: CDK Factory. A QuickStarter and best practices setup for CDK projects
 Author-email: Eric Wilson <eric.wilson@geekcafe.com>
 License: MIT License

{cdk_factory-0.8.1.dist-info → cdk_factory-0.8.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 cdk_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/app.py,sha256=xv863N7O6HPKznB68_t7O4la9JacrkG87t9TjoDUk7s,2827
 cdk_factory/cdk.json,sha256=SKZKhJ2PBpFH78j-F8S3VDYW-lf76--Q2I3ON-ZIQfw,3106
-cdk_factory/version.py,sha256=Ocl79hbbH8_jdr5dGC90VR1cAvZc05Rc0tkZttUnMjo,22
+cdk_factory/version.py,sha256=B7GiO0rd49YwtLYjvPg4lmCZEDlMTonslQKdSImaMJk,22
 cdk_factory/builds/README.md,sha256=9BBWd7bXpyKdMU_g2UljhQwrC9i5O_Tvkb6oPvndoZk,90
 cdk_factory/commands/command_loader.py,sha256=QbLquuP_AdxtlxlDy-2IWCQ6D-7qa58aphnDPtp_uTs,3744
 cdk_factory/configurations/base_config.py,sha256=JKjhNsy0RCUZy1s8n5D_aXXI-upR9izaLtCTfKYiV9k,9624
@@ -57,7 +57,7 @@ cdk_factory/constructs/s3_buckets/s3_bucket_construct.py,sha256=5DK5aVUAveJYBjmP
 cdk_factory/constructs/s3_buckets/s3_bucket_replication_destination_construct.py,sha256=H-EJ2Q71LI5FPQ9thMkXDGRuwJdFc_2OzGIrWA98lxg,2517
 cdk_factory/constructs/s3_buckets/s3_bucket_replication_source_construct.py,sha256=ZLKbRcMK1q73VruxCH62XbymebKt-lKV5Kul9OjkZiA,3763
 cdk_factory/constructs/sqs/policies/sqs_policies.py,sha256=4p0G8G-fqNKSr68I55fvqH-DkhIeXyGaFBKkICIJ-qM,1277
-cdk_factory/interfaces/enhanced_ssm_parameter_mixin.py,sha256=k-jfwRJhIs6sxifmh7rFaX92tpHMdxiZ8mgPP4NNu5E,13041
+cdk_factory/interfaces/enhanced_ssm_parameter_mixin.py,sha256=GYFaUo_vzmuox8dK0U-cI9d-OBhToXlTkrWeveGZr3k,13522
 cdk_factory/interfaces/istack.py,sha256=bhTBs-o9FgKwvJMSuwxjUV6D3nUlvZHVzfm27jP9x9Y,987
 cdk_factory/interfaces/live_ssm_resolver.py,sha256=3FIr9a02SXqZmbFs3RT0WxczWEQR_CF7QSt7kWbDrVE,8163
 cdk_factory/interfaces/ssm_parameter_mixin.py,sha256=uA2j8HmAOpuEA9ynRj51s0WjUHMVLsbLQN-QS9NKyHA,12089
@@ -107,12 +107,12 @@ cdk_factory/utilities/docker_utilities.py,sha256=9r8C-lXYpymqEfi3gTeWCQzHldvfjtt
 cdk_factory/utilities/environment_services.py,sha256=cd2T0efJtFPMLa1Fm7MPL-sqUlhKXCB7_XHsR8sfymE,9696
 cdk_factory/utilities/file_operations.py,sha256=HCZevKlmnHNB2wkIEPtdm-g2nJSKT3B9uipLk8Kx_Yk,8946
 cdk_factory/utilities/git_utilities.py,sha256=7Xac8PaThc7Lmk5jtDBHaJOj-fWRT017cgZmgXkVizM,3155
-cdk_factory/utilities/json_loading_utility.py,sha256=zdvqO2Bw5OpImJymfQRgqr6wfpZSCVtL20sYCYPAvMg,7617
+cdk_factory/utilities/json_loading_utility.py,sha256=Yeqdjkkly0JLa7-V8j7ipmybsPoyPIKdRe7My7JTk3o,9203
 cdk_factory/utilities/lambda_function_utilities.py,sha256=j3tBdv_gC2MdEwBINDwAqYey5vgn7YiQtJ0XZybTsCQ,15197
 cdk_factory/utilities/os_execute.py,sha256=5Op0LY_8Y-pUm04y1k8MTpNrmQvcLmQHPQITEP7EuSU,1019
 cdk_factory/utils/api_gateway_utilities.py,sha256=If7Xu5s_UxmuV-kL3JkXxPLBdSVUKoLtohm0IUFoiV8,4378
 cdk_factory/workload/workload_factory.py,sha256=yBUDGIuB8-5p_mGcVFxsD2ZoZIziak3yh3LL3JvS0M4,5903
-cdk_factory-0.8.1.dist-info/METADATA,sha256=QzIZhYxS_Mu7hgXTGdT4yN4K0gtJP6Z1Cn1C7onszAg,2450
-cdk_factory-0.8.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.8.1.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.8.1.dist-info/RECORD,,
+cdk_factory-0.8.2.dist-info/METADATA,sha256=PbYIaV_hrIj-7YZxLTQvR-GdLk6WErUYjuYP99HsjHA,2450
+cdk_factory-0.8.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.8.2.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.8.2.dist-info/RECORD,,