Skip to content

Add missing request/response attributes assertions in Bedrock AgentCore Contract Tests #535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+113 −4
Open

Add missing request/response attributes assertions in Bedrock AgentCore Contract Tests #535

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fc127ba
fix gap in agentcore contract tests missing request/response attributes
liustve Nov 9, 2025
e1a7e57
better grouping
liustve Nov 9, 2025
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
117 changes: 113 additions & 4 deletions contract-tests/tests/test/amazon/botocore/botocore_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@
_AWS_BEDROCK_GUARDRAIL_ID: str = "aws.bedrock.guardrail.id"
_AWS_BEDROCK_KNOWLEDGE_BASE_ID: str = "aws.bedrock.knowledge_base.id"
_AWS_BEDROCK_DATA_SOURCE_ID: str = "aws.bedrock.data_source.id"
_AWS_BEDROCK_AGENTCORE_RUNTIME_ARN: str = "aws.bedrock.agentcore.runtime.arn"
_AWS_BEDROCK_AGENTCORE_RUNTIME_ENDPOINT_ARN: str = "aws.bedrock.agentcore.runtime_endpoint.arn"
_AWS_BEDROCK_AGENTCORE_MEMORY_ARN: str = "aws.bedrock.agentcore.memory.arn"
_AWS_BEDROCK_AGENTCORE_GATEWAY_ARN: str = "aws.bedrock.agentcore.gateway.arn"
_AWS_BEDROCK_AGENTCORE_WORKLOAD_IDENTITY_ARN: str = "aws.bedrock.agentcore.identity.workload_identity.arn"

_GEN_AI_REQUEST_MODEL: str = "gen_ai.request.model"
_GEN_AI_REQUEST_TEMPERATURE: str = "gen_ai.request.temperature"
Expand All @@ -48,7 +53,14 @@
_GEN_AI_USAGE_INPUT_TOKENS: str = "gen_ai.usage.input_tokens"
_GEN_AI_USAGE_OUTPUT_TOKENS: str = "gen_ai.usage.output_tokens"
_GEN_AI_SYSTEM: str = "gen_ai.system"

_GEN_AI_RUNTIME_ID: str = "gen_ai.runtime.id"
_GEN_AI_BROWSER_ID: str = "gen_ai.browser.id"
_GEN_AI_CODE_INTERPRETER_ID: str = "gen_ai.code_interpreter.id"
_GEN_AI_MEMORY_ID: str = "gen_ai.memory.id"
_GEN_AI_GATEWAY_ID: str = "gen_ai.gateway.id"

_AWS_GATEWAY_TARGET_ID: str = "aws.gateway.target.id"
_AWS_AUTH_CREDENTIAL_PROVIDER: str = "aws.auth.credential_provider"
_AWS_SECRET_ARN: str = "aws.secretsmanager.secret.arn"
_AWS_STATE_MACHINE_ARN: str = "aws.stepfunctions.state_machine.arn"
_AWS_ACTIVITY_ARN: str = "aws.stepfunctions.activity.arn"
Expand Down Expand Up @@ -764,10 +776,20 @@ def test_bedrock_agentcore_create_agent_runtime(self):
remote_resource_type="AWS::BedrockAgentCore::Runtime",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
response_specific_attributes={
_GEN_AI_RUNTIME_ID: expected_identifier,
_AWS_BEDROCK_AGENTCORE_RUNTIME_ARN: (
f"arn:aws:bedrock-agentcore:us-west-2:123456789012:runtime/{expected_identifier}"
),
_AWS_BEDROCK_AGENTCORE_WORKLOAD_IDENTITY_ARN: (
"arn:aws:iam::123456789012:role/service-role/" "AmazonBedrockAgentCoreRuntimeDefaultServiceRole"
),
},
span_name="Bedrock AgentCore Control.CreateAgentRuntime",
)

