update tests to create some resources ahead of time

Author: ezhang6811

test/contract-tests/images/applications/TestSimpleApp.AWSSDK.Core/Program.cs

@@ -147,29 +147,17 @@
 app.MapGet("secretsmanager/fault", (SecretsManagerTests secretsManager) => secretsManager.Fault()).WithName("secretsmanager-fault").WithOpenApi();
 app.MapGet("secretsmanager/error", (SecretsManagerTests secretsManager) => secretsManager.Error()).WithName("secretsmanager-error").WithOpenApi();
 
-app.MapGet("sns/createtopic/some-topic", (SNSTests sns) => sns.CreateTopic())
-    .WithName("create-topic")
-    .WithOpenApi();
-
 app.MapGet("sns/publish/some-topic", (SNSTests sns) => sns.Publish())
     .WithName("publish")
     .WithOpenApi();
 
 app.MapGet("sns/fault", (SNSTests sns) => sns.Fault()).WithName("sns-fault").WithOpenApi();
 app.MapGet("sns/error", (SNSTests sns) => sns.Error()).WithName("sns-error").WithOpenApi();
 
-app.MapGet("stepfunctions/createstatemachine/some-state-machine", (StepFunctionsTests stepFunctions) => stepFunctions.CreateStateMachine())
-    .WithName("create-state-machine")
-    .WithOpenApi();
-
 app.MapGet("stepfunctions/describestatemachine/some-state-machine", (StepFunctionsTests stepFunctions) => stepFunctions.DescribeStateMachine())
     .WithName("describe-state-machine")
     .WithOpenApi();
 
-app.MapGet("stepfunctions/createactivity/some-activity", (StepFunctionsTests stepFunctions) => stepFunctions.CreateActivity())
-    .WithName("create-activity")
-    .WithOpenApi();
-
 app.MapGet("stepfunctions/describeactivity/some-activity", (StepFunctionsTests stepFunctions) => stepFunctions.DescribeActivity())
     .WithName("describe-activity")
     .WithOpenApi();
@@ -225,6 +213,20 @@
     .WithName("retrieve")
     .WithOpenApi();
 
+// Create some resources in advance to be accessed by tests
+async Task PrepareAWSServer(IServiceProvider services)
+{
+    var snsTests = services.GetRequiredService<SNSTests>();
+    var stepfunctionsTests = services.GetRequiredService<StepFunctionsTests>();
+
+    // Create a topic for the SNS tests
+    await snsTests.CreateTopic("test-topic");
+
+    // Create a state machine and activity for the Step Functions tests
+    await stepfunctionsTests.CreateStateMachine("test-state-machine");
+    await stepfunctionsTests.CreateActivity("test-activity");
+}
+
 // Reroute the Bedrock API calls to our mock responses in BedrockTests. While other services use localstack to handle the requests,
 // we write our own responses with the necessary data to mimic the expected behavior of the Bedrock services.
 app.MapGet("guardrails/test-guardrail", (BedrockTests bedrock) => bedrock.GetGuardrailResponse());
@@ -241,4 +243,6 @@
 app.MapPost("agents/test-agent/agentAliases/test-agent-alias/sessions/test-session/text", (BedrockTests bedrock) => bedrock.InvokeAgentResponse());
 app.MapPost("knowledgebases/test-knowledge-base/retrieve", (BedrockTests bedrock) => bedrock.RetrieveResponse());
 
+await PrepareAWSServer(app.Services);
+
 app.Run();

test/contract-tests/images/applications/TestSimpleApp.AWSSDK.Core/SNSTests.cs

