Merge branch 'fix/deprecate-BDA-Arn-stack-param' into 'develop'

Removed Bedrock Data Automation (BDA) Project ARN CloudFormation parameter

See merge request genaiic-reusable-assets/engagement-artifacts/genaiic-idp-accelerator!568

Author: rstrahan

CHANGELOG.md

@@ -5,6 +5,10 @@ SPDX-License-Identifier: MIT-0
 
 ## [Unreleased]
 
+### Changed
+
+- **Removed `Bedrock Data Automation (BDA) Project ARN` CloudFormation parameter** — The deploy-time `Pattern1BDAProjectArn` parameter has been removed as it was redundant with the per-config-version BDA project management already available in the Web UI, CLI, and GraphQL API. BDA projects are now managed entirely post-deployment: enable `use_bda: true` in your configuration, then use "Sync to BDA" to create or link a BDA project, or "Sync from BDA" to import from any existing BDA project. This simplifies the deployment experience (one fewer parameter) and better aligns the CloudFormation interface with the system's actual architecture. Existing deployed stacks are unaffected — runtime BDA project ARN resolution reads from DynamoDB per-version tracking, not from the CloudFormation parameter. Also removed the unused `nested/bda-lending-project/` directory (dead code not referenced by any template) and the legacy `BDA_PROJECT_ARN` environment variable fallback from the sync resolver.
+
 ### Fixed
 
 - **CLI: Remove deprecated `--pattern` references** — Updated `idp-cli.md` and CLI code to reflect the unified pattern architecture. Removed `--pattern` from all deploy and config command examples/options.

VERSION

@@ -1 +1 @@
-0.5.2-wip1
+0.5.2-wip2

docs/configuration.md

@@ -281,7 +281,6 @@ Key parameters that can be configured during CloudFormation deployment:
 
 ### Pattern-Specific Parameters
 - **Configuration Preset**: `ConfigurationPreset` — Select from available presets (lending-package-sample, bank-statement-sample, etc.)
-- **BDA Project ARN**: Optional existing Bedrock Data Automation project ARN (for BDA mode)
 - **Custom Model ARNs**: Optional custom fine-tuned classification/extraction model ARNs
 
 > **Note**: The processing mode (BDA vs Pipeline) is controlled by the `use_bda` flag in the configuration, not by deployment parameters. See the [architecture docs](./architecture.md) for details.

nested/appsync/extracted_resources.yaml

@@ -1466,10 +1466,6 @@
           LOG_LEVEL: !Ref LogLevel
           CONFIGURATION_TABLE_NAME: !Ref ConfigurationTable
           STACK_NAME: !Ref AWS::StackName
-          BDA_PROJECT_ARN: !If
-            - HasPattern1BDAProjectArn
-            - !Ref Pattern1BDAProjectArn
-            - !GetAtt BDASAMPLEPROJECT.Outputs.ProjectArn
       LoggingConfig:
         LogGroup: !Ref SyncBdaIdpResolverFunctionLogGroup
       Policies:
@@ -1507,10 +1503,7 @@
                 - bedrock:ListBlueprints
                 - bedrock:DeleteBlueprint
               Resource:
-                - !If
-                  - HasPattern1BDAProjectArn
-                  - !Ref Pattern1BDAProjectArn
-                  - !GetAtt BDASAMPLEPROJECT.Outputs.ProjectArn
+                - !Sub "arn:${AWS::Partition}:bedrock:${AWS::Region}:${AWS::AccountId}:data-automation-project/*"
                 - !Sub "arn:${AWS::Partition}:bedrock:${AWS::Region}:${AWS::AccountId}:blueprint/*"
                 - !Sub "arn:${AWS::Partition}:bedrock:${AWS::Region}:aws:blueprint/*"
 

nested/appsync/src/lambda/sync_bda_idp_resolver/index.py

@@ -24,8 +24,7 @@ def handler(event: Dict[str, Any], context) -> Dict[str, Any]:
     BDA project ARN resolution order:
     1. Explicit bdaProjectArn from UI arguments (user-provided)
     2. Version tracking table (previously linked project)
