Merge pull request #4150 from nickmango/bug/go-lint-issues

Lint Issues
communitybridge · Oct 12, 2023 · e06f3ef · e06f3ef
2 parents 680eced + fde2528
commit e06f3ef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/cla-backend-go/utils/constants.go b/cla-backend-go/utils/constants.go
@@ -219,3 +219,8 @@ const GitLabRepositoryType = "GitLab"
 
 // GitHubRepositoryType representing the GitLab repository type
 const GitHubRepositoryType = "GitHub"
+
+// ContextKey is the key for the context
+type contextKey string
+
+const XREQUESTIDKey contextKey = "x-request-id"
diff --git a/cla-backend-go/v2/sign/docusign.go b/cla-backend-go/v2/sign/docusign.go
@@ -59,7 +59,11 @@ func (s *service) getAccessToken(ctx context.Context) (string, error) {
 		return "", err
 	}
 
-	defer resp.Body.Close()
+	defer func() {
+		if err = resp.Body.Close(); err != nil {
+			log.WithFields(f).WithError(err).Warnf("problem closing the response body")
+		}
+	}()
 
 	// Parse the response
 	responsePayload, err := io.ReadAll(resp.Body)

diff --git a/cla-backend-go/v2/sign/handlers.go b/cla-backend-go/v2/sign/handlers.go
@@ -80,7 +80,7 @@ func Configure(api *operations.EasyclaAPI, service Service) {
 	api.SignRequestIndividualSignatureHandler = sign.RequestIndividualSignatureHandlerFunc(
 		func(params sign.RequestIndividualSignatureParams) middleware.Responder {
 			reqId := utils.GetRequestID(params.XREQUESTID)
-			ctx := context.WithValue(params.HTTPRequest.Context(), utils.XREQUESTID, reqId)
+			ctx := context.WithValue(params.HTTPRequest.Context(), utils.XREQUESTIDKey, reqId)
 			f := logrus.Fields{
 				"functionName":   "v2.sign.handlers.SignRequestIndividualSignatureHandler",
 				utils.XREQUESTID: ctx.Value(utils.XREQUESTID),

diff --git a/cla-backend-go/v2/sign/service.go b/cla-backend-go/v2/sign/service.go
@@ -11,7 +11,6 @@ import (
 	"fmt"
 	"io"
 	"net/http"
-	"os"
 	"strings"
 
 	"github.com/communitybridge/easycla/cla-backend-go/projects_cla_groups"
@@ -35,12 +34,6 @@ import (
 	"github.com/communitybridge/easycla/cla-backend-go/utils"
 )
 
-var (
-	integrationKey = os.Getenv("DOCUSIGN_INTEGRATOR_KEY")
-	userGUID       = os.Getenv("DOCUSIGN_USER_ID")
-	privateKey     = os.Getenv("DOCUSIGN_PRIVATE_KEY")
-)
-
 // constants
 const (
 	DontLoadRepoDetails = false