cdk-factory 0.20.5__py3-none-any.whl → 0.21.1__py3-none-any.whl

cdk_factory/configurations/resources/rds.py

@@ -27,14 +27,16 @@ class RdsConfig(EnhancedBaseConfig):
         self.__deployment = deployment
 
     @property
-    def name(self) -> str:
+    def default_database_name(self) -> str:
         """RDS instance name"""
         return self.__config.get("name", self.database_name)
     
     @property
-    def identifier(self) -> str:
+    def instance_identifier(self) -> str:
         """RDS DB instance identifier (sanitized)"""
-        raw_id = self.__config.get("identifier", self.name)
+        raw_id = self.__config.get("instance_identifier")
+        if not raw_id:
+            raise ValueError("No instance identifier found. Please add the instance identifier to the config.")
         return self._sanitize_instance_identifier(raw_id)
     
     def _sanitize_instance_identifier(self, identifier: str) -> str:
@@ -118,15 +120,22 @@ class RdsConfig(EnhancedBaseConfig):
         return self.__config.get("instance_class", "t3.micro")
 
     @property
-    def database_name(self) -> str:
-        """Name of the database to create (sanitized for RDS requirements)"""
-        raw_name = self.__config.get("database_name", "appdb")
+    def database_name(self) -> str | None:
+        """
+        Name of the database to create (sanitized for RDS requirements)
+        Optional and not required
+        """
+        raw_name = self.__config.get("database_name")
+        if not raw_name:
+            return None
         return self._sanitize_database_name(raw_name)
 
     @property
-    def username(self) -> str:
+    def master_username(self) -> str:
         """Master username for the database (sanitized for RDS requirements)"""
-        raw_username = self.__config.get("username", "appuser") 
+        raw_username = self.__config.get("master_username") 
+        if not raw_username:
+            raise ValueError("No master username found. Please add the master username to the config.")
         return self._sanitize_username(raw_username)
 
     @property

cdk_factory/stack_library/rds/rds_stack.py

@@ -67,14 +67,16 @@ class RdsStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
         self.workload = workload
 
         self.rds_config = RdsConfig(stack_config.dictionary.get("rds", {}), deployment)
-        db_name = deployment.build_resource_name(self.rds_config.name)
+        # Use stable construct ID to prevent CloudFormation logical ID changes on pipeline rename
+        # The construct ID determines the CloudFormation logical ID, not the physical resource names
+        instance_identifier = self.rds_config.instance_identifier
 
         # Setup standardized SSM integration
         self.setup_ssm_integration(
             scope=self,
             config=self.rds_config,
             resource_type="rds",
-            resource_name=self.rds_config.name,
+            resource_name=instance_identifier,
             deployment=deployment,
             workload=workload
         )
@@ -87,15 +89,15 @@ class RdsStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
 
         # Create RDS instance or import existing
         if self.rds_config.existing_instance_id:
-            self.db_instance = self._import_existing_db(db_name)
+            self.db_instance = self._import_existing_db(instance_identifier)
         else:
-            self.db_instance = self._create_db_instance(db_name)
+            self.db_instance = self._create_db_instance(instance_identifier, instance_identifier)
 
         # Add outputs
-        self._add_outputs(db_name)
+        self._add_outputs(instance_identifier)
         
         # Export to SSM Parameter Store
-        self._export_ssm_parameters(db_name)
+        self._export_ssm_parameters(instance_identifier)
 
     @property
     def vpc(self) -> ec2.IVpc:
@@ -162,7 +164,7 @@ class RdsStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
         else:
             raise ValueError("No subnets available in VPC for RDS instance")
 
-    def _create_db_instance(self, db_name: str) -> rds.DatabaseInstance:
+    def _create_db_instance(self, db_name: str, stable_db_id: str) -> rds.DatabaseInstance:
         """Create a new RDS instance"""
         # Configure subnet group
         # If we have subnet IDs from SSM, create a DB subnet group explicitly
@@ -232,7 +234,7 @@ class RdsStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
             "vpc": self.vpc,
             "instance_type": instance_type,
             "credentials": rds.Credentials.from_generated_secret(
-                username=self.rds_config.username,
+                username=self.rds_config.master_username,
                 secret_name=self.rds_config.secret_name,
             ),
             "database_name": self.rds_config.database_name,
@@ -264,7 +266,7 @@ class RdsStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
         else:
             db_props["vpc_subnets"] = subnets
         
-        db_instance = rds.DatabaseInstance(self, db_name, **db_props)
+        db_instance = rds.DatabaseInstance(self, stable_db_id, **db_props)
 
         # Add tags
         for key, value in self.rds_config.tags.items():
@@ -320,15 +322,15 @@ class RdsStack(IStack, VPCProviderMixin, StandardizedSsmMixin):
             logger.info(f"Exported SSM parameter: {ssm_exports['db_port']}")
         
         # Export database name
-        if "db_name" in ssm_exports and self.rds_config.database_name:
+        if "db_instance_identifier" in ssm_exports and self.rds_config.instance_identifier:
             self.export_ssm_parameter(
                 scope=self,
                 id="SsmExportDbName",
-                value=self.rds_config.database_name,
-                parameter_name=ssm_exports["db_name"],
+                value=self.rds_config.instance_identifier,
+                parameter_name=ssm_exports["db_instance_identifier"],
                 description=f"RDS database name for {db_name}",
             )
-            logger.info(f"Exported SSM parameter: {ssm_exports['db_name']}")
+            logger.info(f"Exported SSM parameter: {ssm_exports['db_instance_identifier']}")
         
         # Export secret ARN (contains username and password)
         if "db_secret_arn" in ssm_exports:

cdk_factory/version.py

@@ -1 +1 @@
-__version__ = "0.20.5"
+__version__ = "0.21.1"