def test_bedrock_agentcore_create_agent_runtime_endpoint(self):
agent_id = "myAgent-w8slyU6q5M"
self.do_test_requests(
"bedrock-agentcore/runtime/createendpoint/myAgent-w8slyU6q5M",
"GET",
Expand All @@ -782,6 +804,18 @@ def test_bedrock_agentcore_create_agent_runtime_endpoint(self):
cloudformation_primary_identifier=(
"arn:aws:bedrock-agentcore:us-west-2:123456789012:endpoint/invokeEndpoint"
),
request_specific_attributes={
_GEN_AI_RUNTIME_ID: agent_id,
},
response_specific_attributes={
_GEN_AI_RUNTIME_ID: agent_id,
_AWS_BEDROCK_AGENTCORE_RUNTIME_ARN: (
f"arn:aws:bedrock-agentcore:us-west-2:123456789012:runtime/{agent_id}"
),
_AWS_BEDROCK_AGENTCORE_RUNTIME_ENDPOINT_ARN: (
"arn:aws:bedrock-agentcore:us-west-2:123456789012:endpoint/invokeEndpoint"
),
},
span_name="Bedrock AgentCore Control.CreateAgentRuntimeEndpoint",
)

Expand All @@ -799,6 +833,11 @@ def test_bedrock_agentcore_invoke_agent_runtime(self):
remote_resource_type="AWS::BedrockAgentCore::Runtime",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
request_specific_attributes={
_AWS_BEDROCK_AGENTCORE_RUNTIME_ARN: (
f"arn:aws:bedrock-agentcore:us-west-2:123456789012:runtime/{expected_identifier}"
),
},
span_name="Bedrock AgentCore.InvokeAgentRuntime",
)

Expand All @@ -816,6 +855,12 @@ def test_bedrock_agentcore_start_browser_session(self):
remote_resource_type="AWS::BedrockAgentCore::BrowserCustom",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
request_specific_attributes={
_GEN_AI_BROWSER_ID: expected_identifier,
},
response_specific_attributes={
_GEN_AI_BROWSER_ID: expected_identifier,
},
span_name="Bedrock AgentCore.StartBrowserSession",
)

Expand All @@ -833,6 +878,12 @@ def test_bedrock_agentcore_start_browser_session_v1(self):
remote_resource_type="AWS::BedrockAgentCore::Browser",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
request_specific_attributes={
_GEN_AI_BROWSER_ID: expected_identifier,
},
response_specific_attributes={
_GEN_AI_BROWSER_ID: expected_identifier,
},
span_name="Bedrock AgentCore.StartBrowserSession",
)

Expand All @@ -850,6 +901,12 @@ def test_bedrock_agentcore_start_code_interpreter_session(self):
remote_resource_type="AWS::BedrockAgentCore::CodeInterpreterCustom",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
request_specific_attributes={
_GEN_AI_CODE_INTERPRETER_ID: expected_identifier,
},
response_specific_attributes={
_GEN_AI_CODE_INTERPRETER_ID: expected_identifier,
},
span_name="Bedrock AgentCore.StartCodeInterpreterSession",
)

Expand All @@ -867,6 +924,12 @@ def test_bedrock_agentcore_start_code_interpreter_session_v1(self):
remote_resource_type="AWS::BedrockAgentCore::CodeInterpreter",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
request_specific_attributes={
_GEN_AI_CODE_INTERPRETER_ID: expected_identifier,
},
response_specific_attributes={
_GEN_AI_CODE_INTERPRETER_ID: expected_identifier,
},
span_name="Bedrock AgentCore.StartCodeInterpreterSession",
)

Expand All @@ -884,6 +947,12 @@ def test_bedrock_agentcore_create_event(self):
remote_resource_type="AWS::BedrockAgentCore::Memory",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
request_specific_attributes={
_GEN_AI_MEMORY_ID: expected_identifier,
},
response_specific_attributes={
_GEN_AI_MEMORY_ID: expected_identifier,
},
span_name="Bedrock AgentCore.CreateEvent",
)

