Skip to content

Commit f50496f

Browse files
committed
update integ
1 parent e7953de commit f50496f

File tree

30 files changed

+2079
-344
lines changed

30 files changed

+2079
-344
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,8 @@ export class Gateway extends GatewayBase {
724724

725725
// Create Cognito Domain for OAuth2 token endpoint
726726
// Convert to lowercase for Cognito domain requirements
727-
const domainPrefix = this.name.toLowerCase();
727+
const domainPrefix = Token.isUnresolved(this.name) ? this.name : this.name.toLowerCase();
728+
728729
const userPoolDomain = userPool.addDomain('Domain', {
729730
cognitoDomain: {
730731
domainPrefix: domainPrefix,

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2307,3 +2307,40 @@ describe('MCP Server Target Configuration Tests', () => {
23072307
expect(target.credentialProviderConfigurations).toHaveLength(1);
23082308
});
23092309
});
2310+
2311+
describe('Gateway M2M Authentication Tests', () => {
2312+
let stack: cdk.Stack;
2313+
2314+
beforeEach(() => {
2315+
const app = new cdk.App();
2316+
stack = new cdk.Stack(app, 'TestStack', {
2317+
env: { account: '123456789012', region: 'us-east-1' },
2318+
});
2319+
});
2320+
2321+
test('Should create default Cognito authorizer with M2M support', () => {
2322+
new Gateway(stack, 'TestGateway', {
2323+
gatewayName: 'test-gateway',
2324+
});
2325+
2326+
const template = Template.fromStack(stack);
2327+
2328+
template.hasResourceProperties('AWS::Cognito::UserPoolClient', {
2329+
AllowedOAuthFlows: ['client_credentials'],
2330+
AllowedOAuthFlowsUserPoolClient: true,
2331+
GenerateSecret: true,
2332+
});
2333+
2334+
template.hasResourceProperties('AWS::Cognito::UserPoolResourceServer', {
2335+
Identifier: 'test-gateway-resource-server',
2336+
Scopes: [
2337+
{ ScopeName: 'read', ScopeDescription: 'Read access to gateway tools' },
2338+
{ ScopeName: 'write', ScopeDescription: 'Write access to gateway tools' },
2339+
],
2340+
});
2341+
2342+
template.hasResourceProperties('AWS::Cognito::UserPoolDomain', {
2343+
Domain: 'test-gateway',
2344+
});
2345+
});
2346+
});

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

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -836,7 +836,7 @@
836836
]
837837
},
838838
"Export": {
839-
"Name": "BedrockAgentCoreRuntimeGatewayIntegTest:ExportsOutputFnGetAttTestRuntime65042BB5AgentRuntimeArnE8B3C8DA"
839+
"Name": "BedrockAgentCoreRuntimeGatewayM2MIntegTest:ExportsOutputFnGetAttTestRuntime65042BB5AgentRuntimeArnE8B3C8DA"
840840
}
841841
}
842842
},

packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-with-runtime.js.snapshot/RuntimeGatewayIntegTestDefaultTestDeployAssert1ACA2D2A.assets.json renamed to packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-m2m.js.snapshot/RuntimeGatewayIntegTestDefaultTestDeployAssert1ACA2D2A.assets.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-with-runtime.js.snapshot/RuntimeGatewayIntegTestDefaultTestDeployAssert1ACA2D2A.template.json renamed to packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-m2m.js.snapshot/RuntimeGatewayIntegTestDefaultTestDeployAssert1ACA2D2A.template.json

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-with-runtime.js.snapshot/asset.59ea9be6eec96ed2cb70555aba1b5e0432cb101ab027e5478bc613d570062906/Dockerfile renamed to packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-m2m.js.snapshot/asset.59ea9be6eec96ed2cb70555aba1b5e0432cb101ab027e5478bc613d570062906/Dockerfile

File renamed without changes.

packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-with-runtime.js.snapshot/asset.59ea9be6eec96ed2cb70555aba1b5e0432cb101ab027e5478bc613d570062906/app.py renamed to packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-m2m.js.snapshot/asset.59ea9be6eec96ed2cb70555aba1b5e0432cb101ab027e5478bc613d570062906/app.py

File renamed without changes.

packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-with-runtime.js.snapshot/asset.59ea9be6eec96ed2cb70555aba1b5e0432cb101ab027e5478bc613d570062906/requirements.txt renamed to packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-m2m.js.snapshot/asset.59ea9be6eec96ed2cb70555aba1b5e0432cb101ab027e5478bc613d570062906/requirements.txt

File renamed without changes.

packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-with-runtime.js.snapshot/asset.89f8c437feaf078124252df938abc83ca969185d1730374a4ab70530e6b34616/index.js renamed to packages/@aws-cdk/aws-bedrock-agentcore-alpha/test/agentcore/gateway/integ.gateway-m2m.js.snapshot/asset.89f8c437feaf078124252df938abc83ca969185d1730374a4ab70530e6b34616/index.js

File renamed without changes.

0 commit comments

Comments
 (0)