BuzzerboyAWSLightsail 0.329.1__py3-none-any.whl → 0.330.1__py3-none-any.whl

BuzzerboyAWSLightsailStack/LightsailBase.py

@@ -79,7 +79,7 @@ class BaseLightsailArchitectureFlags(Enum):
 #endregion
 
 
-class LightsailBase(AWSArchitectureBase, ABC):
+class LightsailBase(AWSArchitectureBase):
     """
     Abstract base class for AWS Lightsail Infrastructure Stacks.
 
@@ -126,19 +126,19 @@ class LightsailBase(AWSArchitectureBase, ABC):
     # Default post-apply scripts executed after deployment
     default_post_apply_scripts = []
 
-    @staticmethod
-    @abstractmethod
-    def get_architecture_flags():
+    def get_architecture_flags(self):
         """
         Get the ArchitectureFlags enum for configuration.
-        
-        This method must be implemented by subclasses to return their
-        specific ArchitectureFlags enum class.
 
         :returns: ArchitectureFlags enum class
-        :rtype: type[Enum]
+        :rtype: type[ArchitectureFlags]
         """
-        pass
+        super_flags = super.get_architecture_flags()
+        this_flags = ArchitectureFlags
+        for flag in super_flags:
+            this_flags[flag.name] = flag.value
+
+        return this_flags
 
     def __init__(self, scope, id, **kwargs):
         """
@@ -575,22 +575,26 @@ class LightsailBase(AWSArchitectureBase, ABC):
         if not self.post_apply_scripts:
             return
 
+        # Collect dependencies for post-apply scripts
+        dependencies = []
+        if hasattr(self, 'secrets_manager_secret'):
+            dependencies.append(self.secrets_manager_secret)
+
         # Create a null resource for each post-apply script
         for i, script in enumerate(self.post_apply_scripts):
             script_resource = NullResource(
                 self,
                 f"post_apply_script_{i}",
-                provisioner=[{
-                    "local-exec": {
-                        "command": script,
-                        "on_failure": "continue"
-                    }
-                }]
+                depends_on=dependencies if dependencies else None
             )
             
-            # Ensure scripts depend on core infrastructure
-            if hasattr(self, 'secrets_manager_secret'):
-                script_resource.add_override("depends_on", [self.secrets_manager_secret.fqn])
+            # Add provisioner using override
+            script_resource.add_override("provisioner", [{
+                "local-exec": {
+                    "command": script,
+                    "on_failure": "continue"
+                }
+            }])
 
     # ==================== UTILITY METHODS ====================
 

BuzzerboyAWSLightsailStack/LightsailContainer.py

@@ -66,16 +66,27 @@ from cdktf_cdktf_provider_aws.wafv2_rule_group import Wafv2RuleGroupRuleVisibili
 
 
 #region ArchitectureFlags 
-class ArchitectureFlags(BaseLightsailArchitectureFlags):
+class ArchitectureFlags(Enum):
     """
     Architecture configuration flags for optional components.
 
-    Extends BaseLightsailArchitectureFlags with container-specific flags.
+    Includes both base and container-specific flags.
 
+    Base flags:
+    :param SKIP_DEFAULT_POST_APPLY_SCRIPTS: Skip default post-apply scripts
+    :param PRESERVE_EXISTING_SECRETS: Don't overwrite existing secret versions
+    :param IGNORE_SECRET_CHANGES: Ignore all changes to secret after initial creation
+    
+    Container-specific flags:
     :param SKIP_DATABASE: Skip database creation
     :param SKIP_DOMAIN: Skip domain and DNS configuration
     """
-
+    # Base flags (from BaseLightsailArchitectureFlags)
+    SKIP_DEFAULT_POST_APPLY_SCRIPTS = "skip_default_post_apply_scripts"
+    PRESERVE_EXISTING_SECRETS = "preserve_existing_secrets"
+    IGNORE_SECRET_CHANGES = "ignore_secret_changes"
+    
+    # Container-specific flags
     SKIP_DATABASE = "skip_database"
     SKIP_DOMAIN = "skip_domain"
 
@@ -174,7 +185,7 @@ class LightsailContainerStack(LightsailBase):
         super()._set_default_post_apply_scripts()
 
         # Skip if flag is set
