Fix: handle (and try to avoid) panic in sigv4 middleware (#269)

* Fix: handle (and try to avoid) panic in sigv4 middleware

* Prepare 1.0.4 release

Author: njvrzm

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 1.0.4
+- Fix: handle (and try to avoid) panic in sigv4 middleware by @njvrzm in [#269](https://github.com/grafana/grafana-aws-sdk/pull/269)
+- Remove pr_commands by @kevinwcyu in [#266](https://github.com/grafana/grafana-aws-sdk/pull/266)
+
 ## 1.0.3
 
 - Fix transport and cache bugs by @njvrzm in [#267](https://github.com/grafana/grafana-aws-sdk/pull/267)

pkg/awsauth/sigv4.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"crypto/sha256"
 	"encoding/hex"
+	"fmt"
 	"io"
 	"net/http"
 	"time"
@@ -53,7 +54,12 @@ type SignerRoundTripper struct {
 	clock             Clock
 }
 
-func (s SignerRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
+func (s SignerRoundTripper) RoundTrip(req *http.Request) (resp *http.Response, e error) {
+	defer func() {
+		if err := recover(); err != nil {
+			e = fmt.Errorf("panic caught in SignerRoundTripper.RoundTrip(): %v", err)
+		}
+	}()
 	awsAuthSettings := Settings{
 		AuthType:           AuthType(s.httpOptions.SigV4.AuthType),
 		AccessKey:          s.httpOptions.SigV4.AccessKey,
@@ -63,6 +69,7 @@ func (s SignerRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
 		AssumeRoleARN:      s.httpOptions.SigV4.AssumeRoleARN,
 		ExternalID:         s.httpOptions.SigV4.ExternalID,
 		ProxyOptions:       s.httpOptions.ProxyOptions,
+		HTTPClient:         &http.Client{},
 	}
 	ctx := req.Context()
 	cfg, err := s.awsConfigProvider.GetConfig(ctx, awsAuthSettings)