Merge branch 'develop' of ssh.gitlab.aws.dev:genaiic-reusable-assets/engagement-artifacts/genaiic-idp-accelerator into develop

Author: Bob Strahan

.gitlab-ci.yml

@@ -125,7 +125,7 @@ integration_tests:
     - unzip awscliv2.zip
     - ./aws/install
     # Install boto3 for Python script
-    - pip install boto3
+    - pip install boto3 rich
 
   script:
     - aws --version
@@ -134,7 +134,7 @@ integration_tests:
     # Set environment variables for Python script
     - export IDP_ACCOUNT_ID=${IDP_ACCOUNT_ID:-020432867916}
     - export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:-us-east-1}
-    - export IDP_PIPELINE_NAME=idp-sdlc-deploy-pipeline
+    - export IDP_PIPELINE_NAME=genaiic-sdlc-deploy-pipeline
 
     # Run integration test deployment
     - python3 scripts/integration_test_deployment.py
@@ -147,7 +147,7 @@ integration_tests:
         echo "Pipeline Execution: $EXECUTION_ID"
         
         # Get CodeBuild ID from the pipeline execution
-        BUILD_ID=$(aws codepipeline list-action-executions --pipeline-name ${IDP_PIPELINE_NAME:-idp-sdlc-deploy-pipeline} --filter pipelineExecutionId=$EXECUTION_ID --query 'actionExecutionDetails[?actionName==`BuildAction`].output.executionResult.externalExecutionId' --output text 2>/dev/null || echo "")
+        BUILD_ID=$(aws codepipeline list-action-executions --pipeline-name ${IDP_PIPELINE_NAME:-genaiic-sdlc-deploy-pipeline} --filter pipelineExecutionId=$EXECUTION_ID --query 'actionExecutionDetails[?actionName==`BuildAction`].output.executionResult.externalExecutionId' --output text 2>/dev/null || echo "")
         
         if [ "$BUILD_ID" != "" ] && [ "$BUILD_ID" != "None" ]; then
           echo "CodeBuild ID: $BUILD_ID"
@@ -175,7 +175,6 @@ integration_tests:
           else
             echo "⚠️ No deployment summary found - check codebuild_logs.txt for details"
           fi
-          fi
         else
           echo "Could not find CodeBuild execution"
         fi

scripts/cleanup-logs.py

@@ -79,7 +79,7 @@ def publish_templates():
     region = get_env_var("AWS_DEFAULT_REGION", "us-east-1")
 
     # Generate bucket name and prefix
-    bucket_basename = f"idp-sdlc-sourcecode-{account_id}-{region}"
+    bucket_basename = f"genaiic-sdlc-sourcecode-{account_id}-{region}"
     prefix = f"codebuild-{datetime.now().strftime('%Y%m%d-%H%M%S')}"
 
     # Run publish.sh
@@ -450,37 +450,16 @@ def cleanup_stack(stack_name, pattern_name):
 
         # Delete the stack and wait for completion
         print(f"[{pattern_name}] Attempting stack deletion...")
-        run_command(f"idp-cli delete --stack-name {stack_name} --force --empty-buckets --wait", check=False)
+        run_command(f"idp-cli delete --stack-name {stack_name} --force --empty-buckets --force-delete-all --wait", check=False)
 
-        # Always clean up orphaned resources after deletion attempt
-        print(f"[{pattern_name}] Cleaning up orphaned resources...")
+        # Clean up additional log groups that might not be caught by idp-cli
+        print(f"[{pattern_name}] Cleaning up additional log groups...")
 
         # Set AWS retry configuration to handle throttling
         os.environ['AWS_MAX_ATTEMPTS'] = '10'
         os.environ['AWS_RETRY_MODE'] = 'adaptive'
-        
-        # ECR repositories
-        print(f"[{pattern_name}] Cleaning up ECR repositories...")
-        result = run_command(f"aws ecr describe-repositories --query 'repositories[?contains(repositoryName, `{stack_name}`)].repositoryName' --output text", check=False)
-        if result.stdout.strip():
-            repo_names = [name for name in result.stdout.strip().split('\t') if name]
-            for repo_name in repo_names:
-                print(f"[{pattern_name}] Deleting ECR repository: {repo_name}")
-                run_command(f"aws ecr delete-repository --repository-name '{repo_name}' --force", check=False)
-
-        # S3 buckets (empty and delete orphaned buckets)
-        print(f"[{pattern_name}] Cleaning up S3 buckets...")
-        result = run_command(f"aws s3api list-buckets --query 'Buckets[?contains(Name, `{stack_name}`)].Name' --output text", check=False)
-        if result.stdout.strip():
-            bucket_names = [name for name in result.stdout.strip().split('\t') if name]
-            for bucket_name in bucket_names:
-                print(f"[{pattern_name}] Deleting bucket: {bucket_name}")
-                # Try versioned bucket deletion first, fallback to regular deletion
-                if not delete_versioned_bucket(bucket_name):
-                    run_command(f"aws s3 rb s3://{bucket_name} --force", check=False)
 
         # CloudWatch log groups