-        if BaseLightsailArchitectureFlags.SKIP_DEFAULT_POST_APPLY_SCRIPTS.value in self.flags:
+        if ArchitectureFlags.SKIP_DEFAULT_POST_APPLY_SCRIPTS.value in self.flags:
             return
 
         # Add container-specific scripts
@@ -270,6 +281,8 @@ class LightsailContainerStack(LightsailBase):
                 "host": self.database.master_endpoint_address,
                 "port": self.database.master_endpoint_port,
             }
+        )
+
     def create_s3_bucket(self, bucket_name=None):
         """
         Create S3 bucket for application data storage.

BuzzerboyAWSLightsailStack/LightsailDatabase.py

@@ -42,15 +42,26 @@ from cdktf_cdktf_provider_random import password
 #endregion
 
 #region ArchitectureFlags 
-class ArchitectureFlags(BaseLightsailArchitectureFlags):
+class ArchitectureFlags(Enum):
     """
     Architecture configuration flags for optional components.
 
-    Extends BaseLightsailArchitectureFlags with database-specific flags.
+    Includes both base and database-specific flags.
 
+    Base flags:
+    :param SKIP_DEFAULT_POST_APPLY_SCRIPTS: Skip default post-apply scripts
+    :param PRESERVE_EXISTING_SECRETS: Don't overwrite existing secret versions
+    :param IGNORE_SECRET_CHANGES: Ignore all changes to secret after initial creation
+    
+    Database-specific flags:
     :param SKIP_DATABASE_USERS: Skip creating individual database users (use master user only)
     """
-
+    # Base flags (from BaseLightsailArchitectureFlags)
+    SKIP_DEFAULT_POST_APPLY_SCRIPTS = "skip_default_post_apply_scripts"
+    PRESERVE_EXISTING_SECRETS = "preserve_existing_secrets"
+    IGNORE_SECRET_CHANGES = "ignore_secret_changes"
+    
+    # Database-specific flags
     SKIP_DATABASE_USERS = "skip_database_users"
 
 #endregion
@@ -124,10 +135,7 @@ class LightsailDatabaseStack(LightsailBase):
             environment = kwargs.get("environment", "dev")
             kwargs["secret_name"] = f"{project_name}/{environment}/database-credentials"
         
-        # Call parent constructor
-        super().__init__(scope, id, **kwargs)
-
-        # ===== Database-Specific Configuration =====
+        # ===== Database-Specific Configuration (set before parent init) =====
         self.databases = kwargs.get("databases", [])
 
         # Validate required parameters
@@ -142,6 +150,9 @@ class LightsailDatabaseStack(LightsailBase):
         # ===== Internal State =====
         self.database_users = {}
         self.database_passwords = {}
+        
+        # Call parent constructor
+        super().__init__(scope, id, **kwargs)
 
     def _set_default_post_apply_scripts(self):
         """
@@ -151,7 +162,7 @@ class LightsailDatabaseStack(LightsailBase):
         super()._set_default_post_apply_scripts()
 
         # Skip if flag is set
-        if BaseLightsailArchitectureFlags.SKIP_DEFAULT_POST_APPLY_SCRIPTS.value in self.flags:
+        if ArchitectureFlags.SKIP_DEFAULT_POST_APPLY_SCRIPTS.value in self.flags:
             return
 
         # Add database-specific scripts before the final message

{buzzerboyawslightsail-0.329.1.dist-info → buzzerboyawslightsail-0.330.1.dist-info}/METADATA

@@ -1,10 +1,27 @@
 Metadata-Version: 2.4
 Name: BuzzerboyAWSLightsail
-Version: 0.329.1
+Version: 0.330.1
 Summary: Buzzerboy Architecture for Deploying Web Applications on AWS LightSail
 Home-page: https://www.buzzerboy.com/
 Author: Buzzerboy Inc
 Author-email: Buzzerboy Inc <info@buzzerboy.com>
+License: Copyright (c) 2024 Buzzerboy Inc. Canada. All Rights Reserved.
+        
+        This product and associated files (the "Software") is only available for use
+        within projects developed by Buzzerboy Inc. Canada with subject to the following conditions:
+        
+        The above copyright notice and this permission notice shall be included in all
+        copies or substantial portions of the Software.
+        
+        For commercial projects, permission of use is required by sending an email to info@buzzerboy.com
+        
+        THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+        SOFTWARE.
 Project-URL: Homepage, https://www.buzzerboy.com/
 Project-URL: Issues, https://dev.azure.com/buzzerboyinc/buzzerboy
 Classifier: Programming Language :: Python :: 3
