From ce9f07a155381925d77ef92d66b69f1020511ca7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20T=C3=BCrken?= Date: Fri, 11 Oct 2024 16:20:52 +0300 Subject: [PATCH] Run make generate after rebase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Fatih Türken --- apis/bedrockagent/v1beta1/zz_agent_types.go | 28 +++++++++++------ .../v1beta1/zz_generated.deepcopy.go | 15 ++++++++++ .../bedrockagent.aws.upbound.io_agents.yaml | 30 +++++++++++++------ 3 files changed, 55 insertions(+), 18 deletions(-) diff --git a/apis/bedrockagent/v1beta1/zz_agent_types.go b/apis/bedrockagent/v1beta1/zz_agent_types.go index 1963a12967..d6ee3eae27 100755 --- a/apis/bedrockagent/v1beta1/zz_agent_types.go +++ b/apis/bedrockagent/v1beta1/zz_agent_types.go @@ -49,9 +49,12 @@ type AgentInitParameters struct { // Whether to prepare the agent after creation or modification. Defaults to true. PrepareAgent *bool `json:"prepareAgent,omitempty" tf:"prepare_agent,omitempty"` - // Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced prompts. See prompt_override_configuration block for details. + // Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced prompts. See prompt_override_configuration Block for details. PromptOverrideConfiguration []PromptOverrideConfigurationInitParameters `json:"promptOverrideConfiguration,omitempty" tf:"prompt_override_configuration,omitempty"` + // Whether the in-use check is skipped when deleting the agent. + SkipResourceInUseCheck *bool `json:"skipResourceInUseCheck,omitempty" tf:"skip_resource_in_use_check,omitempty"` + // Key-value map of resource tags. // +mapType=granular Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` @@ -95,9 +98,12 @@ type AgentObservation struct { // Whether to prepare the agent after creation or modification. Defaults to true. PrepareAgent *bool `json:"prepareAgent,omitempty" tf:"prepare_agent,omitempty"` - // Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced prompts. See prompt_override_configuration block for details. + // Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced prompts. See prompt_override_configuration Block for details. PromptOverrideConfiguration []PromptOverrideConfigurationObservation `json:"promptOverrideConfiguration,omitempty" tf:"prompt_override_configuration,omitempty"` + // Whether the in-use check is skipped when deleting the agent. + SkipResourceInUseCheck *bool `json:"skipResourceInUseCheck,omitempty" tf:"skip_resource_in_use_check,omitempty"` + // Key-value map of resource tags. // +mapType=granular Tags map[string]*string `json:"tags,omitempty" tf:"tags,omitempty"` @@ -151,7 +157,7 @@ type AgentParameters struct { // +kubebuilder:validation:Optional PrepareAgent *bool `json:"prepareAgent,omitempty" tf:"prepare_agent,omitempty"` - // Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced prompts. See prompt_override_configuration block for details. + // Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced prompts. See prompt_override_configuration Block for details. // +kubebuilder:validation:Optional PromptOverrideConfiguration []PromptOverrideConfigurationParameters `json:"promptOverrideConfiguration,omitempty" tf:"prompt_override_configuration,omitempty"` @@ -160,6 +166,10 @@ type AgentParameters struct { // +kubebuilder:validation:Required Region *string `json:"region" tf:"-"` + // Whether the in-use check is skipped when deleting the agent. + // +kubebuilder:validation:Optional + SkipResourceInUseCheck *bool `json:"skipResourceInUseCheck,omitempty" tf:"skip_resource_in_use_check,omitempty"` + // Key-value map of resource tags. // +kubebuilder:validation:Optional // +mapType=granular @@ -230,7 +240,7 @@ type PromptConfigurationsInitParameters struct { // prompt template with which to replace the default prompt template. You can use placeholder variables in the base prompt template to customize the prompt. For more information, see Prompt template placeholder variables. BasePromptTemplate *string `json:"basePromptTemplate,omitempty" tf:"base_prompt_template"` - // Inference parameters to use when the agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation models. See inference_configuration block for details. + // Inference parameters to use when the agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation models. See inference_configuration Block for details. InferenceConfiguration []InferenceConfigurationInitParameters `json:"inferenceConfiguration,omitempty" tf:"inference_configuration"` // Whether to override the default parser Lambda function when parsing the raw foundation model output in the part of the agent sequence defined by the prompt_type. If you set the argument as OVERRIDDEN, the override_lambda argument in the prompt_override_configuration block must be specified with the ARN of a Lambda function. Valid values: DEFAULT, OVERRIDDEN. @@ -251,7 +261,7 @@ type PromptConfigurationsObservation struct { // prompt template with which to replace the default prompt template. You can use placeholder variables in the base prompt template to customize the prompt. For more information, see Prompt template placeholder variables. BasePromptTemplate *string `json:"basePromptTemplate,omitempty" tf:"base_prompt_template,omitempty"` - // Inference parameters to use when the agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation models. See inference_configuration block for details. + // Inference parameters to use when the agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation models. See inference_configuration Block for details. InferenceConfiguration []InferenceConfigurationObservation `json:"inferenceConfiguration,omitempty" tf:"inference_configuration,omitempty"` // Whether to override the default parser Lambda function when parsing the raw foundation model output in the part of the agent sequence defined by the prompt_type. If you set the argument as OVERRIDDEN, the override_lambda argument in the prompt_override_configuration block must be specified with the ARN of a Lambda function. Valid values: DEFAULT, OVERRIDDEN. @@ -273,7 +283,7 @@ type PromptConfigurationsParameters struct { // +kubebuilder:validation:Optional BasePromptTemplate *string `json:"basePromptTemplate,omitempty" tf:"base_prompt_template"` - // Inference parameters to use when the agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation models. See inference_configuration block for details. + // Inference parameters to use when the agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation models. See inference_configuration Block for details. // +kubebuilder:validation:Optional InferenceConfiguration []InferenceConfigurationParameters `json:"inferenceConfiguration,omitempty" tf:"inference_configuration"` @@ -299,7 +309,7 @@ type PromptOverrideConfigurationInitParameters struct { // ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence. If you specify this field, at least one of the prompt_configurations block must contain a parser_mode value that is set to OVERRIDDEN. OverrideLambda *string `json:"overrideLambda,omitempty" tf:"override_lambda"` - // Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations block for details. + // Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations Block for details. PromptConfigurations []PromptConfigurationsInitParameters `json:"promptConfigurations,omitempty" tf:"prompt_configurations"` } @@ -308,7 +318,7 @@ type PromptOverrideConfigurationObservation struct { // ARN of the Lambda function to use when parsing the raw foundation model output in parts of the agent sequence. If you specify this field, at least one of the prompt_configurations block must contain a parser_mode value that is set to OVERRIDDEN. OverrideLambda *string `json:"overrideLambda,omitempty" tf:"override_lambda,omitempty"` - // Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations block for details. + // Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations Block for details. PromptConfigurations []PromptConfigurationsObservation `json:"promptConfigurations,omitempty" tf:"prompt_configurations,omitempty"` } @@ -318,7 +328,7 @@ type PromptOverrideConfigurationParameters struct { // +kubebuilder:validation:Optional OverrideLambda *string `json:"overrideLambda,omitempty" tf:"override_lambda"` - // Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations block for details. + // Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations Block for details. // +kubebuilder:validation:Optional PromptConfigurations []PromptConfigurationsParameters `json:"promptConfigurations,omitempty" tf:"prompt_configurations"` } diff --git a/apis/bedrockagent/v1beta1/zz_generated.deepcopy.go b/apis/bedrockagent/v1beta1/zz_generated.deepcopy.go index 8e38037164..59f341f7fe 100644 --- a/apis/bedrockagent/v1beta1/zz_generated.deepcopy.go +++ b/apis/bedrockagent/v1beta1/zz_generated.deepcopy.go @@ -100,6 +100,11 @@ func (in *AgentInitParameters) DeepCopyInto(out *AgentInitParameters) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.SkipResourceInUseCheck != nil { + in, out := &in.SkipResourceInUseCheck, &out.SkipResourceInUseCheck + *out = new(bool) + **out = **in + } if in.Tags != nil { in, out := &in.Tags, &out.Tags *out = make(map[string]*string, len(*in)) @@ -230,6 +235,11 @@ func (in *AgentObservation) DeepCopyInto(out *AgentObservation) { (*in)[i].DeepCopyInto(&(*out)[i]) } } + if in.SkipResourceInUseCheck != nil { + in, out := &in.SkipResourceInUseCheck, &out.SkipResourceInUseCheck + *out = new(bool) + **out = **in + } if in.Tags != nil { in, out := &in.Tags, &out.Tags *out = make(map[string]*string, len(*in)) @@ -339,6 +349,11 @@ func (in *AgentParameters) DeepCopyInto(out *AgentParameters) { *out = new(string) **out = **in } + if in.SkipResourceInUseCheck != nil { + in, out := &in.SkipResourceInUseCheck, &out.SkipResourceInUseCheck + *out = new(bool) + **out = **in + } if in.Tags != nil { in, out := &in.Tags, &out.Tags *out = make(map[string]*string, len(*in)) diff --git a/package/crds/bedrockagent.aws.upbound.io_agents.yaml b/package/crds/bedrockagent.aws.upbound.io_agents.yaml index 1b7efa9f15..76e96a1f6c 100644 --- a/package/crds/bedrockagent.aws.upbound.io_agents.yaml +++ b/package/crds/bedrockagent.aws.upbound.io_agents.yaml @@ -180,7 +180,7 @@ spec: promptOverrideConfiguration: description: Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced - prompts. See prompt_override_configuration block for details. + prompts. See prompt_override_configuration Block for details. items: properties: overrideLambda: @@ -193,7 +193,7 @@ spec: promptConfigurations: description: Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations - block for details. + Block for details. items: properties: basePromptTemplate: @@ -208,7 +208,7 @@ spec: agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation - models. See inference_configuration block for details. + models. See inference_configuration Block for details. items: properties: maxLength: @@ -279,6 +279,10 @@ spec: description: Region is the region you'd like your resource to be created in. type: string + skipResourceInUseCheck: + description: Whether the in-use check is skipped when deleting + the agent. + type: boolean tags: additionalProperties: type: string @@ -409,7 +413,7 @@ spec: promptOverrideConfiguration: description: Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced - prompts. See prompt_override_configuration block for details. + prompts. See prompt_override_configuration Block for details. items: properties: overrideLambda: @@ -422,7 +426,7 @@ spec: promptConfigurations: description: Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations - block for details. + Block for details. items: properties: basePromptTemplate: @@ -437,7 +441,7 @@ spec: agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation - models. See inference_configuration block for details. + models. See inference_configuration Block for details. items: properties: maxLength: @@ -504,6 +508,10 @@ spec: type: array type: object type: array + skipResourceInUseCheck: + description: Whether the in-use check is skipped when deleting + the agent. + type: boolean tags: additionalProperties: type: string @@ -738,7 +746,7 @@ spec: promptOverrideConfiguration: description: Configurations to override prompt templates in different parts of an agent sequence. For more information, see Advanced - prompts. See prompt_override_configuration block for details. + prompts. See prompt_override_configuration Block for details. items: properties: overrideLambda: @@ -751,7 +759,7 @@ spec: promptConfigurations: description: Configurations to override a prompt template in one part of an agent sequence. See prompt_configurations - block for details. + Block for details. items: properties: basePromptTemplate: @@ -766,7 +774,7 @@ spec: agent invokes a foundation model in the part of the agent sequence defined by the prompt_type. For more information, see Inference parameters for foundation - models. See inference_configuration block for details. + models. See inference_configuration Block for details. items: properties: maxLength: @@ -833,6 +841,10 @@ spec: type: array type: object type: array + skipResourceInUseCheck: + description: Whether the in-use check is skipped when deleting + the agent. + type: boolean tags: additionalProperties: type: string