fix(agent): fix enable user input bug (#642)

* fix(agent): fix enable user input bug

Author: aws-rafams

src/cdk-lib/bedrock/agent.ts

@@ -380,13 +380,13 @@ export class Agent extends Construct {
    * A list of action groups associated with the agent
    * @private
    */
-  public actionGroups: bedrock.CfnAgent.AgentActionGroupProperty[]=[];
+  public actionGroups: bedrock.CfnAgent.AgentActionGroupProperty[] = [];
   /**
    * A list of KnowledgeBases associated with the agent.
    *
    * @default - No knowledge base is used.
    */
-  public knowledgeBases: bedrock.CfnAgent.AgentKnowledgeBaseProperty []=[];
+  public knowledgeBases: bedrock.CfnAgent.AgentKnowledgeBaseProperty[] = [];
 
 
   constructor(scope: Construct, id: string, props: AgentProps) {
@@ -488,14 +488,12 @@ export class Agent extends Construct {
       this.addActionGroups(props.actionGroups);
     }
     // To allow your agent to request the user for additional information
-    // when trying to complete a task , add this action group
-    if (props.enableUserInput) {
-      this.addActionGroup(new AgentActionGroup(this, 'userInputEnabledActionGroup', {
-        actionGroupName: 'UserInputAction',
-        parentActionGroupSignature: 'AMAZON.UserInput',
-        actionGroupState: 'ENABLED',
-      }));
-    }
+    // when trying to complete a task, add this action group
+    this.addActionGroup(new AgentActionGroup(this, 'userInputEnabledActionGroup', {
+      actionGroupName: 'UserInputAction',
+      parentActionGroupSignature: 'AMAZON.UserInput',
+      actionGroupState: props.enableUserInput ? 'ENABLED' : 'DISABLED',
+    }));
   }
 
 
@@ -516,7 +514,7 @@ export class Agent extends Construct {
   /**
    * Add knowledge bases to the agent.
    */
-  public addKnowledgeBases(knowledgeBases: KnowledgeBase []) {
+  public addKnowledgeBases(knowledgeBases: KnowledgeBase[]) {
     for (const kb of knowledgeBases) {
       this.addKnowledgeBase(kb);
     }
@@ -679,7 +677,7 @@ export function validateInferenceConfiguration(inferenceConfiguration: Inference
  *
  * @internal This is an internal core function and should not be called directly.
  */
-export function validatePromptOverrideConfiguration(promptOverrideConfiguration: PromptOverrideConfiguration|undefined) {
+export function validatePromptOverrideConfiguration(promptOverrideConfiguration: PromptOverrideConfiguration | undefined) {
   if (!promptOverrideConfiguration) {
     return;
   }

test/cdk-lib/bedrock/agent.test.ts

@@ -123,6 +123,7 @@ describe('Agent with guardrails through addGuardrail', () => {
         promptConfigurations: [preprocessingPrompt, orchestrationPrompt],
       },
       aliasName: 'prod',
+      enableUserInput: true,
     });
 
     agent.addActionGroups([actiongroup]);
@@ -238,12 +239,12 @@ describe('Agent with guardrails through addGuardrail', () => {
     template.resourceCountIs('AWS::Bedrock::KnowledgeBase', 1);
     template.hasResourceProperties('AWS::Bedrock::KnowledgeBase', {
       KnowledgeBaseConfiguration: {
-        Type: Match.stringLikeRegexp ('VECTOR'),
+        Type: Match.stringLikeRegexp('VECTOR'),
       },
-      Name: Match.stringLikeRegexp ('KBteststack'),
+      Name: Match.stringLikeRegexp('KBteststack'),
       RoleArn: {
         'Fn::GetAtt':
-      [Match.stringLikeRegexp('KBRole'), 'Arn'],
+          [Match.stringLikeRegexp('KBRole'), 'Arn'],
 
       },
 
@@ -256,6 +257,12 @@ describe('Agent with guardrails through addGuardrail', () => {
     template.hasResourceProperties('AWS::Bedrock::Agent', {
 
       ActionGroups: [
+        {
+          ActionGroupName: 'UserInputAction',
+          ActionGroupState: 'ENABLED',
+          ParentActionGroupSignature: 'AMAZON.UserInput',
+          SkipResourceInUseCheckOnDelete: false,
+        },
         {
           ActionGroupExecutor: {
             Lambda: {
@@ -508,12 +515,12 @@ describe('Agent with guardrails through constructor', () => {
     template.resourceCountIs('AWS::Bedrock::KnowledgeBase', 1);
     template.hasResourceProperties('AWS::Bedrock::KnowledgeBase', {
       KnowledgeBaseConfiguration: {
-        Type: Match.stringLikeRegexp ('VECTOR'),
+        Type: Match.stringLikeRegexp('VECTOR'),
       },
-      Name: Match.stringLikeRegexp ('KBteststack'),
+      Name: Match.stringLikeRegexp('KBteststack'),
       RoleArn: {
         'Fn::GetAtt':
-      [Match.stringLikeRegexp('KBRole'), 'Arn'],
+          [Match.stringLikeRegexp('KBRole'), 'Arn'],
 
       },
 
@@ -526,6 +533,12 @@ describe('Agent with guardrails through constructor', () => {
     template.hasResourceProperties('AWS::Bedrock::Agent', {
 
       ActionGroups: [
+        {
+          ActionGroupName: 'UserInputAction',
+          ActionGroupState: 'DISABLED',
+          ParentActionGroupSignature: 'AMAZON.UserInput',
+          SkipResourceInUseCheckOnDelete: false,
+        },
         {
           ActionGroupExecutor: {
             Lambda: {
@@ -765,12 +778,12 @@ describe('Agent without guardrails', () => {
     template.resourceCountIs('AWS::Bedrock::KnowledgeBase', 1);
     template.hasResourceProperties('AWS::Bedrock::KnowledgeBase', {
       KnowledgeBaseConfiguration: {
-        Type: Match.stringLikeRegexp ('VECTOR'),
+        Type: Match.stringLikeRegexp('VECTOR'),
       },
-      Name: Match.stringLikeRegexp ('KBteststack'),
+      Name: Match.stringLikeRegexp('KBteststack'),
       RoleArn: {
         'Fn::GetAtt':
-      [Match.stringLikeRegexp('KBRole'), 'Arn'],
+          [Match.stringLikeRegexp('KBRole'), 'Arn'],
 
       },
 
@@ -783,6 +796,12 @@ describe('Agent without guardrails', () => {
     template.hasResourceProperties('AWS::Bedrock::Agent', {
 
       ActionGroups: [
+        {
+          ActionGroupName: 'UserInputAction',
+          ActionGroupState: 'DISABLED',
+          ParentActionGroupSignature: 'AMAZON.UserInput',
+          SkipResourceInUseCheckOnDelete: false,
+        },
         {
           ActionGroupExecutor: {
             Lambda: {