Expand All @@ -903,6 +972,12 @@ def test_bedrock_agentcore_create_memory(self):
cloudformation_primary_identifier=(
f"arn:aws:bedrock-agentcore:us-west-2:123456789012:memory/{expected_identifier}"
),
response_specific_attributes={
_GEN_AI_MEMORY_ID: expected_identifier,
_AWS_BEDROCK_AGENTCORE_MEMORY_ARN: (
f"arn:aws:bedrock-agentcore:us-west-2:123456789012:memory/{expected_identifier}"
),
},
span_name="Bedrock AgentCore Control.CreateMemory",
)

Expand All @@ -920,11 +995,18 @@ def test_bedrock_agentcore_create_gateway(self):
remote_resource_type="AWS::BedrockAgentCore::Gateway",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
response_specific_attributes={
_GEN_AI_GATEWAY_ID: expected_identifier,
_AWS_BEDROCK_AGENTCORE_GATEWAY_ARN: (
f"arn:aws:bedrock-agentcore:us-west-2:123456789012:gateway/{expected_identifier}"
),
},
span_name="Bedrock AgentCore Control.CreateGateway",
)

def test_bedrock_agentcore_create_gateway_target(self):
expected_identifier = "workinggateway-oersefsjga"
gateway_id = "workinggateway-oersefsjga"
target_id = "testTarget-123"
self.do_test_requests(
"bedrock-agentcore/gateway/creategatewaytarget/workinggateway-oersefsjga",
"GET",
Expand All @@ -935,8 +1017,17 @@ def test_bedrock_agentcore_create_gateway_target(self):
remote_service="AWS::BedrockAgentCore",
remote_operation="CreateGatewayTarget",
remote_resource_type="AWS::BedrockAgentCore::GatewayTarget",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
remote_resource_identifier=gateway_id,
cloudformation_primary_identifier=gateway_id,
request_specific_attributes={
_GEN_AI_GATEWAY_ID: gateway_id,
},
response_specific_attributes={
_AWS_GATEWAY_TARGET_ID: target_id,
_AWS_BEDROCK_AGENTCORE_GATEWAY_ARN: (
f"arn:aws:bedrock-agentcore:us-west-2:123456789012:gateway/{gateway_id}"
),
},
span_name="Bedrock AgentCore Control.CreateGatewayTarget",
)

Expand All @@ -954,6 +1045,12 @@ def test_bedrock_agentcore_create_oauth2_credential_provider(self):
remote_resource_type="AWS::BedrockAgentCore::OAuth2CredentialProvider",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
response_specific_attributes={
_AWS_AUTH_CREDENTIAL_PROVIDER: (
f"arn:aws:acps:us-west-2:123456789012:"
f"token-vault/default/oauth2credentialprovider/{expected_identifier}"
),
},
span_name="Bedrock AgentCore Control.CreateOauth2CredentialProvider",
)

Expand All @@ -971,6 +1068,12 @@ def test_bedrock_agentcore_create_api_key_credential_provider(self):
remote_resource_type="AWS::BedrockAgentCore::APIKeyCredentialProvider",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
response_specific_attributes={
_AWS_AUTH_CREDENTIAL_PROVIDER: (
f"arn:aws:acps:us-west-2:123456789012:"
f"token-vault/default/apikeycredentialprovider/{expected_identifier}"
),
},
span_name="Bedrock AgentCore Control.CreateApiKeyCredentialProvider",
)

Expand All @@ -988,6 +1091,9 @@ def test_bedrock_agentcore_get_resource_oauth2_token(self):
remote_resource_type="AWS::BedrockAgentCore::OAuth2CredentialProvider",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
request_specific_attributes={
_AWS_AUTH_CREDENTIAL_PROVIDER: expected_identifier,
},
span_name="Bedrock AgentCore.GetResourceOauth2Token",
)

Expand All @@ -1005,6 +1111,9 @@ def test_bedrock_agentcore_get_resource_api_key(self):
remote_resource_type="AWS::BedrockAgentCore::APIKeyCredentialProvider",
remote_resource_identifier=expected_identifier,
cloudformation_primary_identifier=expected_identifier,
request_specific_attributes={
_AWS_AUTH_CREDENTIAL_PROVIDER: expected_identifier,
},
span_name="Bedrock AgentCore.GetResourceApiKey",
)

Expand Down