@@ -9,9 +9,9 @@ public class SNSTests(
     [FromKeyedServices("error-sns")] IAmazonSimpleNotificationService errorSns,
     ILogger<SNSTests> logger) : ContractTest(logger)
 {
-    public Task<CreateTopicResponse> CreateTopic()
+    public Task<CreateTopicResponse> CreateTopic(string name)
     {
-        return sns.CreateTopicAsync(new CreateTopicRequest { Name = "test-topic" });
+        return sns.CreateTopicAsync(new CreateTopicRequest { Name = name });
     }
 
     public Task<PublishResponse> Publish()
@@ -21,7 +21,7 @@ public Task<PublishResponse> Publish()
 
     protected override Task CreateFault(CancellationToken cancellationToken)
     {
-        return faultSns.CreateTopicAsync(new CreateTopicRequest { Name = "test-topic" }, cancellationToken);
+        return faultSns.GetTopicAttributesAsync(new GetTopicAttributesRequest { TopicArn = "arn:aws:sns:us-east-1:000000000000:invalid-topic" }, cancellationToken);
     }
 
     protected override Task CreateError(CancellationToken cancellationToken)

test/contract-tests/images/applications/TestSimpleApp.AWSSDK.Core/StepFunctionsTests.cs

@@ -9,24 +9,24 @@ public class StepFunctionsTests(
     [FromKeyedServices("error-stepfunctions")] IAmazonStepFunctions errorClient,
     ILogger<StepFunctionsTests> logger) : ContractTest(logger)
 {
-    public Task<CreateStateMachineResponse> CreateStateMachine()
+    public Task<CreateStateMachineResponse> CreateStateMachine(string name)
     {
         return stepFunctions.CreateStateMachineAsync(new CreateStateMachineRequest
         {
-            Name = "test-state-machine",
+            Name = name,
             Definition = "{\"StartAt\":\"TestState\",\"States\":{\"TestState\":{\"Type\":\"Pass\",\"End\":true,\"Result\":\"Result\"}}}",
             RoleArn = "arn:aws:iam::000000000000:role/stepfunctions-role"
         });
     }
 
-    public Task<DescribeStateMachineResponse> DescribeStateMachine()
+    public Task<CreateActivityResponse> CreateActivity(string name)
     {
-        return stepFunctions.DescribeStateMachineAsync(new DescribeStateMachineRequest { StateMachineArn = "arn:aws:states:us-east-1:000000000000:stateMachine:test-state-machine" });
+        return stepFunctions.CreateActivityAsync(new CreateActivityRequest { Name = name });
     }
 
-    public Task<CreateActivityResponse> CreateActivity()
+    public Task<DescribeStateMachineResponse> DescribeStateMachine()
     {
-        return stepFunctions.CreateActivityAsync(new CreateActivityRequest { Name = "test-activity" });
+        return stepFunctions.DescribeStateMachineAsync(new DescribeStateMachineRequest { StateMachineArn = "arn:aws:states:us-east-1:000000000000:stateMachine:test-state-machine" });
     }
 
     public Task<DescribeActivityResponse> DescribeActivity()
@@ -36,11 +36,9 @@ public Task<DescribeActivityResponse> DescribeActivity()
 
     protected override Task CreateFault(CancellationToken cancellationToken)
     {
-        return faultClient.CreateStateMachineAsync(new CreateStateMachineRequest
+        return faultClient.ListStateMachineVersionsAsync(new ListStateMachineVersionsRequest
         {
-            Name = "test-state-machine",
-            Definition = "{\"StartAt\":\"TestState\",\"States\":{\"TestState\":{\"Type\":\"Pass\",\"End\":true,\"Result\":\"Result\"}}}",
-            RoleArn = "arn:aws:iam::000000000000:role/stepfunctions-role"
+            StateMachineArn = "arn:aws:states:us-east-1:000000000000:stateMachine:invalid-state-machine"
         }, cancellationToken);
     }
 

test/contract-tests/tests/test/amazon/awssdk/awssdk_test.py

@@ -384,19 +384,6 @@ def test_secretsmanager_error(self):
     #         span_name="Secrets Manager.CreateSecret",
     #     )
 
-    def test_sns_create_topic(self):
-        self.do_test_requests(
-            "sns/createtopic/some-topic",
-            "GET",
-            200,
-            0,
-            0,
-            remote_service="AWS::SNS",
-            remote_operation="CreateTopic",
-            request_response_specific_attributes={},
-            span_name="SNS.CreateTopic"
-        )
-
     def test_sns_publish(self):
         self.do_test_requests(
             "sns/publish/some-topic",
@@ -440,23 +427,13 @@ def test_sns_error(self):
     #         0,
     #         1,
     #         remote_service="AWS::SNS",
-    #         remote_operation="CreateTopic",
-    #         request_response_specific_attributes={},
-    #         span_name="SNS.CreateTopic"
+    #         remote_operation="GetTopicAttributes",
+    #         remote_resource_type="AWS::SNS::Topic",
+    #         remote_resource_identifier="arn:aws:sns:us-east-1:000000000000:invalid-topic",
+    #         request_response_specific_attributes={
+    #            _AWS_SNS_TOPIC_ARN: "arn:aws:sns:us-east-1:000000000000:invalid-topic",},
+    #         span_name="SNS.GetTopicAttributes"
     #     )
-
-    def test_stepfunctions_create_state_machine(self):
-        self.do_test_requests(
-            "stepfunctions/createstatemachine/some-state-machine",
-            "GET",
-            200,
-            0,
-            0,
-            rpc_service="SFN",
-            remote_service="AWS::StepFunctions",
-            remote_operation="CreateStateMachine",
-            span_name="SFN.CreateStateMachine",
-        )
 
     def test_stepfunctions_describe_state_machine(self):
         self.do_test_requests(
@@ -476,19 +453,6 @@ def test_stepfunctions_describe_state_machine(self):
             span_name="SFN.DescribeStateMachine",
         )
 
-    def test_stepfunctions_create_activity(self):
-        self.do_test_requests(
-            "stepfunctions/createactivity/some-activity",
-            "GET",
-            200,
-            0,
-            0,
-            rpc_service="SFN",
-            remote_service="AWS::StepFunctions",
-            remote_operation="CreateActivity",
-            span_name="SFN.CreateActivity",
-        )
-
     def test_stepfunctions_describe_activity(self):
         self.do_test_requests(
             "stepfunctions/describeactivity/some-activity",
@@ -536,8 +500,12 @@ def test_stepfunctions_error(self):
     #         1,
     #         rpc_service="SFN",
     #         remote_service="AWS::StepFunctions",
-    #         remote_operation="CreateStateMachine",
-    #         span_name="SFN.CreateStateMachine",
+    #         remote_operation="ListStateMachineVersions",
+    #         remote_resource_type="AWS::StepFunctions::StateMachine",
+    #         remote_resource_identifier="arn:aws:states:us-east-1:000000000000:stateMachine:invalid-state-machine",
+    #         request_response_specific_attributes={
+    #            _AWS_STEPFUNCTIONS_STATE_MACHINE_ARN: "arn:aws:states:us-east-1:000000000000:stateMachine:invalid-state-machine",},
+    #         span_name="SFN.ListStateMachineVersions",
     #     )
 
     def test_bedrock_get_guardrail(self):