Merge pull request #1 from ryanmiville/aws4_request_v1

aws4 request v1

Author: Ryan Miville

gleam.toml

@@ -15,7 +15,7 @@ version = "0.1.0"
 [dependencies]
 gleam_stdlib = ">= 0.34.0 and < 2.0.0"
 envoy = ">= 1.0.1 and < 2.0.0"
-aws4_request = ">= 0.1.1 and < 1.0.0"
+aws4_request = ">= 1.0.0 and < 2.0.0"
 gleam_http = ">= 3.6.0 and < 4.0.0"
 
 [dev-dependencies]

manifest.toml

@@ -2,7 +2,7 @@
 # You typically do not need to edit this file
 
 packages = [
-  { name = "aws4_request", version = "0.1.1", build_tools = ["gleam"], requirements = ["gleam_crypto", "gleam_http", "gleam_stdlib"], otp_app = "aws4_request", source = "hex", outer_checksum = "90B1DB6E2A7F0396CD4713850B14B3A910331B5BA76D051E411D1499AAA2EA9A" },
+  { name = "aws4_request", version = "1.0.0", build_tools = ["gleam"], requirements = ["gleam_crypto", "gleam_http", "gleam_stdlib"], otp_app = "aws4_request", source = "hex", outer_checksum = "F2A0A4A7A04118421AF2F8FB33E3A9D514118A32F4A6560600D4217F9B664C66" },
   { name = "envoy", version = "1.0.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "envoy", source = "hex", outer_checksum = "CFAACCCFC47654F7E8B75E614746ED924C65BD08B1DE21101548AC314A8B6A41" },
   { name = "gleam_crypto", version = "1.3.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_crypto", source = "hex", outer_checksum = "ADD058DEDE8F0341F1ADE3AAC492A224F15700829D9A3A3F9ADF370F875C51B7" },
   { name = "gleam_http", version = "3.6.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_http", source = "hex", outer_checksum = "8C07DF9DF8CC7F054C650839A51C30A7D3C26482AC241C899C1CEA86B22DBE51" },
@@ -11,7 +11,7 @@ packages = [
 ]
 
 [requirements]
-aws4_request = { version = ">= 0.1.1 and < 1.0.0" }
+aws4_request = { version = ">= 1.0.0 and < 2.0.0" }
 envoy = { version = ">= 1.0.1 and < 2.0.0" }
 gleam_http = { version = ">= 3.6.0 and < 4.0.0" }
 gleam_stdlib = { version = ">= 0.34.0 and < 2.0.0" }

src/aws_request/config.gleam

@@ -1,56 +1,35 @@
-import aws_request/config.{type Config}
+import aws4_request.{type Signer, Signer}
 import aws_request/internal/metadata.{type Metadata, Global}
 import gleam/option.{None, Some}
 import gleam/string
 
-pub type Endpoint {
-  Endpoint(
-    hostname: String,
-    protocol: String,
-    signing_region: String,
-    signing_name: String,
-  )
-}
-
-pub fn from(config: Config, metadata: Metadata) -> Endpoint {
-  case config.endpoint {
-    Some(ep) -> {
-      let #(protocol, hostname) = split_scheme(ep)
-      Endpoint(hostname, protocol, config.region, metadata.signing_name)
+pub fn resolve(signer: Signer, metadata: Metadata) -> #(Signer, String) {
+  case signer.region {
+    "local" -> #(
+      Signer(..signer, region: "us-east-1", service: metadata.signing_name),
+      "http://localhost:8000/",
+    )
+    region -> {
+      case metadata.global {
+        Some(Global(region, hostname)) -> #(
+          Signer(..signer, region: region, service: metadata.signing_name),
+          "https://" <> hostname <> "/",
+        )
+        None -> #(
+          Signer(..signer, service: metadata.signing_name),
+          default(region, metadata),
+        )
+      }
     }
-    None -> resolve(config, metadata)
-  }
-}
-
-fn split_scheme(uri: String) {
-  case uri {
-    "https://" <> host -> #("https", host)
-    "http://" <> host -> #("http", host)
-    other -> #("https", other)
-  }
-}
-
-fn resolve(config: Config, metadata: Metadata) -> Endpoint {
-  case config.region, metadata.global {
-    "local", _ ->
-      Endpoint("localhost:8000", "http", "us-east-1", metadata.signing_name)
-    _, Some(Global(region, hostname)) ->
-      Endpoint(hostname, "https", region, metadata.signing_name)
-    region, None ->
-      Endpoint(
-        default(config, metadata),
-        "https",
-        region,
-        metadata.signing_name,
-      )
   }
 }
 
-fn default(config: Config, metadata: Metadata) {
+fn default(region: String, metadata: Metadata) {
   string.concat([
+    "https://",
     metadata.endpoint_prefix,
     ".",
-    config.region,
+    region,
     ".",
     "amazonaws.com",
   ])

src/aws_request/internal/endpoint.gleam

@@ -1,52 +1,25 @@
-import aws4_request
-import aws_request/internal/endpoint.{type Endpoint}
-import aws_request/internal/time
+import aws4_request.{type Signer, Signer}
 import gleam/bit_array
 import gleam/http.{type Header}
 import gleam/http/request.{type Request, Request}
 import gleam/option.{type Option}
 
-pub type RequestBuilder {
-  RequestBuilder(
-    access_key_id: String,
-    secret_access_key: String,
-    service_id: String,
-    endpoint: Endpoint,
-  )
-}
-
-fn sign_v4(builder: RequestBuilder, request: Request(BitArray)) {
-  let date_time = time.utc_now() |> time.to_parts
-  aws4_request.sign(
-    request,
-    date_time,
-    builder.access_key_id,
-    builder.secret_access_key,
-    builder.endpoint.signing_region,
-    builder.endpoint.signing_name,
-  )
-}
-
 pub fn build(
-  builder: RequestBuilder,
+  signer: Signer,
+  endpoint: String,
   method: http.Method,
   path: String,
-  headers: List(Header),
+  extra_headers: List(Header),
   query: Option(String),
   body: Option(BitArray),
 ) -> Request(BitArray) {
-  let assert Ok(request) = request.to(url(builder.endpoint) <> path)
-  let headers = [#("host", builder.endpoint.hostname), ..headers]
+  let assert Ok(request) = request.to(endpoint <> path)
 
   let body = option.unwrap(body, bit_array.from_string(""))
   let request =
-    request.Request(..request, headers: headers, query: query)
+    request.Request(..request, headers: extra_headers, query: query)
     |> request.set_method(method)
     |> request.set_body(body)
 
-  sign_v4(builder, request)
-}
-
-fn url(endpoint: Endpoint) -> String {
-  endpoint.protocol <> "://" <> endpoint.hostname <> "/"
+  aws4_request.sign_bits(signer, request)
 }