Merge branch 'main' of github.com:ModusCreateOrg/app-med-ai-gen into ADE-174-backend

Author: GuidoBR

.github/workflows/deploy-development.yml

@@ -55,6 +55,9 @@ jobs:
           cd backend
           npm ci
 
+      - name: Install latest AWS CDK
+        run: npm install -g aws-cdk
+
       - name: Build application
         run: |
           cd backend

backend/src/document-processor/services/aws-bedrock.service.ts

@@ -147,16 +147,17 @@ Document text:
     const secretAccessKey = this.configService.get<string>('aws.aws.secretAccessKey');
     const sessionToken = this.configService.get<string>('aws.aws.sessionToken');
 
-    if (!region || !accessKeyId || !secretAccessKey) {
-      throw new Error('Missing required AWS configuration');
+    const clientConfig: any = { region };
+
+    if (accessKeyId && secretAccessKey) {
+      clientConfig.credentials = {
+        accessKeyId,
+        secretAccessKey,
+        ...(sessionToken && { sessionToken }),
+      };
     }
 
-    const credentials = this.createCredentialsObject(accessKeyId, secretAccessKey, sessionToken);
-
-    const client = new BedrockRuntimeClient({
-      region,
-      credentials,
-    });
+    const client = new BedrockRuntimeClient(clientConfig);
 
     this.logger.log(
       `AWS client initialized with region ${region} and credentials ${accessKeyId ? '(provided)' : '(missing)'}, session token ${sessionToken ? '(provided)' : '(not provided)'}`,
@@ -165,30 +166,6 @@ Document text:
     return client;
   }
 
-  /**
-   * Create AWS credentials object with proper typing
-   */
-  private createCredentialsObject(
-    accessKeyId: string,
-    secretAccessKey: string,
-    sessionToken?: string,
-  ): {
-    accessKeyId: string;
-    secretAccessKey: string;
-    sessionToken?: string;
-  } {
-    const credentials = {
-      accessKeyId,
-      secretAccessKey,
-    };
-
-    if (sessionToken) {
-      return { ...credentials, sessionToken };
-    }
-
-    return credentials;
-  }
-
   /**
    * Configure the model ID from configuration with fallback
    */

backend/src/iac/backend-stack.ts

@@ -30,7 +30,7 @@ export class BackendStack extends cdk.Stack {
       this,
       `${appName}UserPoolIdParam-${props.environment}`,
       {
-        parameterName: `/${appName}/${props.environment}/cognito-user-pool-id`,
+        parameterName: `${appName}UserPoolIdParam-${props.environment}`,
       },
     ).stringValue;
 
@@ -39,7 +39,7 @@ export class BackendStack extends cdk.Stack {
       this,
       `${appName}ClientIdParam-${props.environment}`,
       {
-        parameterName: `/${appName}/${props.environment}/cognito-client-id`,
+        parameterName: `${appName}ClientIdParam-${props.environment}`,
       },
     ).stringValue;
 

frontend/src/common/services/ai/bedrock.service.ts

@@ -100,14 +100,27 @@ class BedrockService {
         throw new Error('No credentials available');
       }
 
+      const bedrockCredentials: {
+        accessKeyId: string;
+        secretAccessKey: string;
+        expiration?: Date;
+        sessionToken?: string;
+      } = {
+        accessKeyId: credentials.accessKeyId,
+        secretAccessKey: credentials.secretAccessKey,
+      };
+
+      if (credentials.expiration) {
+        bedrockCredentials.expiration = credentials.expiration;
+      }
+
+      if (credentials.sessionToken) {
+        bedrockCredentials.sessionToken = credentials.sessionToken;
+      }
+
       this.client = new BedrockRuntimeClient({
         region: REGION,
-        credentials: {
-          accessKeyId: credentials.accessKeyId,
-          secretAccessKey: credentials.secretAccessKey,
-          sessionToken: credentials.sessionToken,
-          expiration: credentials.expiration
-        }
+        credentials: bedrockCredentials
       });
     } catch (error) {
       console.error('Error initializing Bedrock client:', error);