more updates for rule zip

Author: cyphronix

aws_sra_examples/solutions/genai/bedrock_org/lambda/src/app.py

@@ -498,6 +498,15 @@ def deploy_config_rules(region, accounts, resource_properties):
                 # for region in rule_regions:
                 # 3b) Deploy lambda for custom config rule
                 if DRY_RUN is False:
+                    # download rule zip file
+                    s3_key = f"rules/{rule_name}/{rule_name}.zip"
+                    local_base_path = '/tmp/sra_staging_upload'
+                    local_file_path = os.path.join(local_base_path, 'rules', rule_name, f'{rule_name}.zip')
+                    s3.download_s3_file(local_file_path, s3_key, s3.STAGING_BUCKET)
+                    LIVE_RUN_DATA[f"{rule_name}_{acct}_{region}_LambdaCode"] = "Downloaded custom config rule lambda code"
+                    CFN_RESPONSE_DATA["deployment_info"]["action_count"] += 1
+                    
+                    LOGGER.info(f"Deploying lambda for custom config rule in {acct} in {region}")
                     lambda_arn = deploy_lambda_function(acct, rule_name, role_arn, region)
                     LIVE_RUN_DATA[f"{rule_name}_{acct}_{region}_Lambda"] = "Deployed custom config lambda function"
                     CFN_RESPONSE_DATA["deployment_info"]["action_count"] += 1

aws_sra_examples/solutions/genai/bedrock_org/lambda/src/sra_s3.py

@@ -123,19 +123,15 @@ def stage_code_to_s3(self, directory_path, bucket_name, s3_path):
                     return
                 self.LOGGER.info(f"Uploaded {local_path} to {bucket_name} {s3_file_path}")
 
-    def download_s3_file(self, rule_name, bucket_name):
+    def download_s3_file(self, local_file_path, s3_key, bucket_name):
         """
         Downloads the rule code from the staging S3 bucket.
 
-        :param rule_name: Name of the rule
+        :param local_file_path: Local path to save the downloaded file
+        :param s3_key: Name of the S3 bucket key
         :param bucket_name: Name of the S3 bucket
         """
-        self.LOGGER.info(f"Downloading {rule_name} rule code from s3...")
-        s3_key_template = 'rules/{rule_name}/{rule_name}.zip'
-        local_base_path = '/tmp/sra_staging_upload'
-        
-        s3_key = s3_key_template.format(rule_name=rule_name)
-        local_file_path = os.path.join(local_base_path, 'rules', rule_name, f'{rule_name}.zip')
+        self.LOGGER.info(f"Downloading file from s3...")
 
         # Ensure local directories exist
         os.makedirs(os.path.dirname(local_file_path), exist_ok=True)