Add global pattern configuration and fix CLI smoketest path issues

Ensure stack cleanup happens on both success and failure

Author: Taniya Mathur

scripts/sdlc/idp-cli/src/idp_cli/cli/main.py

@@ -1,6 +1,13 @@
 # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 # SPDX-License-Identifier: MIT-0
 
+# Global pattern configuration - modify these to control which patterns are deployed/tested
+DEPLOY_PATTERNS = {
+    "p1": "Pattern1 - Packet or Media processing with Bedrock Data Automation (BDA)",
+    # "p2": "Pattern2 - Packet processing with Textract and Bedrock",
+    # "p3": "Pattern3 - Packet processing with Textract, SageMaker(UDOP), and Bedrock"
+}
+
 import os
 import sys
 from idp_cli.service.install_service import InstallService

scripts/sdlc/idp-cli/src/idp_cli/service/install_service.py

@@ -363,10 +363,8 @@ def install(self, admin_email: str):
         Args:
             admin_email: Email address for the admin user
         """
-        patterns = {
-            "p1": "Pattern1 - Packet or Media processing with Bedrock Data Automation (BDA)",
-            "p2": "Pattern2 - Packet processing with Textract and Bedrock"
-        }
+        from idp_cli.cli.main import DEPLOY_PATTERNS
+        patterns = DEPLOY_PATTERNS
 
         def deploy_pattern(suffix, pattern_name):
             stack_name = f"{self.cfn_prefix}-{suffix}"

scripts/sdlc/idp-cli/src/idp_cli/service/smoketest_idp_cli_service.py

@@ -36,6 +36,7 @@ def do_smoketest(self):
 
             # Deploy stack using idp-cli deploy
             logger.info(f"Deploying stack {self.stack_name}...")
+            # Use pattern-2 specifically for CLI smoketest
             subprocess.run([
                 "idp-cli", "deploy",
                 "--stack-name", self.stack_name,
@@ -49,7 +50,7 @@ def do_smoketest(self):
 
             # Run inference using IDP CLI with custom batch ID
             logger.info(f"Running inference with batch ID: {batch_id}...")
-            samples_path = os.path.join(self.cwd, "samples/")
+            samples_path = "samples/"
             subprocess.run([
                 "idp-cli", "run-inference",
                 "--stack-name", self.stack_name,
@@ -84,17 +85,20 @@ def do_smoketest(self):
                         raise Exception("Expected content 'ANYTOWN, USA 12345' not found in result.json")
 
             logger.info("✅ IDP CLI smoketest completed successfully!")
-            
-            # Always cleanup test deployment
-            logger.info(f"Cleaning up deployment {self.stack_name}...")
-            subprocess.run([
-                "idp-cli", "delete",
-                "--stack-name", self.stack_name,
-                "--force"
-            ], check=True, cwd=self.cwd)
-            
             return True
 
         except Exception as e:
             logger.exception(f"Error during IDP CLI smoketest: {str(e)}")
             return False
+        finally:
+            # Always cleanup test deployment regardless of success/failure
+            try:
+                logger.info(f"Cleaning up deployment {self.stack_name}...")
+                subprocess.run([
+                    "idp-cli", "delete",
+                    "--stack-name", self.stack_name,
+                    "--force"
+                ], check=True, cwd=self.cwd)
+                logger.info("✅ Cleanup completed successfully!")
+            except Exception as cleanup_error:
+                logger.error(f"Failed to cleanup deployment {self.stack_name}: {cleanup_error}")

scripts/sdlc/idp-cli/src/idp_cli/service/smoketest_service.py

@@ -16,8 +16,10 @@ def __init__(self,
                  file_path: str, 
                  verify_string: str):
 
+        from idp_cli.cli.main import DEPLOY_PATTERNS
+        
         self.stack_name_prefix = stack_name_prefix
-        self.stack_names = [f"{stack_name_prefix}-p1", f"{stack_name_prefix}-p2"]
+        self.stack_names = [f"{stack_name_prefix}-{suffix}" for suffix in DEPLOY_PATTERNS.keys()]
         self.file_path = file_path
         self.verify_string = verify_string