From fdf7efc2a020c97671987bd0557bb999ad4cbbf9 Mon Sep 17 00:00:00 2001
From: Alex Arslan <ararslan@comcast.net>
Date: Tue, 19 Feb 2019 16:06:04 -0800
Subject: [PATCH] Remove AWS4AuthLayer and HTTP.request extension

It's currently exceedingly difficult for packages to extend
`HTTP.request` by providing a custom layer, which is likely why the
logic for an AWS authentication layer is in HTTP rather than AWSCore.
The simplest course of action would be to remove the functionality from
this package and instead introduce a dependency on AWSAuth to HTTP, with
the `request` extension using signing defined here.
---
 docs/src/index.md  |  2 --
 src/AWSAuth.jl     |  2 +-
 src/signaturev4.jl | 30 ++----------------------------
 3 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/docs/src/index.md b/docs/src/index.md
index fe5d57e..3fa7098 100644
--- a/docs/src/index.md
+++ b/docs/src/index.md
@@ -9,7 +9,5 @@ The AWSAuth package implements AWS authentication.
 Currently this consists of AWS Signature v4 signing for HTTP requests sent to AWS.
 
 ```@docs
-AWSAuth.AWS4AuthLayer
-AWSAuth.SignatureV4.HTTP.request
 AWSAuth.SignatureV4.sign!
 ```
diff --git a/src/AWSAuth.jl b/src/AWSAuth.jl
index 9971d25..b83f538 100644
--- a/src/AWSAuth.jl
+++ b/src/AWSAuth.jl
@@ -1,6 +1,6 @@
 module AWSAuth
 
-export SignatureV4, AWS4AuthLayer
+export SignatureV4
 
 include("signaturev4.jl")
 
diff --git a/src/signaturev4.jl b/src/signaturev4.jl
index 82325c4..2819565 100644
--- a/src/signaturev4.jl
+++ b/src/signaturev4.jl
@@ -5,36 +5,10 @@ using Dates
 using HTTP
 using HTTP.Pairs
 using HTTP.URIs
-using HTTP: Headers, Layer, Request
+using HTTP: Headers
 using IniFile
 using MbedTLS
 
-export AWS4AuthLayer
-
-"""
-    AWS4AuthLayer{Next} <: HTTP.Layer
-
-Abstract type used by [`HTTP.request`](@ref) to add an
-[AWS Signature v4](http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html)
-authentication layer to the request.
-"""
-abstract type AWS4AuthLayer{Next<:Layer} <: Layer end
-
-"""
-    HTTP.request(::Type{AWS4AuthLayer}, url::HTTP.URI, req::HTTP.Request, body) -> HTTP.Response
-
-Perform the given request, adding a layer of AWS authentication using
-[AWS Signature v4](http://docs.aws.amazon.com/general/latest/gr/signature-version-4.html).
-An "Authorization" header to the request.
-"""
-function HTTP.request(::Type{AWS4AuthLayer{Next}}, url::URI, req::Request, body; kw...) where Next
-    if !haskey(kw, :aws_access_key_id) && !haskey(ENV, "AWS_ACCESS_KEY_ID")
-        kw = merge(dot_aws_credentials(), kw)
-    end
-    sign!(req.method, url, req.headers, req.body; kw...)
-    return HTTP.request(Next, url, req, body; kw...)
-end
-
 # Normalize whitespace to the form required in the canonical headers.
 # Note that the expected format for multiline headers seems not to be explicitly
 # documented, but Amazon provides a test case for it, so we'll match that behavior.
@@ -212,4 +186,4 @@ function dot_aws_credentials()::NamedTuple
     return credentials
 end
 
-end # module AWS4AuthRequest
+end # module