Try #88:

JuliaCloud · Oct 21, 2019 · 4447519 · 4447519
2 parents 6f43e72 + d8f9092
commit 4447519
Show file tree

Hide file tree

Showing 15 changed files with 1,734 additions and 936 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,17 +1,17 @@
 # Documentation: http://docs.travis-ci.com/user/languages/julia/
-language: julia
-os:
-  - linux
-  - osx
-julia:
-  - 1.0
-  - 1.1
-  - nightly
-matrix:
-  allow_failures:
-    - julia: nightly
-    - julia: 1.0
-      stage: "Verify Packages"
+#language: julia
+#os:
+#  - linux
+#  - osx
+#julia:
+#  - 1.0
+#  - 1.1
+#  - nightly
+#matrix:
+#  allow_failures:
+#    - julia: nightly
+#    - julia: 1.0
+#      stage: "Verify Packages"
 branches:
   only:
     - master
@@ -27,59 +27,59 @@ env:
     - secure: Lrh6AxUp1yFdsB1XlvNHFk+5pOMGQR8bJadUtnqXsuk97ieINI5w/da6wBPIH4WkZBGpQr+uJLe10PTxDcaNeZOC1LcuSK+v5J88pSiFYi10BggYWC2Kb2XEVBjd9BHi/RxAkiHXziBEaqpuX2WcwY2hgAOU+rpt3M9U9SxDITXNG68PpVVqDJ7GSZvZeJZnLrjTPKLlFR8EkqrE23bTaGvzqn50fwk7U3n0F04slkmg2ORScWkgBSFmaATBbiSU9Pz7bB4KuGarNC0Q0eTeoZcThRVYVwse3oLnYLMXkUuIDF5QwDfA5HCC4ad5yXdVenwHZSPS/sSnRM+fVAwkU8CL7hFC9zX2X/fBExWet0LufaCh4L6pax3dKV2m6q3Uq9M1z8X33ry2xqS96rpdD4bo+FxYrzjyAotn46w4fPE7yb3YZgf+dbHTDfVjiPH70hIKUhKiyzyKMTwdT63WNIy1/qbREge4jPVXgnIM3/jAu0THf74cT+RwN4xQnt7a50Yn2c/I+37kO2B+4qkyh4p75eIfPXqak1vdDc9tUqxZa7lPdIkofT3jp7TaJ+4/OLf2OrpA2XFjx20el4/TdB9TiJtGv0qTrujY4wh5BALxGVoSEihj3ahkqV/FQ6RyWJsMggd3yoaING61nCkDXUvLk/44yzeYavNrUaMzWpc=
 jobs:
   include:
