Update to JSON v1 (#741)

* bump JSON, and lets see

* do

* Object body into Dict

* rm README comment

* Set project version to v1.97.1

* JSON no longer exports `json`

* Explicitly import JSON.jl bindings

---------

Co-authored-by: Curtis Vogt <[email protected]>

Author: lazarusA

Project.toml

@@ -29,7 +29,7 @@ Compat = "4.11"
 GitHub = "5"
 HTTP = "1"
 IniFile = "0.5"
-JSON = "0.18, 0.19, 0.20, 0.21"
+JSON = "0.18, 0.19, 0.20, 0.21, 1"
 MbedTLS = "0.6, 0.7, 1"
 Mocking = "0.7, 0.8"
 OrderedCollections = "1.3"

README.md

@@ -203,4 +203,4 @@ As well as some hand-written packages for specific AWS services:
 * [AWSEC2.jl](https://github.com/samoconnor/AWSEC2.jl) - Julia 0.6
 * [AWSLambda.jl](https://github.com/samoconnor/AWSLambda.jl) - Julia 0.6
 * [AWSSES.jl](https://github.com/samoconnor/AWSSES.jl) - Julia 0.6
-* [AWSSDB.jl](https://github.com/samoconnor/AWSSDB.jl) - Julia 0.6
+* [AWSSDB.jl](https://github.com/samoconnor/AWSSDB.jl) - Julia 0.6

src/AWS.jl

@@ -5,6 +5,7 @@ using Base64
 using Dates
 using Downloads: Downloads, Downloader, Curl
 using HTTP
+using JSON: JSON
 using MbedTLS
 using Mocking
 using OrderedCollections: LittleDict, OrderedDict
@@ -401,7 +402,7 @@ function (service::JSONService)(
         use_response_type=feature_set.use_response_type,
         resource=POST_RESOURCE,
         request_method="POST",
-        content=json(args),
+        content=JSON.json(args),
         url=generate_service_url(aws_config, service.endpoint_prefix, POST_RESOURCE),
     )
 
@@ -458,7 +459,7 @@ function (service::RestJSONService)(
     end
 
     request.headers["Content-Type"] = "application/json"
-    request.content = json(args)
+    request.content = JSON.json(args)
 
     return submit_request(aws_config, request; return_headers=return_headers)
 end

src/AWSCredentials.jl

@@ -1,7 +1,6 @@
 using Dates
 using HTTP
 using IniFile
-using JSON
 using Mocking
 
 using ..AWSExceptions
@@ -232,12 +231,12 @@ function ec2_instance_credentials(profile::AbstractString)
 
     info = IMDS.get("/latest/meta-data/iam/info")
     info === nothing && return nothing
-    info = JSON.parse(info)
+    info = JSON.parse(info; dicttype=Dict)
 
     # Get credentials for the role associated to the instance via instance profile.
     name = IMDS.get("/latest/meta-data/iam/security-credentials/")
     creds = IMDS.get("/latest/meta-data/iam/security-credentials/$name")
-    parsed = JSON.parse(creds)
+    parsed = JSON.parse(creds; dicttype=Dict)
     instance_profile_creds = AWSCredentials(
         parsed["AccessKeyId"],
         parsed["SecretAccessKey"],
@@ -332,7 +331,7 @@ function ecs_instance_credentials()
         rethrow()
     end
     new_creds = String(response.body)
-    new_creds = JSON.parse(new_creds)
+    new_creds = JSON.parse(new_creds; dicttype=Dict)
 
     expiry = DateTime(rstrip(new_creds["Expiration"], 'Z'))
 

src/AWSExceptions.jl

@@ -1,7 +1,7 @@
 module AWSExceptions
 
 using HTTP
-using JSON
+using JSON: JSON
 using XMLDict
 using XMLDict: XMLDictElement
 
@@ -87,12 +87,12 @@ function AWSException(e::HTTP.StatusError, body::AbstractString)
         if !isempty(body)
             # Extract API error code from Lambda-style JSON error message...
             if endswith(content_type, "json")
-                info = JSON.parse(body)
+                info = JSON.parse(body; dicttype=Dict)
             end
 
             # Extract API error code from JSON error message...
             if occursin(r"^application/x-amz-json-1\.[01]$", content_type)
-                info = JSON.parse(body)
+                info = JSON.parse(body; dicttype=Dict)
                 if haskey(info, "__type")
                     code = rsplit(info["__type"], '#'; limit=2)[end]
                 end

src/AWSMetadata.jl

@@ -4,7 +4,7 @@ using Base64
 using ..AWSExceptions
 using GitHub
 using HTTP
-using JSON
+using JSON: JSON
 using Mocking
 using OrderedCollections: LittleDict, OrderedDict
 

test/patch.jl

@@ -4,7 +4,6 @@ using AWS
 using Dates
 using Downloads: Downloads
 using HTTP
-using JSON
 using GitHub
 using Mocking
 using OrderedCollections: LittleDict

test/resource/setup.jl

@@ -4,7 +4,7 @@
 
 using AWS
 using AWS: AWSException
-using JSON
+using JSON: JSON
 
 @service CloudFormation use_response_type = true
 @service IAM use_response_type = true

test/runtests.jl

@@ -24,7 +24,7 @@ using Downloads
 using GitHub
 using HTTP
 using IniFile: Inifile, sections
-using JSON
+using JSON: JSON
 using OrderedCollections: LittleDict, OrderedDict
 using MbedTLS: digest, MD_SHA256, MD_MD5
 using Mocking