From ddb3a2ffc9bbf1ef4392f047d9e83c0b61b1b9a4 Mon Sep 17 00:00:00 2001 From: Stuart Lang Date: Sun, 19 Nov 2023 12:20:05 +0000 Subject: [PATCH 1/4] Upgrade localstack to 3.0.0 (JSON SQS support) --- build.ps1 | 4 ++-- tests/JustSaying.IntegrationTests/docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.ps1 b/build.ps1 index 1043c5156..1d122be8f 100755 --- a/build.ps1 +++ b/build.ps1 @@ -123,8 +123,8 @@ ForEach ($libraryProject in $libraryProjects) { } if (($null -ne $env:CI) -And ($EnableIntegrationTests -eq $true)) { - & docker pull --quiet localstack/localstack:2.2.0 - & docker run -d --name localstack -p 4566:4566 localstack/localstack:2.2.0 + & docker pull --quiet localstack/localstack:3.0.0 + & docker run -d --name localstack -p 4566:4566 localstack/localstack:3.0.0 $env:AWS_SERVICE_URL = "http://localhost:4566" } diff --git a/tests/JustSaying.IntegrationTests/docker-compose.yml b/tests/JustSaying.IntegrationTests/docker-compose.yml index 6953cc718..cc19cb0b5 100644 --- a/tests/JustSaying.IntegrationTests/docker-compose.yml +++ b/tests/JustSaying.IntegrationTests/docker-compose.yml @@ -3,7 +3,7 @@ services: localstack: container_name: localstack restart: unless-stopped - image: localstack/localstack:2.2.0 + image: localstack/localstack:3.0.0 ports: - 4566:4566 environment: From 20d6eb1ee344188accc69200ba6fd65d730e70b1 Mon Sep 17 00:00:00 2001 From: Stuart Lang Date: Sun, 19 Nov 2023 12:28:03 +0000 Subject: [PATCH 2/4] Use latest AWSSDK packages for test projects --- .../JustSaying.IntegrationTests.csproj | 4 ++-- tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj b/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj index 06b721f60..fb965627b 100644 --- a/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj +++ b/tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj @@ -12,8 +12,8 @@ - - + + diff --git a/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj b/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj index 2f397a91d..d79b10b5d 100644 --- a/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj +++ b/tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj @@ -11,8 +11,8 @@ - - + + From f63931f5a19daee60608644178432d2fed9d4f13 Mon Sep 17 00:00:00 2001 From: Stuart Lang Date: Sun, 19 Nov 2023 15:27:15 +0000 Subject: [PATCH 3/4] Make test project compile --- .../Messaging/Channels/Fakes/FakeAmazonSqs.cs | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs b/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs index 5bfeacfc3..97db8245b 100644 --- a/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs +++ b/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs @@ -1,4 +1,5 @@ using Amazon.Runtime; +using Amazon.Runtime.Endpoints; using Amazon.SQS; using Amazon.SQS.Model; @@ -48,6 +49,11 @@ public Task AddPermissionAsync( return Task.FromResult(new AddPermissionResponse()); } + public Task CancelMessageMoveTaskAsync(CancelMessageMoveTaskRequest request, CancellationToken cancellationToken = new CancellationToken()) + { + return Task.FromResult(new CancelMessageMoveTaskResponse()); + } + public Task ChangeMessageVisibilityAsync( string queueUrl, string receiptHandle, @@ -178,6 +184,11 @@ public Task ListDeadLetterSourceQueuesAsync( return Task.FromResult(new ListDeadLetterSourceQueuesResponse()); } + public Task ListMessageMoveTasksAsync(ListMessageMoveTasksRequest request, CancellationToken cancellationToken = new CancellationToken()) + { + return Task.FromResult(new ListMessageMoveTasksResponse()); + } + public Task ListQueuesAsync( string queueNamePrefix, CancellationToken cancellationToken = new CancellationToken()) @@ -299,6 +310,11 @@ public Task SetQueueAttributesAsync( return Task.FromResult(new SetQueueAttributesResponse()); } + public Task StartMessageMoveTaskAsync(StartMessageMoveTaskRequest request, CancellationToken cancellationToken = new CancellationToken()) + { + return Task.FromResult(new StartMessageMoveTaskResponse()); + } + public Task TagQueueAsync( TagQueueRequest request, CancellationToken cancellationToken = new CancellationToken()) @@ -313,5 +329,10 @@ public Task UntagQueueAsync( return Task.FromResult(new UntagQueueResponse()); } + public Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request) + { + return new Endpoint("https://testqueues.com"); + } + public ISQSPaginatorFactory Paginators { get; set; } -} \ No newline at end of file +} From 3a526be4bb2c73f36634a8c64a7d556e9e75e18f Mon Sep 17 00:00:00 2001 From: Stuart Lang Date: Sun, 19 Nov 2023 16:07:46 +0000 Subject: [PATCH 4/4] Tidy up syntax --- .../Messaging/Channels/Fakes/FakeAmazonSqs.cs | 78 +++++++++---------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs b/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs index 97db8245b..76b278f10 100644 --- a/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs +++ b/tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs @@ -37,19 +37,19 @@ public Task AddPermissionAsync( string label, List awsAccountIds, List actions, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new AddPermissionResponse()); } public Task AddPermissionAsync( AddPermissionRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new AddPermissionResponse()); } - public Task CancelMessageMoveTaskAsync(CancelMessageMoveTaskRequest request, CancellationToken cancellationToken = new CancellationToken()) + public Task CancelMessageMoveTaskAsync(CancelMessageMoveTaskRequest request, CancellationToken cancellationToken = default) { return Task.FromResult(new CancelMessageMoveTaskResponse()); } @@ -58,14 +58,14 @@ public Task ChangeMessageVisibilityAsync( string queueUrl, string receiptHandle, int visibilityTimeout, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new ChangeMessageVisibilityResponse()); } public Task ChangeMessageVisibilityAsync( ChangeMessageVisibilityRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new ChangeMessageVisibilityResponse()); } @@ -73,28 +73,28 @@ public Task ChangeMessageVisibilityAsync( public Task ChangeMessageVisibilityBatchAsync( string queueUrl, List entries, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new ChangeMessageVisibilityBatchResponse()); } public Task ChangeMessageVisibilityBatchAsync( ChangeMessageVisibilityBatchRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new ChangeMessageVisibilityBatchResponse()); } public Task CreateQueueAsync( string queueName, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new CreateQueueResponse()); } public Task CreateQueueAsync( CreateQueueRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new CreateQueueResponse()); } @@ -102,14 +102,14 @@ public Task CreateQueueAsync( public Task DeleteMessageAsync( string queueUrl, string receiptHandle, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return DeleteMessageAsync(new DeleteMessageRequest(queueUrl, receiptHandle), cancellationToken); } public Task DeleteMessageAsync( DeleteMessageRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { DeleteMessageRequests.Add(request); return Task.FromResult(new DeleteMessageResponse()); @@ -119,28 +119,28 @@ public Task DeleteMessageAsync( public Task DeleteMessageBatchAsync( string queueUrl, List entries, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new DeleteMessageBatchResponse()); } public Task DeleteMessageBatchAsync( DeleteMessageBatchRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new DeleteMessageBatchResponse()); } public Task DeleteQueueAsync( string queueUrl, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new DeleteQueueResponse()); } public Task DeleteQueueAsync( DeleteQueueRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new DeleteQueueResponse()); } @@ -148,28 +148,28 @@ public Task DeleteQueueAsync( public Task GetQueueAttributesAsync( string queueUrl, List attributeNames, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new GetQueueAttributesResponse()); } public Task GetQueueAttributesAsync( GetQueueAttributesRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new GetQueueAttributesResponse()); } public Task GetQueueUrlAsync( string queueName, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return GetQueueUrlAsync(new GetQueueUrlRequest(queueName), cancellationToken); } public Task GetQueueUrlAsync( GetQueueUrlRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new GetQueueUrlResponse { @@ -179,54 +179,54 @@ public Task GetQueueUrlAsync( public Task ListDeadLetterSourceQueuesAsync( ListDeadLetterSourceQueuesRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new ListDeadLetterSourceQueuesResponse()); } - public Task ListMessageMoveTasksAsync(ListMessageMoveTasksRequest request, CancellationToken cancellationToken = new CancellationToken()) + public Task ListMessageMoveTasksAsync(ListMessageMoveTasksRequest request, CancellationToken cancellationToken = default) { return Task.FromResult(new ListMessageMoveTasksResponse()); } public Task ListQueuesAsync( string queueNamePrefix, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new ListQueuesResponse()); } public Task ListQueuesAsync( ListQueuesRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new ListQueuesResponse()); } public Task ListQueueTagsAsync( ListQueueTagsRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new ListQueueTagsResponse()); } public Task PurgeQueueAsync( string queueUrl, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new PurgeQueueResponse()); } public Task PurgeQueueAsync( PurgeQueueRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new PurgeQueueResponse()); } public Task ReceiveMessageAsync( string queueUrl, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return ReceiveMessageAsync(new ReceiveMessageRequest(queueUrl), cancellationToken); } @@ -235,7 +235,7 @@ public Task ReceiveMessageAsync( private IEnumerator _getMessagesEnumerator; public async Task ReceiveMessageAsync( ReceiveMessageRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { await Task.Delay(50, cancellationToken); @@ -253,14 +253,14 @@ public async Task ReceiveMessageAsync( public Task RemovePermissionAsync( string queueUrl, string label, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new RemovePermissionResponse()); } public Task RemovePermissionAsync( RemovePermissionRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new RemovePermissionResponse()); } @@ -268,14 +268,14 @@ public Task RemovePermissionAsync( public Task SendMessageAsync( string queueUrl, string messageBody, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new SendMessageResponse()); } public Task SendMessageAsync( SendMessageRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new SendMessageResponse()); } @@ -283,14 +283,14 @@ public Task SendMessageAsync( public Task SendMessageBatchAsync( string queueUrl, List entries, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new SendMessageBatchResponse()); } public Task SendMessageBatchAsync( SendMessageBatchRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new SendMessageBatchResponse()); } @@ -298,33 +298,33 @@ public Task SendMessageBatchAsync( public Task SetQueueAttributesAsync( string queueUrl, Dictionary attributes, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new SetQueueAttributesResponse()); } public Task SetQueueAttributesAsync( SetQueueAttributesRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new SetQueueAttributesResponse()); } - public Task StartMessageMoveTaskAsync(StartMessageMoveTaskRequest request, CancellationToken cancellationToken = new CancellationToken()) + public Task StartMessageMoveTaskAsync(StartMessageMoveTaskRequest request, CancellationToken cancellationToken = default) { return Task.FromResult(new StartMessageMoveTaskResponse()); } public Task TagQueueAsync( TagQueueRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new TagQueueResponse()); } public Task UntagQueueAsync( UntagQueueRequest request, - CancellationToken cancellationToken = new CancellationToken()) + CancellationToken cancellationToken = default) { return Task.FromResult(new UntagQueueResponse()); }