-    - stage: "Verify Packages"
-      name: AWSS3
-      julia: 1.0
-      os: linux
-      script:
-        - julia --project=tmps3 -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.add("AWSS3"); Pkg.test("AWSS3")'
-    - stage: "Verify Packages"
-      name: AWSSQS
-      julia: 1.0
-      os: linux
-      script:
-        - julia --project=tmpsqs -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.add("AWSSQS"); Pkg.test("AWSSQS")'
-    - stage: "Online tests"
-      name: "EC2"
-      julia: 1.0
-      os: linux
-      before_install:
-        - pip install --user awscli
-      script:
-        - aws ssm get-parameter --region us-east-1 --name /public_ci/AWSCore/ec2_keyfile --query 'Parameter.Value' --output text --with-decryption > ec2.pem
-        - chmod 600 ec2.pem
-        - export KEYFILE=ec2.pem
-        # Tag with commit to be able to terminate later
-        - INSTANCE_ID=$(aws ec2 run-instances --region us-east-1 --launch-template LaunchTemplateName=AWSCoreEC2Template --tag-specifications "ResourceType=instance,Tags=[{Key=AWSCoreCommit,Value=$TRAVIS_COMMIT}]" --query 'Instances[0].InstanceId' --output text)
-        # Wait until UserData installs Julia
-        - aws ec2 wait instance-status-ok --region us-east-1 --instance-ids $INSTANCE_ID
-        - export EC2Ip=$(aws ec2 describe-instances --region us-east-1 --instance-ids $INSTANCE_ID  --query 'Reservations[0].Instances[0].PublicIpAddress' --output text)
-        - |
-          julia -e '
-          using Distributed
-          addprocs(
-              ["ec2-user@$(ENV["EC2Ip"])"],
-              sshflags=`-i $(ENV["KEYFILE"]) -o "StrictHostKeyChecking=no"`,
-              exename="/julia/bin/julia",
-              dir="/home/ec2-user",
-              tunnel=true,
-          )
-          @fetch @eval using Pkg
-          rev=ENV["TRAVIS_COMMIT"]
-          @fetch Pkg.add(PackageSpec(url="https://github.com/JuliaCloud/AWSCore.jl", rev=rev))
-          @fetch ENV["AWSCORE_INSTANCE_TYPE"]="EC2"
-          @fetch Pkg.build("AWSCore")
-          @fetch @eval using AWSCore
-          @fetch Pkg.test("AWSCore")
-          '
-      after_script:
-        - INSTANCE_ID=$(aws ec2 describe-instances --region us-east-1 --filter Name=tag:AWSCoreCommit,Values=$TRAVIS_COMMIT Name=instance-state-name,Values=running,pending --query 'Reservations[*].Instances[0].InstanceId' --output text)
-        - |
-          if [ "$INSTANCE_ID" ]; then
-              aws ec2 terminate-instances --region us-east-1 --instance-ids $INSTANCE_ID
-              aws ec2 wait instance-terminated --region us-east-1 --instance-ids $INSTANCE_ID
-          fi
-      after_success: skip
+#    - stage: "Verify Packages"
+#      name: AWSS3
+#      julia: 1.0
+#      os: linux
+#      script:
+#        - julia --project=tmps3 -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.add("AWSS3"); Pkg.test("AWSS3")'
+#    - stage: "Verify Packages"
+#      name: AWSSQS
+#      julia: 1.0
+#      os: linux
+#      script:
+#        - julia --project=tmpsqs -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.add("AWSSQS"); Pkg.test("AWSSQS")'
+#    - stage: "Online tests"
+#      name: "EC2"
+#      julia: 1.0
+#      os: linux
+#      before_install:
+#        - pip install --user awscli
+#      script:
+#        - aws ssm get-parameter --region us-east-1 --name /public_ci/AWSCore/ec2_keyfile --query 'Parameter.Value' --output text --with-decryption > ec2.pem
+#        - chmod 600 ec2.pem
+#        - export KEYFILE=ec2.pem
+#        # Tag with commit to be able to terminate later
+#        - INSTANCE_ID=$(aws ec2 run-instances --region us-east-1 --launch-template LaunchTemplateName=AWSCoreEC2Template --tag-specifications "ResourceType=instance,Tags=[{Key=AWSCoreCommit,Value=$TRAVIS_COMMIT}]" --query 'Instances[0].InstanceId' --output text)
+#        # Wait until UserData installs Julia
+#        - aws ec2 wait instance-status-ok --region us-east-1 --instance-ids $INSTANCE_ID
+#        - export EC2Ip=$(aws ec2 describe-instances --region us-east-1 --instance-ids $INSTANCE_ID  --query 'Reservations[0].Instances[0].PublicIpAddress' --output text)
+#        - |
+#          julia -e '
+#          using Distributed
+#          addprocs(
+#              ["ec2-user@$(ENV["EC2Ip"])"],
+#              sshflags=`-i $(ENV["KEYFILE"]) -o "StrictHostKeyChecking=no"`,
+#              exename="/julia/bin/julia",
+#              dir="/home/ec2-user",
+#              tunnel=true,
+#          )
+#          @fetch @eval using Pkg
+#          rev=ENV["TRAVIS_COMMIT"]
+#          @fetch Pkg.add(PackageSpec(url="https://github.com/JuliaCloud/AWSCore.jl", rev=rev))
+#          @fetch ENV["AWSCORE_INSTANCE_TYPE"]="EC2"
+#          @fetch Pkg.build("AWSCore")
+#          @fetch @eval using AWSCore
+#          @fetch Pkg.test("AWSCore")
+#          '
+#      after_script:
+#        - INSTANCE_ID=$(aws ec2 describe-instances --region us-east-1 --filter Name=tag:AWSCoreCommit,Values=$TRAVIS_COMMIT Name=instance-state-name,Values=running,pending --query 'Reservations[*].Instances[0].InstanceId' --output text)
+#        - |
+#          if [ "$INSTANCE_ID" ]; then
+#              aws ec2 terminate-instances --region us-east-1 --instance-ids $INSTANCE_ID
+#              aws ec2 wait instance-terminated --region us-east-1 --instance-ids $INSTANCE_ID
+#          fi
+#      after_success: skip
     - stage: "Online tests"
       name: "ECS"
       julia: 1.0
@@ -105,10 +105,10 @@ jobs:
           fi
         - test "$status" == "SUCCEEDED"
       after_success: skip
-    - stage: "Documentation"
-      julia: 1.0
-      os: linux
-      script:
-        - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
-        - julia --project=docs/ docs/make.jl
-      after_success: skip
+#    - stage: "Documentation"
+#      julia: 1.0
+#      os: linux
+#      script:
+#        - julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
+#        - julia --project=docs/ docs/make.jl
+#      after_success: skip
diff --git a/Project.toml b/Project.toml
@@ -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"
@@ -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]

diff --git a/src/AWSCore.jl b/src/AWSCore.jl
@@ -8,8 +8,7 @@
 module AWSCore
 
 
-export AWSException, AWSConfig, AWSRequest,
-       aws_config, default_aws_config
+export AWSException, AWSConfig, AWSRequest, aws_config, default_aws_config, SignatureV4
 
 using Base64
 using Dates
@@ -49,14 +48,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.
@@ -106,7 +106,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),
@@ -120,6 +119,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.
 """
@@ -138,7 +139,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
@@ -557,11 +557,6 @@ global debug_level = 0
 function set_debug_level(n)
     global debug_level = n
 end
-
-
-include("Services.jl")
-
-
 end # module AWSCore