Minor fixes (#164)

* Minor fixes - Properly reference the global AWSConfig, in each protocol function - Remove response_dict_type from args if it's available - Use response_dict_type in Query and JSON services * Apply suggestions from code review Co-authored-by: Eric Davies <[email protected]> Co-authored-by: Eric Davies <[email protected]>
JuliaCloud · Aug 31, 2020 · a2dd6fb · a2dd6fb · mattBrzezinski · Aug 31, 2020
1 parent fe42643
commit a2dd6fb
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/src/AWS.jl b/src/AWS.jl
@@ -485,7 +485,7 @@ Perform a RestXML request to AWS.
 """
 function (service::RestXMLService)(
     request_method::String, request_uri::String, args::AbstractDict{String, <:Any}=Dict{String, Any}(); 
-    aws_config::AWSConfig=aws_config[],
+    aws_config::AWSConfig=global_aws_config(),
 )
     request = Request(
         service=service.name,
@@ -500,7 +500,7 @@ function (service::RestXMLService)(
     )
 
     if haskey(args, "response_dict_type")
-        request.response_dict_type = args["response_dict_type"]
+        request.response_dict_type = pop!(args, "response_dict_type")
     end
 
     delete!(args, "headers")
@@ -544,7 +544,7 @@ Perform a Query request to AWS.
 """
 function (service::QueryService)(
     operation::String, args::AbstractDict{String, <:Any}=Dict{String, Any}(); 
-    aws_config::AWSConfig=aws_config[],
+    aws_config::AWSConfig=global_aws_config(),
 )
     POST_RESOURCE = "/"
     return_headers = _return_headers(args)
@@ -562,6 +562,10 @@ function (service::QueryService)(
         return_raw=get(args, "return_raw", false),
     )
 
+    if haskey(args, "response_dict_type")
+        request.response_dict_type = pop!(args, "response_dict_type")
+    end
+
     request.headers["Content-Type"] = "application/x-www-form-urlencoded; charset=utf-8"
 
     args["Action"] = operation
@@ -591,7 +595,7 @@ Perform a JSON request to AWS.
 """
 function (service::JSONService)(
     operation::String, args::AbstractDict{String, <:Any}=Dict{String, Any}();
-    aws_config::AWSConfig=aws_config[],
+    aws_config::AWSConfig=global_aws_config(),
 )
     POST_RESOURCE = "/"
     return_headers = _return_headers(args)
@@ -610,6 +614,10 @@ function (service::JSONService)(
         return_raw=get(args, "return_raw", false),
     )
 
+    if haskey(args, "response_dict_type")
+        request.response_dict_type = pop!(args, "response_dict_type")
+    end
+
     request.headers["Content-Type"] = "application/x-amz-json-$(service.json_version)"
     request.headers["X-Amz-Target"] = "$(service.target).$(operation)"
 
@@ -637,7 +645,7 @@ Perform a RestJSON request to AWS.
 """
 function (service::RestJSONService)(
     request_method::String, request_uri::String, args::AbstractDict{String, <:Any}=Dict{String, String}();
-    aws_config::AWSConfig=aws_config[],
+    aws_config::AWSConfig=global_aws_config(),
 )
     return_headers = _return_headers(args)
 
@@ -654,7 +662,7 @@ function (service::RestJSONService)(
     )
 
     if haskey(args, "response_dict_type")
-        request.response_dict_type = args["response_dict_type"]
+        request.response_dict_type = pop!(args, "response_dict_type")
     end
 
     request.url = _generate_service_url(aws_config.region, request.service, request.resource)