-        print(f"[{pattern_name}] Cleaning up CloudWatch log groups...")
         result = run_command(f"aws logs describe-log-groups --query 'logGroups[?contains(logGroupName, `{stack_name}`)].logGroupName' --output json", check=False)
         if result.stdout.strip():
             try:
@@ -494,7 +473,6 @@ def cleanup_stack(stack_name, pattern_name):
                 print(f"[{pattern_name}] Failed to parse log group names")
 
         # AppSync logs
-        print(f"[{pattern_name}] Cleaning up AppSync logs...")
         result = run_command(f"aws appsync list-graphql-apis --query 'graphqlApis[?contains(name, `{stack_name}`)].apiId' --output json", check=False)
         if result.stdout.strip():
             try:
@@ -508,7 +486,6 @@ def cleanup_stack(stack_name, pattern_name):
                 print(f"[{pattern_name}] Failed to parse AppSync API IDs")
 
         # Clean up CloudWatch Logs Resource Policy only if stack-specific
-        print(f"[{pattern_name}] Checking CloudWatch resource policies...")
         result = run_command(f"aws logs describe-resource-policies --query 'resourcePolicies[?contains(policyName, `{stack_name}`)].policyName' --output text", check=False)
         if result.stdout.strip():
             policy_names = [name for name in result.stdout.strip().split('\t') if name]

scripts/codebuild_deployment.py

@@ -11,6 +11,8 @@
 import time
 
 import boto3
+from rich.console import Console
+from rich.progress import Progress, SpinnerColumn, TextColumn, TimeElapsedColumn
 
 
 def run_command(cmd, check=True):
@@ -104,76 +106,108 @@ def upload_to_s3(bucket_name):
 
 def find_pipeline_execution_by_version(pipeline_name, version_id, max_wait=300):
     """Find pipeline execution that corresponds to specific S3 version ID"""
-    print(f"Finding pipeline execution for version: {version_id}")
+    console = Console()
+    console.print(f"[cyan]Finding pipeline execution for version:[/cyan] {version_id}")
 
     codepipeline = boto3.client("codepipeline")
     start_time = time.time()
 
-    while time.time() - start_time < max_wait:
-        try:
-            response = codepipeline.list_pipeline_executions(
-                pipelineName=pipeline_name, maxResults=10
-            )
-            
-            for execution in response["pipelineExecutionSummaries"]:
-                execution_id = execution["pipelineExecutionId"]
-                
-                # Get execution details to check source version
-                details = codepipeline.get_pipeline_execution(
-                    pipelineName=pipeline_name,
-                    pipelineExecutionId=execution_id
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+        TimeElapsedColumn(),
+        console=console,
+        transient=False,
+    ) as progress:
+        
+        task = progress.add_task("[yellow]Searching for pipeline execution...", total=None)
+        
+        while time.time() - start_time < max_wait:
+            try:
+                response = codepipeline.list_pipeline_executions(
+                    pipelineName=pipeline_name, maxResults=10
                 )
 
-                # Check if this execution matches our version ID
-                for artifact in details["pipelineExecution"].get("artifactRevisions", []):
-                    if artifact.get("revisionId") == version_id:
-                        print(f"✅ Found matching execution: {execution_id}")
-                        return execution_id
+                for execution in response["pipelineExecutionSummaries"]:
+                    execution_id = execution["pipelineExecutionId"]
+                    
+                    # Get execution details to check source version
+                    details = codepipeline.get_pipeline_execution(
+                        pipelineName=pipeline_name,
+                        pipelineExecutionId=execution_id
+                    )
+                    
+                    # Check if this execution matches our version ID
+                    for artifact in details["pipelineExecution"].get("artifactRevisions", []):
+                        if artifact.get("revisionId") == version_id:
+                            progress.update(task, description="[green]✅ Found matching execution!")
+                            console.print(f"[green]✅ Found matching execution:[/green] {execution_id}")
+                            return execution_id
+                
+                elapsed = int(time.time() - start_time)
+                progress.update(task, description=f"[yellow]Waiting for pipeline trigger ({elapsed}s)...")
 
-        except Exception as e:
-            print(f"Error finding execution: {e}")
-            
-        time.sleep(10)
-    
-    print(f"❌ Could not find pipeline execution for version {version_id}")
+            except Exception as e:
+                progress.update(task, description=f"[red]Error: {str(e)[:50]}...")
+                console.print(f"[red]Error finding execution: {e}[/red]")
+                
+            time.sleep(10)
+        
+        progress.update(task, description="[red]❌ No matching execution found")
+        console.print(f"[red]❌ Could not find pipeline execution for version {version_id}[/red]")
     return None
 
 
 def monitor_pipeline_execution(pipeline_name, execution_id, max_wait=7200):
-    """Monitor specific pipeline execution until completion"""
-    print(f"Monitoring execution: {execution_id}")
+    """Monitor specific pipeline execution until completion with live progress"""
+    console = Console()
+    console.print(f"[cyan]Monitoring pipeline execution:[/cyan] {execution_id}")
 
     codepipeline = boto3.client("codepipeline")
-    wait_time = 0
     poll_interval = 30
 
