update

Author: mazyu36

packages/@aws-cdk/aws-bedrock-agentcore-alpha/lib/gateway/gateway.ts

@@ -685,15 +685,12 @@ export class Gateway extends GatewayBase {
    * @internal
    */
   private createDefaultCognitoAuthorizerConfig(): IGatewayAuthorizerConfig {
-    // Create User Pool for M2M authentication
     const userPool = new cognito.UserPool(this, 'UserPool', {
-      userPoolName: `${this.name}-gw-userpool`,
       signInCaseSensitive: false,
     });
 
     const resourceServer = userPool.addResourceServer('ResourceServer', {
-      identifier: `${this.name}-gateway-resource-server`,
-      userPoolResourceServerName: `${this.name}-GatewayResourceServer`,
+      identifier: `${this.name}-resource-server`,
       scopes: [
         {
           scopeName: 'read',
@@ -707,7 +704,6 @@ export class Gateway extends GatewayBase {
     });
 
     const userPoolClient = userPool.addClient('DefaultClient', {
-      userPoolClientName: `${this.name}-gw-client`,
       generateSecret: true,
       oAuth: {
         flows: {
@@ -727,9 +723,8 @@ export class Gateway extends GatewayBase {
     });
 
     // Create Cognito Domain for OAuth2 token endpoint
-    // Use gateway name as domain prefix (already validated to be alphanumeric with hyphens/underscores)
-    // Replace underscores with hyphens and convert to lowercase for Cognito domain requirements
-    const domainPrefix = `${this.name}-gw`.replace(/_/g, '-').toLowerCase();
+    // Convert to lowercase for Cognito domain requirements
+    const domainPrefix = this.name.toLowerCase();
     const userPoolDomain = userPool.addDomain('Domain', {
       cognitoDomain: {
         domainPrefix: domainPrefix,

packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-with-runtime.js.snapshot/BedrockAgentCoreRuntimeGatewayIntegTest.assets.json

@@ -117,7 +117,6 @@
     "EmailVerificationMessage": "The verification code to your new account is {####}",
     "EmailVerificationSubject": "Verify your new account",
     "SmsVerificationMessage": "The verification code to your new account is {####}",
-    "UserPoolName": "integ-test-runtime-gateway-gw-userpool",
     "UsernameConfiguration": {
      "CaseSensitive": false
     },
@@ -134,8 +133,8 @@
   "TestGatewayUserPoolResourceServer7A34B6B2": {
    "Type": "AWS::Cognito::UserPoolResourceServer",
    "Properties": {
-    "Identifier": "integ-test-runtime-gateway-gateway-resource-server",
-    "Name": "integ-test-runtime-gateway-GatewayResourceServer",
+    "Identifier": "integ-test-runtime-gateway-resource-server",
+    "Name": "integ-test-runtime-gateway-resource-server",
     "Scopes": [
      {
       "ScopeDescription": "Read access to gateway tools",
@@ -182,7 +181,6 @@
       ]
      }
     ],
-    "ClientName": "integ-test-runtime-gateway-gw-client",
     "GenerateSecret": true,
     "SupportedIdentityProviders": [
      "COGNITO"
@@ -286,7 +284,7 @@
   "TestGatewayUserPoolDomainB64B616E": {
    "Type": "AWS::Cognito::UserPoolDomain",
    "Properties": {
-    "Domain": "integ-test-runtime-gateway-gw",
+    "Domain": "integ-test-runtime-gateway",
     "UserPoolId": {
      "Ref": "TestGatewayUserPool545AA49A"
     }
@@ -321,7 +319,6 @@
      }
     },
     "AuthorizerType": "CUSTOM_JWT",
-    "Description": "Gateway for Runtime integration test with M2M auth",
     "Name": "integ-test-runtime-gateway",
     "ProtocolConfiguration": {
      "Mcp": {
@@ -420,8 +417,6 @@
     "Code": {
      "ZipFile": "\n    exports.handler = async (event, context) => {\n      return {\n        statusCode: 200,\n        body: JSON.stringify({\n          message: 'Hello from Gateway Lambda!',\n          timestamp: new Date().toISOString()\n        }),\n      };\n    };\n  "
     },
-    "Description": "Simple test function for Gateway M2M authentication test",
-    "FunctionName": "integ-test-simple-tool",
     "Handler": "index.handler",
     "Role": {
      "Fn::GetAtt": [
@@ -763,7 +758,6 @@
      }
     },
     "AgentRuntimeName": "integ_test_runtime_with_gateway",
-    "Description": "Runtime using Gateway tools",
     "EnvironmentVariables": {
      "GATEWAY_URL": {
       "Fn::GetAtt": [

packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-with-runtime.js.snapshot/BedrockAgentCoreRuntimeGatewayIntegTest.template.json

@@ -1,20 +1,18 @@
-import * as path from 'path';
 import { randomUUID } from 'crypto';
+import * as path from 'path';
+import * as integ from '@aws-cdk/integ-tests-alpha';
 import * as cdk from 'aws-cdk-lib';
 import * as lambda from 'aws-cdk-lib/aws-lambda';
-import * as integ from '@aws-cdk/integ-tests-alpha';
 import * as agentcore from '../../../lib';
 
 const app = new cdk.App();
 const stack = new cdk.Stack(app, 'BedrockAgentCoreRuntimeGatewayIntegTest', {});
 
 const gateway = new agentcore.Gateway(stack, 'TestGateway', {
   gatewayName: 'integ-test-runtime-gateway',
-  description: 'Gateway for Runtime integration test with M2M auth',
 });
 
 const calculatorFunction = new lambda.Function(stack, 'TestFunction', {
-  functionName: 'integ-test-simple-tool',
   runtime: lambda.Runtime.NODEJS_22_X,
   handler: 'index.handler',
   code: lambda.Code.fromInline(`
@@ -28,7 +26,6 @@ const calculatorFunction = new lambda.Function(stack, 'TestFunction', {
       };
     };
   `),
-  description: 'Simple test function for Gateway M2M authentication test',
 });
 
 const toolSchema = agentcore.ToolSchema.fromInline([
@@ -55,7 +52,6 @@ const runtimeArtifact = agentcore.AgentRuntimeArtifact.fromAsset(
 
 const runtime = new agentcore.Runtime(stack, 'TestRuntime', {
   runtimeName: 'integ_test_runtime_with_gateway',
-  description: 'Runtime using Gateway tools',
   agentRuntimeArtifact: runtimeArtifact,
   protocolConfiguration: agentcore.ProtocolType.HTTP,
   networkConfiguration: agentcore.RuntimeNetworkConfiguration.usingPublicNetwork(),