Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions packages/@aws-cdk/aws-bedrock-alpha/bedrock/agents/agent.ts
Original file line number Diff line number Diff line change
Expand Up @@ -133,21 +133,15 @@ export abstract class AgentBase extends Resource implements IAgent {
* @returns An EventBridge Rule configured for agent events
*/
public onEvent(id: string, options: events.OnEventOptions = {}): events.Rule {
// Create rule with minimal props and event pattern
const rule = new events.Rule(this, id, {
description: options.description,
eventPattern: {
source: ['aws.bedrock'],
detail: {
'agent-id': [this.agentId],
},
const rule = new events.Rule(this, id, options);
rule.addEventPattern({
source: ['aws.bedrock'],
detail: {
'agent-id': [this.agentId],
},
});

// Add target if provided
if (options.target) {
rule.addTarget(options.target);
}
rule.addTarget(options.target);
return rule;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -293,16 +293,27 @@ describe('Agent', () => {

const rule = agent.onEvent('TestRule', {
description: 'Custom rule description',
ruleName: 'MyCustomEventRuleName',
eventPattern: {
account: ['123456789012'],
region: ['us-east-1'],
detail: {
test: 'value',
},
},
});

expect(rule).toBeDefined();
Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
Description: 'Custom rule description',
Name: 'MyCustomEventRuleName',
EventPattern: {
source: ['aws.bedrock'],
detail: {
'agent-id': [{ 'Fn::GetAtt': [Match.stringLikeRegexp('TestAgent[A-Z0-9]+'), 'AgentId'] }],
},
account: ['123456789012'],
region: ['us-east-1'],
},
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,7 @@ abstract class ExampleResourceBase extends Resource implements IExampleResource
* as it simplifies the implementation code (less branching).
*/
public onEvent(id: string, options: events.OnEventOptions = {}): events.Rule {
const rule = new events.Rule(this, id, {
description: options.description,
ruleName: options.ruleName,
crossStackScope: options.crossStackScope,
});
const rule = new events.Rule(this, id, options);
rule.addTarget(options.target);
rule.addEventPattern({
// obviously, you would put your resource-specific values here
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,28 @@ describe('Example Resource', () => {
});

test('onEvent adds an Event Rule', () => {
exampleResource.onEvent('MyEvent');
exampleResource.onEvent('MyEvent', {
description: 'Custom rule description',
ruleName: 'MyCustomEventRuleName',
eventPattern: {
account: ['123456789012'],
region: ['us-east-1'],
detail: {
test: 'value',
},
},
});

Template.fromStack(stack).hasResourceProperties('AWS::Events::Rule', {
Description: 'Custom rule description',
Name: 'MyCustomEventRuleName',
EventPattern: {
detail: {
'example-resource-name': [EXAMPLE_RESOURCE_NAME],
'test': 'value',
},
account: ['123456789012'],
region: ['us-east-1'],
},
});
});
Expand Down
Loading