-    while wait_time < max_wait:
-        try:
-            response = codepipeline.get_pipeline_execution(
-                pipelineName=pipeline_name,
-                pipelineExecutionId=execution_id
-            )
-            
-            status = response["pipelineExecution"]["status"]
-            print(f"Pipeline execution {execution_id}: {status}")
-            
-            if status == "Succeeded":
-                print("✅ Pipeline completed successfully!")
-                return True
-            elif status in ["Failed", "Cancelled", "Superseded"]:
-                print(f"❌ Pipeline failed with status: {status}")
-                return False
-            elif status == "InProgress":
-                print(f"⏳ Pipeline still running... ({wait_time}s elapsed)")
+    with Progress(
+        SpinnerColumn(),
+        TextColumn("[progress.description]{task.description}"),
+        TimeElapsedColumn(),
+        console=console,
+        transient=False,
+    ) as progress:
+        
+        task = progress.add_task("[yellow]Pipeline executing...", total=None)
+        
+        wait_time = 0
+        while wait_time < max_wait:
+            try:
+                response = codepipeline.get_pipeline_execution(
+                    pipelineName=pipeline_name,
+                    pipelineExecutionId=execution_id
+                )
 
-        except Exception as e:
-            print(f"Error checking pipeline status: {e}")
-            
-        time.sleep(poll_interval)
-        wait_time += poll_interval
-    
-    print(f"❌ Pipeline monitoring timed out after {max_wait} seconds")
-    return False
+                status = response["pipelineExecution"]["status"]
+                elapsed_mins = wait_time // 60
+                
+                if status == "Succeeded":
+                    progress.update(task, description="[green]✅ Pipeline completed successfully!")
+                    console.print("[green]✅ Pipeline completed successfully![/green]")
+                    return True
+                elif status in ["Failed", "Cancelled", "Superseded"]:
+                    progress.update(task, description=f"[red]❌ Pipeline failed: {status}")
+                    console.print(f"[red]❌ Pipeline failed with status: {status}[/red]")
+                    return False
+                elif status == "InProgress":
+                    progress.update(task, description=f"[yellow]⏳ Pipeline running ({elapsed_mins}m elapsed)...")
+                    
+            except Exception as e:
+                progress.update(task, description=f"[red]Error: {str(e)[:50]}...")
+                console.print(f"[red]Error checking pipeline status: {e}[/red]")
+                
+            time.sleep(poll_interval)
+            wait_time += poll_interval
+        
+        progress.update(task, description=f"[red]❌ Timeout after {max_wait//60} minutes")
+        console.print(f"[red]❌ Pipeline monitoring timed out after {max_wait} seconds[/red]")
+        return False
 
 
 def monitor_pipeline(pipeline_name, version_id, max_wait=7200):
@@ -200,8 +234,8 @@ def main():
     # Get configuration from environment
     account_id = get_env_var("IDP_ACCOUNT_ID", "020432867916")
     region = get_env_var("AWS_DEFAULT_REGION", "us-east-1")
-    bucket_name = f"idp-sdlc-sourcecode-{account_id}-{region}"
-    pipeline_name = get_env_var("IDP_PIPELINE_NAME", "idp-sdlc-deploy-pipeline")
+    bucket_name = f"genaiic-sdlc-sourcecode-{account_id}-{region}"
+    pipeline_name = get_env_var("IDP_PIPELINE_NAME", "genaiic-sdlc-deploy-pipeline")
 
     print(f"Account ID: {account_id}")
     print(f"Region: {region}")

scripts/integration_test_deployment.py

@@ -12,11 +12,11 @@ SPDX-License-Identifier: MIT-0
 * Install the `credential-vendor.yml` cloudformation template.
     * Enter the gitlab group name (e.g. `genaiic-reusable-assets/engagement-artifacts`)
     * Enter the gitlap project name (e.g. `genaiic-idp-accelerator`)
-    * Enter the bucket name created in the last step (e.g. `idp-sdlc-source-code-YOUR_AWS_ACCOUNT-YOUR_REGION`)
+    * Enter the bucket name created in the last step (e.g. `genaiic-sdlc-source-code-YOUR_AWS_ACCOUNT-YOUR_REGION`)
 * Customize the environment variables in your CodePipeline/CodeBuild configuration.
 * The deployment will use the new `scripts/codebuild_deployment.py` script automatically.
     * This will ensure that an archive is there to install, when 
 * Optional: Install the `sdlc-iam-role.yml` for least privilege sdlc operation (coming soon!)
 * Install the `codepipeline-s3.yml` cloudformation template.
-    * Optional: add the iam role created in the last step (e.g. `arn:aws:iam::YOUR_AWS_ACCOUNT:role/idp-sdlc-role`)
-    * Be sure to replace the `idp-sdlc-source-code-YOUR_AWS_ACCOUNT-YOUR_REGION` with the name of the sourcecode bucket you created.
+    * Optional: add the iam role created in the last step (e.g. `arn:aws:iam::YOUR_AWS_ACCOUNT:role/genaiic-sdlc-role`)
+    * Be sure to replace the `genaiic-sdlc-source-code-YOUR_AWS_ACCOUNT-YOUR_REGION` with the name of the sourcecode bucket you created.