@@ -12,6 +29,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
+License-File: LICENSE
 Requires-Dist: cdktf<1.0,>=0.17.0
 Requires-Dist: constructs<11.0,>=10.0.0
 Requires-Dist: cdktf-cdktf-provider-aws>=12.0.0
@@ -24,6 +42,7 @@ Requires-Dist: BuzzerboyArchetype
 Requires-Dist: AWSArchitectureBase
 Dynamic: author
 Dynamic: home-page
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 

buzzerboyawslightsail-0.330.1.dist-info/RECORD

@@ -0,0 +1,11 @@
+BuzzerboyAWSLightsailStack/LightSailPostDeploy.py,sha256=uOEOe5qORPgvivC0Ba0w045PQztfS6z-ynwyikaPQzI,5025
+BuzzerboyAWSLightsailStack/LightsailAIContainer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+BuzzerboyAWSLightsailStack/LightsailBase.py,sha256=Fn1RQv4lVtkLmCZH6FFpxpnGQ6W0CRjF7nNNjI_uFjY,26085
+BuzzerboyAWSLightsailStack/LightsailContainer.py,sha256=XnJU1iydnmiWTB_9MNIA9pnvsAnMyymuw38koKJj4bM,13831
+BuzzerboyAWSLightsailStack/LightsailDatabase.py,sha256=hXZzphlD3COTd7J7yNjzHFqQu-wvh1fX6k7LRoPvews,15962
+BuzzerboyAWSLightsailStack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+buzzerboyawslightsail-0.330.1.dist-info/licenses/LICENSE,sha256=hxCyRAUWBBbbve3BaE8Qtl_sxcUo-8AYNAslHjeiu3w,921
+buzzerboyawslightsail-0.330.1.dist-info/METADATA,sha256=vYh8iPWubNWfx3fcSktLnl3H8T7J5c7n6kKSNOT343I,4942
+buzzerboyawslightsail-0.330.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+buzzerboyawslightsail-0.330.1.dist-info/top_level.txt,sha256=xqYoH36d7_13q4vRi5bZr1zIz9mR7b8ms_6ez3BqRgQ,27
+buzzerboyawslightsail-0.330.1.dist-info/RECORD,,

buzzerboyawslightsail-0.330.1.dist-info/licenses/LICENSE

@@ -0,0 +1,17 @@
+Copyright (c) 2024 Buzzerboy Inc. Canada. All Rights Reserved.
+
+This product and associated files (the "Software") is only available for use
+within projects developed by Buzzerboy Inc. Canada with subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+For commercial projects, permission of use is required by sending an email to info@buzzerboy.com
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

buzzerboyawslightsail-0.329.1.dist-info/RECORD

@@ -1,10 +0,0 @@
-BuzzerboyAWSLightsailStack/LightSailPostDeploy.py,sha256=uOEOe5qORPgvivC0Ba0w045PQztfS6z-ynwyikaPQzI,5025
-BuzzerboyAWSLightsailStack/LightsailAIContainer.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-BuzzerboyAWSLightsailStack/LightsailBase.py,sha256=YfQrFNHvdWxGgpgy1A2CgAD2R5fz_ebQyVaADZaxCPw,25946
-BuzzerboyAWSLightsailStack/LightsailContainer.py,sha256=_PvA5fMFEHdlI-jATcDTOAOs6R0MHwBj5Hjudh4SMxI,13314
-BuzzerboyAWSLightsailStack/LightsailDatabase.py,sha256=hffRjVbYADV7SK5cD4orwt0etb-pTDxtQvEv58iQyyI,15425
-BuzzerboyAWSLightsailStack/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-buzzerboyawslightsail-0.329.1.dist-info/METADATA,sha256=CXKk9RZiVbGDaQksYC_7spEH2HqjlK5I2-ORAbpdPj4,3839
-buzzerboyawslightsail-0.329.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-buzzerboyawslightsail-0.329.1.dist-info/top_level.txt,sha256=xqYoH36d7_13q4vRi5bZr1zIz9mR7b8ms_6ez3BqRgQ,27
-buzzerboyawslightsail-0.329.1.dist-info/RECORD,,