Merge branch 'feature/mcp-server' into 'develop'

Fixed: output value for MCPServerEndpoint after stack update

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

Author: rstrahan

docs/mcp-integration.md

@@ -138,7 +138,7 @@ When MCP is enabled, an additional Cognito User Pool Client is created:
 - **OAuth Scopes**: openid, email, profile
 - **Callback URLs**: 
   - CloudFront distribution URL
-  - QuickSight OAuth callback
+  - Quick Suite OAuth callback
   - Cognito User Pool domain
 
 ### Token Management
@@ -251,4 +251,10 @@ print(f"Query result: {result}")
 
 ### Amazon Quick Suite Integration
 
-For Amazon Quick Suite integration, use the provided OAuth callback URLs and configure QuickSight to authenticate against the Cognito User Pool using the External App Client credentials.
+For Amazon Quick Suite integration, configure the MCP connection using the CloudFormation stack outputs detailed in the [Output Parameters](#output-parameters) section.
+
+- **MCP Server**: Use `MCPServerEndpoint` output value
+- **Client ID**: Use `MCPClientId` output value
+- **Client Secret**: Use `MCPClientSecret` output value
+- **Token URL**: Use `MCPTokenURL` output value
+- **Authorization URL**: Use `MCPAuthorizationURL` output value

src/lambda/agentcore_gateway_manager/index.py

@@ -68,14 +68,22 @@ def create_or_update_gateway(props, gateway_name):
 
         if existing_gateways:
             existing_gateway = existing_gateways[0]
-            logger.info(f"Gateway {gateway_name} already exists, returning existing configuration")
-            return {
-                'gateway_url': existing_gateway.get('gatewayUrl'),
-                'gateway_id': existing_gateway.get('gatewayId'),
-                'gateway_arn': existing_gateway.get('gatewayArn')
-            }
+            gateway_id = existing_gateway.get('gatewayId')
+            
+            if gateway_id:
+                try:
+                    gateway_details = control_client.get_gateway(gatewayIdentifier=gateway_id)
+                    if gateway_details and gateway_details.get('gatewayUrl'):
+                        return {
+                            'gateway_url': gateway_details.get('gatewayUrl'),
+                            'gateway_id': gateway_details.get('gatewayId'),
+                            'gateway_arn': gateway_details.get('gatewayArn')
+                        }
+                except Exception as e:
+                    logger.warning(f"Error getting gateway details: {e}")
+
     except Exception as e:
-        logger.info(f"Error checking for existing gateway: {e}")
+        logger.warning(f"Error checking for existing gateway: {e}")
 
     # Gateway doesn't exist, create it
     logger.info(f"Gateway {gateway_name} does not exist, creating new one")