fixes for latest changes

Author: sathyaws

lib/idp_common_pkg/idp_common/bda/bda_blueprint_creator.py

@@ -74,9 +74,7 @@ def update_data_automation_project(self, projectArn: str, blueprint):
             logger.error(f"Failed to update data automation project: {e}")
             return None
 
-    def update_data_automation_project_with_custom_configurations(
-        self, projectArn: str, customConfiguration
-    ):
+    def update_project_with_custom_configurations(self, projectArn: str, customConfiguration):
         """
         Update an existing Bedrock Data Automation project with the provided blueprint.
 
@@ -93,7 +91,7 @@ def update_data_automation_project_with_custom_configurations(
             )
             project = project.get("project", None)
             logger.info(f"Updating project: {project}")
-
+            
             logger.info(f"Updating updated data automation project: {projectArn}")
             response = self.bedrock_client.update_data_automation_project(
                 projectArn=projectArn,
@@ -354,27 +352,26 @@ def get_blueprint(self, blueprint_arn, stage):
             logger.error(f"Error updating blueprint: {e}")
             raise e
 
-    def list_blueprints(self, projectArn, projectStage):
+
+    def list_blueprints(self, projectArn, projectStage ):
         try:
             project = self.bedrock_client.get_data_automation_project(
                 projectArn=projectArn, projectStage="LIVE"
             )
             project = project.get("project", None)
             logger.info(f"Updating project: {project}")
             customOutputConfiguration = project.get("customOutputConfiguration", None)
-
+            
             return customOutputConfiguration
 
         except Exception as e:
             logger.error(f"Error updating blueprint: {e}")
             raise e
-
-    def delete_blueprint(self, blueprint_arn, blueprint_version):
+    
+    def delete_blueprint(self, blueprint_arn, blueprint_version ):
         try:
-            return self.bedrock_client.delete_blueprint(
-                blueprintArn=blueprint_arn, blueprintVersion=blueprint_version
-            )
-
+            return self.bedrock_client.delete_blueprint(blueprintArn=blueprint_arn, blueprintVersion=blueprint_version )
+            
         except Exception as e:
             logger.error(f"Error delete_blueprint: {e}")
             raise e

lib/idp_common_pkg/idp_common/bda/bda_blueprint_service.py

@@ -149,7 +149,7 @@ def _check_for_updates(self, custom_class: dict, blueprint: dict):
         # blueprint = self.blueprint_creator.get_blueprint(blueprint_arn, stage="LIVE")
         # print(f"blueprint retrieved {blueprint}")
         # get the schema
-        schema = blueprint["blueprint"]["schema"]
+        schema = blueprint["schema"]
         schema = json.loads(schema)
         # get the document class
         definitions = schema["definitions"]
@@ -262,6 +262,7 @@ def create_blueprints_from_custom_configuration(self):
                         logger.info(
                             f"Found existing blueprint for class {docu_class}: {blueprint_name}"
                         )
+                        blueprints_updated.append(blueprint_arn)
 
                         # Check for updates on existing blueprint
                         if self._check_for_updates(
@@ -293,7 +294,7 @@ def create_blueprints_from_custom_configuration(self):
                             logger.info(
                                 f"No updates needed for existing blueprint {blueprint_name}"
                             )
-                        blueprints_updated.append(blueprint_arn)
+                        
                     else:
                         # create new blueprint
                         # Call the create_blueprint method
@@ -329,6 +330,7 @@ def create_blueprints_from_custom_configuration(self):
                         custom_class["blueprint_version"] = result.get("blueprint").get(
                             "blueprint_version"
                         )
+                        blueprints_updated.append(blueprint_arn)
                         logger.info(
                             f"Created new blueprint for class {docu_class}: {blueprint_name}"
                         )

patterns/pattern-1/src/bda_discovery_function/index.py

@@ -32,8 +32,6 @@ def handler(event, context):
 
     batch_item_failures = []
     sqs_batch_response = {}
-    status = 'SUCCESS'
-
     try:
         bda_project_arn = os.environ.get("BDA_PROJECT_ARN")
         bdaBlueprintService = BdaBlueprintService( dataAutomationProjectArn=bda_project_arn )

patterns/pattern-1/template.yaml

@@ -776,7 +776,7 @@ Resources:
                 - bedrock:CreateBlueprint
                 - bedrock:CreateBlueprintVersion
                 - bedrock:ListBlueprints
-                - bedrock:DeletBlueprint
+                - bedrock:DeleteBlueprint
               Resource:
                 - !Ref BDAProjectArn
                 - !Sub "arn:${AWS::Partition}:bedrock:${AWS::Region}:${AWS::AccountId}:blueprint/*"