{cdk_factory-0.20.5.dist-info → cdk_factory-0.21.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdk_factory
-Version: 0.20.5
+Version: 0.21.1
 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.20.5.dist-info → cdk_factory-0.21.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ cdk_factory/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/app.py,sha256=RnX0-pwdTAPAdKJK_j13Zl8anf9zYKBwboR0KA8K8xM,10346
 cdk_factory/cdk.json,sha256=SKZKhJ2PBpFH78j-F8S3VDYW-lf76--Q2I3ON-ZIQfw,3106
 cdk_factory/cli.py,sha256=FGbCTS5dYCNsfp-etshzvFlGDCjC28r6rtzYbe7KoHI,6407
-cdk_factory/version.py,sha256=KohmrV3SWmyEbdcyopRMCctCtbthoMrxKM29jQ5Xa58,23
+cdk_factory/version.py,sha256=SgjjYIjRx1j_wfbQTv5G4w3woiZ-Jp6WCRh6Z-HHPxc,23
 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=eJ3Pl3GWk1jVr_bYQaaWlw4_-ZiFGaiXllI_fOOX1i0,9323
@@ -40,7 +40,7 @@ cdk_factory/configurations/resources/lambda_layers.py,sha256=gVeP_-LC3Eq0lkPaG_J
 cdk_factory/configurations/resources/lambda_triggers.py,sha256=MD7cdMNKEulNBhtMLIFnWJuJ5R-yyIqa0LHUgbSQerA,834
 cdk_factory/configurations/resources/load_balancer.py,sha256=P-jKemIjIWWqScmQKspmRy1m3BrwNkRtTNHDStOAJds,5617
 cdk_factory/configurations/resources/monitoring.py,sha256=CPYWbUbWQzoPqDhdPiB4Vahq-pPi6BEkavkVohadSIo,2422
-cdk_factory/configurations/resources/rds.py,sha256=pX6uihguv1apYH93obcE4RloQDP48q5JHnYTnO39Pn0,15935
+cdk_factory/configurations/resources/rds.py,sha256=fK2_GBIlVEF_I0Q73EaCz5AIuaTDIn2YQk-WcV-vf6s,16329
 cdk_factory/configurations/resources/resource_mapping.py,sha256=cwv3n63RJ6E59ErsmSTdkW4i-g8huhHtKI0ExbRhJxA,2182
 cdk_factory/configurations/resources/resource_naming.py,sha256=VE9S2cpzp11qqPL2z1sX79wXH0o1SntO2OG74nEmWC8,5508
 cdk_factory/configurations/resources/resource_types.py,sha256=1WQHyDoErb-M-tETZZzyLDtbq_jdC85-I403dM48pgE,2317
@@ -114,7 +114,7 @@ cdk_factory/stack_library/load_balancer/load_balancer_stack.py,sha256=iR-l5ujLS4
 cdk_factory/stack_library/monitoring/__init__.py,sha256=k1G_KDx47Aw0UugaL99PN_TKlyLK4nkJVApCaAK7GJg,153
 cdk_factory/stack_library/monitoring/monitoring_stack.py,sha256=N_1YvEXE7fboH_S3kv_dSKZsufxMuPdFMjGzlNFpuSo,19283
 cdk_factory/stack_library/rds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cdk_factory/stack_library/rds/rds_stack.py,sha256=VToW-uFKAfilyhN4T8-TXaFW8f_VuXEIuUoBHvDN0Ns,14398
+cdk_factory/stack_library/rds/rds_stack.py,sha256=UwLaDpyNNvPnMV8DfZon8fyusuGkvcpJiUB5V3Gjrt4,14748
 cdk_factory/stack_library/route53/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cdk_factory/stack_library/route53/route53_stack.py,sha256=PaYpVVYC_jZ-pbsmK0vW_OVleJ4En0L2O_a92jlWi18,16601
 cdk_factory/stack_library/rum/__init__.py,sha256=gUrWQdzd4rZ2J0YzAQC8PsEGAS7QgyYjB2ZCUKWasy4,90
@@ -143,8 +143,8 @@ cdk_factory/utilities/os_execute.py,sha256=5Op0LY_8Y-pUm04y1k8MTpNrmQvcLmQHPQITE
 cdk_factory/utils/api_gateway_utilities.py,sha256=If7Xu5s_UxmuV-kL3JkXxPLBdSVUKoLtohm0IUFoiV8,4378
 cdk_factory/validation/config_validator.py,sha256=Pb0TkLiPFzUplBOgMorhRCVm08vEzZhRU5xXCDTa5CA,17602
 cdk_factory/workload/workload_factory.py,sha256=yDI3cRhVI5ELNDcJPLpk9UY54Uind1xQoV3spzT4z7E,6068
-cdk_factory-0.20.5.dist-info/METADATA,sha256=a19HKUiZr8FOVgDbMbQj6mmhVd4QL1ESVrexE5yL7BY,2451
-cdk_factory-0.20.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-cdk_factory-0.20.5.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
-cdk_factory-0.20.5.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
-cdk_factory-0.20.5.dist-info/RECORD,,
+cdk_factory-0.21.1.dist-info/METADATA,sha256=9FoDlo8hg9_wGFmPmaVmnEQUO_Os-We2cYJgCiWSKZ4,2451
+cdk_factory-0.21.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+cdk_factory-0.21.1.dist-info/entry_points.txt,sha256=S1DPe0ORcdiwEALMN_WIo3UQrW_g4YdQCLEsc_b0Swg,53
+cdk_factory-0.21.1.dist-info/licenses/LICENSE,sha256=NOtdOeLwg2il_XBJdXUPFPX8JlV4dqTdDGAd2-khxT8,1066
+cdk_factory-0.21.1.dist-info/RECORD,,