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.

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

Fix compatibility with AWS.jl 1.91+ #11

Merged
merged 6 commits into from
Feb 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 18 additions & 7 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,41 @@ concurrency:
cancel-in-progress: ${{ startsWith(github.ref, 'refs/pull/') }}
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - AWS.jl ${{ matrix.aws-jl-version }} - ${{ github.event_name }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
version:
- '1.6'
- '1'
- 'nightly'
- "min"
- "lts"
- "nightly"
os:
- ubuntu-latest
arch:
- x64
aws-jl-version:
- "1.78.0" # Oldest supported version
- "latest"
steps:
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
- uses: julia-actions/setup-julia@v2
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: julia-actions/cache@v1
- uses: julia-actions/cache@v2
- name: Set AWS.jl version
if: ${{ matrix.aws-jl-version != 'latest' }}
shell: julia --color=yes --project {0}
run: |
using Pkg
aws_pkg = PackageSpec(; name="AWS", version="${{ matrix.aws-jl-version }}")
Pkg.add(aws_pkg)
Pkg.pin(aws_pkg)
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v3
- uses: codecov/codecov-action@v5
with:
files: lcov.info
env:
Expand Down
10 changes: 6 additions & 4 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "GoAWS"
uuid = "00b10cec-568b-4d01-83ea-8604cd7f25ae"
authors = ["Beacon Biosignals", "Inc."]
version = "1.2.1"
version = "1.3.0"

[deps]
AWS = "fbe9abb3-538b-5e4e-ba9e-bc94f4f92ebc"
Expand All @@ -10,16 +10,18 @@ YAML = "ddb6d928-2868-570f-bddf-ab3f9cf99eb6"
goaws_jll = "a437b02d-256c-57cc-b5c6-817ed6633e35"

[compat]
AWS = "1.8 - 1.90"
AWS = "1.78"
Aqua = "0.7.4"
Compat = "4.11"
URIs = "1.5"
YAML = "0.4.9"
goaws_jll = "0.4.5"
goaws_jll = "0.5"
julia = "1.6"

[extras]
Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Aqua", "Test"]
test = ["Aqua", "Compat", "Test"]
40 changes: 30 additions & 10 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ using AWS
using Aqua
using URIs

using Compat: pkgversion

@service SQS use_response_type = true

@testset "Aqua" begin
Expand Down Expand Up @@ -53,20 +55,38 @@ port = 41231
end

@testset "with_go_aws" begin
is_sqs_json_response = pkgversion(AWS) >= v"1.91"

with_go_aws() do aws_config
result = parse(SQS.create_queue("my_queue"; aws_config))
queue_url = result["CreateQueueResult"]["QueueUrl"]
parsed = parse(SQS.create_queue("my_queue"; aws_config))
queue_url = if is_sqs_json_response
parsed["QueueUrl"]
else
parsed["CreateQueueResult"]["QueueUrl"]
end

parsed = parse(SQS.send_message("hello", queue_url; aws_config))
# Looks like a UUID, but isn't documented to be one, so guess we should leave it as a string
id = if is_sqs_json_response
parsed["MessageId"]
else
parsed["SendMessageResult"]["MessageId"]
end

ret = parse(SQS.send_message("hello", queue_url; aws_config))
id = ret["SendMessageResult"]["MessageId"] # looks like a UUID, but isn't documented to be one, so guess we should leave it as a string
parsed = parse(SQS.receive_message(queue_url, Dict("WaitTimeSeconds" => 1);
aws_config))
messages = if is_sqs_json_response
parsed["Messages"]
else
[parsed["ReceiveMessageResult"]["Message"]]
end

messages = parse(SQS.receive_message(queue_url, Dict("WaitTimeSeconds" => 1);
aws_config))
@test length(messages) == 1

@test messages["ReceiveMessageResult"]["Message"]["Body"] == "hello"
receipt = messages["ReceiveMessageResult"]["Message"]["ReceiptHandle"]
@test startswith(receipt, id)
SQS.delete_message(queue_url, receipt; aws_config)
message = first(messages)
@test message["Body"] == "hello"
@test startswith(message["ReceiptHandle"], id)
SQS.delete_message(queue_url, message["ReceiptHandle"]; aws_config)

return SQS.delete_queue(queue_url; aws_config)
end
Expand Down
Loading