Skip to content

Commit

Permalink
Moved AWS4AuthLayer from AWSAuth.jl into AWSCore.jl
Browse files Browse the repository at this point in the history
Moved AWS4AuthLayer into this package from AWSAuth.jl. Originally wanted to
move AWSCredentials into AWSAuth.jl however this would create a circular
dependency. Instead we're moving AWS4AuthLayer into AWSCore.jl. This now
allows us to clean up HTTP.jl and remove AWS functionality from it.
  • Loading branch information
mattBrzezinski committed Oct 28, 2019
1 parent 6f43e72 commit 19e20b6
Show file tree
Hide file tree
Showing 15 changed files with 1,676 additions and 879 deletions.
4 changes: 3 additions & 1 deletion Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "AWSCore"
uuid = "4f1ea46c-232b-54a6-9b17-cc2d0f3e6598"
version = "0.6.2"
version = "0.6.3"

[deps]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand All @@ -11,12 +11,14 @@ IniFile = "83e8ac13-25f8-5344-8a64-a9f2b223428f"
JSON = "682c06a0-de6a-54ab-a142-c8b1cf79cde6"
LazyJSON = "fc18253b-5e1b-504c-a4a2-9ece4944c004"
MbedTLS = "739be429-bea8-5141-9913-cc70e7f3736d"
Mocking = "78c3b35d-d492-501b-9361-3d52fe80e533"
Retry = "20febd7b-183b-5ae2-ac4a-720e7ce64774"
Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
SymDict = "2da68c74-98d7-5633-99d6-8493888d7b1e"
XMLDict = "228000da-037f-5747-90a9-8195ccbf91a5"

[compat]
Mocking = "0.7"
julia = "1"

[extras]
Expand Down
20 changes: 8 additions & 12 deletions src/AWSCore.jl
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
module AWSCore


export AWSException, AWSConfig, AWSRequest,
aws_config, default_aws_config
export AWSException, AWSConfig, AWSRequest, SignatureV4, aws_config, default_aws_config,
http_get

using Base64
using Dates
Expand Down Expand Up @@ -49,14 +49,15 @@ It contains the following keys:
"""
const AWSRequest = SymbolDict


include("http.jl")
include("AWSException.jl")
include("AWSCredentials.jl")
include("deprecations.jl")
include("names.jl")
include("mime.jl")


include("signaturev4.jl")
include("sign.jl")
include("Services.jl")

#------------------------------------------------------------------------------#
# Configuration.
Expand Down Expand Up @@ -106,7 +107,6 @@ as follows. However, putting access credentials in source code is discouraged.
aws = aws_config(creds = AWSCredentials("AKIAXXXXXXXXXXXXXXXX",
"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"))
```
"""
function aws_config(;profile=nothing,
creds=AWSCredentials(profile=profile),
Expand All @@ -120,6 +120,8 @@ global _default_aws_config = nothing # Union{AWSConfig,Nothing}


"""
default_aws_config()
`default_aws_config` returns a global shared [`AWSConfig`](@ref) object
obtained by calling [`aws_config`](@ref) with no optional arguments.
"""
Expand All @@ -138,7 +140,6 @@ end
Convert nested `Vector{Pair}` maps in `args` into `Dict{String,Any}` maps.
"""
function aws_args_dict(args)

result = stringdict(args)

dictlike(t) = (t <: AbstractDict
Expand Down Expand Up @@ -557,11 +558,6 @@ global debug_level = 0
function set_debug_level(n)
global debug_level = n
end


include("Services.jl")


end # module AWSCore


Expand Down
Loading

0 comments on commit 19e20b6

Please sign in to comment.