-    3. BDA_PROJECT_ARN env var (legacy/migration fallback)
-    4. Auto-create new project (for idp_to_bda direction)
+    3. Auto-create new project (for idp_to_bda direction)
     
     Supports four sync directions:
     - "bda_to_idp": Sync from BDA blueprints to IDP classes (read BDA, update IDP)
@@ -51,9 +50,6 @@ def handler(event: Dict[str, Any], context) -> Dict[str, Any]:
         config_table = os.environ.get('CONFIGURATION_TABLE_NAME')
         manager = ConfigurationManager(table_name=config_table) if config_table else None
 
-        # Legacy fallback: env var from CloudFormation deployment
-        default_bda_project_arn = os.environ.get('BDA_PROJECT_ARN')
-        
         # Resolve BDA project ARN using priority chain
         bda_project_arn = None
         arn_source = None
@@ -78,26 +74,13 @@ def handler(event: Dict[str, Any], context) -> Dict[str, Any]:
                 arn_source = "version-tracking"
                 logger.info(f"Using tracked BDA project ARN for version '{versionName}': {bda_project_arn}")
 
-        # Priority 3: Legacy env var fallback (skip if CREATE_NEW was requested)
-        if not bda_project_arn and not force_create_new and default_bda_project_arn:
-            bda_project_arn = default_bda_project_arn
-            arn_source = "env-var-legacy"
-            logger.info(f"Using legacy BDA_PROJECT_ARN env var: {bda_project_arn}")
-            # Migrate: save this legacy ARN to version tracking for future use
-            if manager and save_arn:
-                try:
-                    manager.set_bda_project_arn(versionName, bda_project_arn, "synced")
-                    logger.info(f"Migrated legacy BDA ARN to version tracking for '{versionName}'")
-                except Exception as e:
-                    logger.warning(f"Failed to migrate legacy BDA ARN to version tracking: {e}")
-        
-        # Priority 4: Auto-create for idp_to_bda or bidirectional (or when CREATE_NEW forced)
+        # Priority 3: Auto-create for idp_to_bda or bidirectional (or when CREATE_NEW forced)
         if not bda_project_arn and (force_create_new or sync_direction in ("idp_to_bda", "bidirectional")):
             logger.info(f"No BDA project found, auto-creating for version '{versionName}'")
             if manager:
                 manager.set_bda_sync_status(versionName, "creating")
             try:
-                bda_service = BdaBlueprintService(dataAutomationProjectArn=default_bda_project_arn)
+                bda_service = BdaBlueprintService()
                 bda_project_arn = bda_service.get_or_create_project_for_version(versionName)
                 arn_source = "auto-created"
                 logger.info(f"Auto-created BDA project for version '{versionName}': {bda_project_arn}")

nested/appsync/template.yaml

@@ -173,13 +173,6 @@ Parameters:
     Type: String
     AllowedValues: ["true", "false"]
 
-  Pattern1BDAProjectArn:
-    Type: String
-  
-  HasPattern1BDAProjectArn:
-    Type: String
-    AllowedValues: ["true", "false"]
-  
   # Lambda Layers from main template
   IDPCommonBaseLayerArn:
     Type: String
@@ -194,7 +187,6 @@ Conditions:
   HasGuardrail: !Equals [!Ref HasGuardrailConfig, "true"]
   ShouldCreateEvaluationBaselineBucket: !Equals [!Ref ShouldCreateEvaluationBaselineBucket, "true"]
   ShouldCreateReportingBucket: !Equals [!Ref ShouldCreateReportingBucket, "true"]
-  HasBDAProjectArn: !Equals [!Ref HasPattern1BDAProjectArn, "true"]
 
 Resources:
 
@@ -2679,10 +2671,6 @@ Resources:
           LOG_LEVEL: !Ref LogLevel
           CONFIGURATION_TABLE_NAME: !Ref ConfigurationTableName
           STACK_NAME: !Ref StackName
-          BDA_PROJECT_ARN: !If
-            - HasBDAProjectArn
-            - !Ref Pattern1BDAProjectArn
-            - !Ref Pattern1BDAProjectArn
       LoggingConfig:
         LogGroup: !Ref SyncBdaIdpResolverFunctionLogGroup
       Policies: