Fix round tripper

cmd/content-rw-elasticsearch/main.go

@@ -127,13 +127,8 @@ func main() {
 			if err != nil {
 				log.WithError(err).Fatal("Failed to load AWS config")
 			}
-			credentials, err := cfg.Credentials.Retrieve(context.TODO())
-			if err != nil {
-				log.WithError(err).Fatal("Failed to obtain AWS credentials values")
-			}
-			log.Infof("Obtaining AWS credentials by using [%s] as provider", credentials.Source)
 
-			accessConfig.Credentials = credentials
+			accessConfig.AWSConfig = cfg
 		}
 
 		httpClient := pkghttp.NewHTTPClient()

pkg/es/client.go

@@ -1,6 +1,7 @@
 package es
 
 import (
+	"context"
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
@@ -23,15 +24,15 @@ type Client interface {
 }
 
 type AccessConfig struct {
-	Credentials aws.Credentials
-	Endpoint    string
-	Region      string
+	AWSConfig aws.Config
+	Endpoint  string
+	Region    string
 }
 
 type AWSSigningTransport struct {
-	HTTPClient  *http.Client
-	Credentials aws.Credentials
-	Region      string
+	HTTPClient *http.Client
+	AWSConfig  aws.Config
+	Region     string
 }
 
 func (a AWSSigningTransport) RoundTrip(req *http.Request) (resp *http.Response, err error) {
@@ -49,35 +50,38 @@ func (a AWSSigningTransport) RoundTrip(req *http.Request) (resp *http.Response,
 		}
 	}()
 
-	hasher := sha256.New()
-	payload := []byte("")
+	credentials, err := a.AWSConfig.Credentials.Retrieve(req.Context())
+	if err != nil {
+		return nil, err
+	}
 
-	if req.Body != nil {
-		payload, err = io.ReadAll(req.Body)
-		if err != nil {
-			return nil, fmt.Errorf("reading request body: %w", err)
-		}
+	internalReq := req.Clone(req.Context())
 
-		defer req.Body.Close()
+	bodyReader, err := req.GetBody()
+	if err != nil {
+		return nil, fmt.Errorf("reading request body: %w", err)
 	}
 
-	hash := hex.EncodeToString(hasher.Sum(payload))
+	hash := sha256.New()
+
+	if _, err := io.Copy(hash, bodyReader); err != nil {
+		return nil, fmt.Errorf("copying request body: %w", err)
+	}
 
-	err = signer.
+	if err := signer.
 		NewSigner().
-		SignHTTP(req.Context(), a.Credentials, req, hash, "es", a.Region, time.Now().UTC())
-	if err != nil {
+		SignHTTP(context.Background(), credentials, internalReq, hex.EncodeToString(hash.Sum(nil)), "es", a.Region, time.Now()); err != nil {
 		return nil, fmt.Errorf("signing request: %w", err)
 	}
 
-	return a.HTTPClient.Do(req)
+	return a.HTTPClient.Do(internalReq)
 }
 
 func NewClient(config AccessConfig, client *http.Client, log *logger.UPPLogger) (Client, error) {
 	signingTransport := AWSSigningTransport{
-		Credentials: config.Credentials,
-		HTTPClient:  client,
-		Region:      config.Region,
+		AWSConfig:  config.AWSConfig,
+		HTTPClient: client,
+		Region:     config.Region,
 	}
 	signingClient := &http.Client{Transport: http.RoundTripper(signingTransport)}