Fix some unhandled deferred errors in ./common/ (#3750)

Author: MichaelSnowden

common/authorization/default_token_key_provider.go

@@ -35,6 +35,7 @@ import (
 	"time"
 
 	"github.com/golang-jwt/jwt/v4"
+	"go.uber.org/multierr"
 	"gopkg.in/square/go-jose.v2"
 
 	"go.temporal.io/server/common/config"
@@ -160,13 +161,15 @@ func (a *defaultTokenKeyProvider) updateKeysFromURI(
 	uri string,
 	rsaKeys map[string]*rsa.PublicKey,
 	ecKeys map[string]*ecdsa.PublicKey,
-) error {
+) (err error) {
 
 	resp, err := http.Get(uri)
 	if err != nil {
 		return err
 	}
-	defer resp.Body.Close()
+	defer func() {
+		err = multierr.Combine(err, resp.Body.Close())
+	}()
 
 	jwks := jose.JSONWebKeySet{}
 	err = json.NewDecoder(resp.Body).Decode(&jwks)

common/log/zap_logger_test.go

@@ -120,7 +120,7 @@ func TestDefaultLogger(t *testing.T) {
 	logger.With(tag.Error(fmt.Errorf("test error"))).Info("test info", tag.WorkflowActionWorkflowStarted)
 
 	// back to normal state
-	w.Close()
+	require.Nil(t, w.Close())
 	os.Stdout = old // restoring the real stdout
 	out := <-outC
 	sps := strings.Split(preCaller, ":")
@@ -150,7 +150,7 @@ func TestThrottleLogger(t *testing.T) {
 	With(With(logger, tag.Error(fmt.Errorf("test error"))), tag.ComponentShardContext).Info("test info", tag.WorkflowActionWorkflowStarted)
 
 	// back to normal state
-	w.Close()
+	require.Nil(t, w.Close())
 	os.Stdout = old // restoring the real stdout
 	out := <-outC
 	sps := strings.Split(preCaller, ":")
@@ -179,7 +179,7 @@ func TestEmptyMsg(t *testing.T) {
 	logger.With(tag.Error(fmt.Errorf("test error"))).Info("", tag.WorkflowActionWorkflowStarted)
 
 	// back to normal state
-	w.Close()
+	require.Nil(t, w.Close())
 	os.Stdout = old // restoring the real stdout
 	out := <-outC
 	sps := strings.Split(preCaller, ":")