Skip to content
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

Jump to bottom

Update localstack to 3.0.0 #1295

Merged
merged 4 commits into from
Nov 19, 2023
Merged

Update localstack to 3.0.0 #1295

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ddb3a2f
Upgrade localstack to 3.0.0 (JSON SQS support)
slang25 Nov 19, 2023
20d6eb1
Use latest AWSSDK packages for test projects
slang25 Nov 19, 2023
f63931f
Make test project compile
slang25 Nov 19, 2023
3a526be
Tidy up syntax
slang25 Nov 19, 2023
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
4 changes: 2 additions & 2 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}

Expand Down
4 changes: 2 additions & 2 deletions tests/JustSaying.IntegrationTests/JustSaying.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
<ProjectReference Include="..\JustSaying.TestingFramework\JustSaying.TestingFramework.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SimpleNotificationService" />
<PackageReference Include="AWSSDK.SQS" />
<PackageReference Include="AWSSDK.SimpleNotificationService" VersionOverride="3.7.300.5" />
<PackageReference Include="AWSSDK.SQS" VersionOverride="3.7.300.5" />
Comment on lines +15 to +16
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TIL - does this work with dependabot?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good question, I don't know, would be good to find out. There is also a feature that I can't find where you define versions in groups, and you can say in the package reference "I want the version from group A", can't remember how that works, so doing this for now.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we can merge it and if it messes stuff up we can try something else.

<PackageReference Include="GitHubActionsTestLogger" />
<PackageReference Include="MartinCostello.Logging.XUnit" />
<PackageReference Include="MELT.Xunit" />
Expand Down
2 changes: 1 addition & 1 deletion tests/JustSaying.IntegrationTests/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions tests/JustSaying.UnitTests/JustSaying.UnitTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ProjectReference Include="..\JustSaying.TestingFramework\JustSaying.TestingFramework.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="AWSSDK.SimpleNotificationService" />
<PackageReference Include="AWSSDK.SQS" />
<PackageReference Include="AWSSDK.SimpleNotificationService" VersionOverride="3.7.300.5" />
<PackageReference Include="AWSSDK.SQS" VersionOverride="3.7.300.5" />
<PackageReference Include="GitHubActionsTestLogger" />
<PackageReference Include="MELT" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
Expand Down
23 changes: 22 additions & 1 deletion tests/JustSaying.UnitTests/Messaging/Channels/Fakes/FakeAmazonSqs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Amazon.Runtime;
using Amazon.Runtime.Endpoints;
using Amazon.SQS;
using Amazon.SQS.Model;

Expand Down Expand Up @@ -48,6 +49,11 @@ public Task<AddPermissionResponse> AddPermissionAsync(
return Task.FromResult(new AddPermissionResponse());
}

public Task<CancelMessageMoveTaskResponse> CancelMessageMoveTaskAsync(CancelMessageMoveTaskRequest request, CancellationToken cancellationToken = new CancellationToken())
martincostello marked this conversation as resolved.
Show resolved Hide resolved
{
return Task.FromResult(new CancelMessageMoveTaskResponse());
}

public Task<ChangeMessageVisibilityResponse> ChangeMessageVisibilityAsync(
string queueUrl,
string receiptHandle,
Expand Down Expand Up @@ -178,6 +184,11 @@ public Task<ListDeadLetterSourceQueuesResponse> ListDeadLetterSourceQueuesAsync(
return Task.FromResult(new ListDeadLetterSourceQueuesResponse());
}

public Task<ListMessageMoveTasksResponse> ListMessageMoveTasksAsync(ListMessageMoveTasksRequest request, CancellationToken cancellationToken = new CancellationToken())
{
return Task.FromResult(new ListMessageMoveTasksResponse());
}

public Task<ListQueuesResponse> ListQueuesAsync(
string queueNamePrefix,
CancellationToken cancellationToken = new CancellationToken())
Expand Down Expand Up @@ -299,6 +310,11 @@ public Task<SetQueueAttributesResponse> SetQueueAttributesAsync(
return Task.FromResult(new SetQueueAttributesResponse());
}

public Task<StartMessageMoveTaskResponse> StartMessageMoveTaskAsync(StartMessageMoveTaskRequest request, CancellationToken cancellationToken = new CancellationToken())
{
return Task.FromResult(new StartMessageMoveTaskResponse());
}

public Task<TagQueueResponse> TagQueueAsync(
TagQueueRequest request,
CancellationToken cancellationToken = new CancellationToken())
Expand All @@ -313,5 +329,10 @@ public Task<UntagQueueResponse> UntagQueueAsync(
return Task.FromResult(new UntagQueueResponse());
}

public Endpoint DetermineServiceOperationEndpoint(AmazonWebServiceRequest request)
{
return new Endpoint("https://testqueues.com");
}

public ISQSPaginatorFactory Paginators { get; set; }
}
}
Loading