Enable the "errchkjson" linter

This is part of the "bugs" preset of golangci-lint.
The "check-error-free-encoding" setting is recommended upstream.

Author: cbandy

.golangci.next.yaml

@@ -10,7 +10,6 @@ linters:
   enable:
     - contextcheck
     - err113
-    - errchkjson
     - gocritic
     - godot
     - godox
@@ -31,9 +30,6 @@ issues:
   exclude-use-default: false
 
 linters-settings:
-  errchkjson:
-    check-error-free-encoding: true
-
   thelper:
     # https://github.com/kulti/thelper/issues/27
     tb:   { begin: true, first: true }

.golangci.yaml

@@ -3,7 +3,6 @@
 linters:
   disable:
     - contextcheck
-    - errchkjson
     - gci
     - gofumpt
   enable:
@@ -41,6 +40,9 @@ linters-settings:
           - pkg: github.com/crunchydata/postgres-operator/internal/testing/*
             desc: The "internal/testing" packages should be used only in tests.
 
+  errchkjson:
+    check-error-free-encoding: true
+
   exhaustive:
     default-signifies-exhaustive: true
 

internal/bridge/client.go

@@ -724,10 +724,7 @@ func (c *Client) UpdateCluster(
 ) (*ClusterApiResource, error) {
 	result := &ClusterApiResource{}
 
-	clusterbyte, err := json.Marshal(clusterRequestPayload)
-	if err != nil {
-		return result, err
-	}
+	clusterbyte, _ := json.Marshal(clusterRequestPayload)
 
 	response, err := c.doWithRetry(ctx, "PATCH", "/clusters/"+id, nil, clusterbyte, http.Header{
 		"Accept":        []string{"application/json"},

internal/controller/standalone_pgadmin/users.go

@@ -293,11 +293,7 @@ cd $PGADMIN_DIR
 	// to add a user, that user will not be in intentUsers. If errors occurred when attempting to
 	// update a user, the user will be in intentUsers as it existed before. We now want to marshal the
 	// intentUsers to json and write the users.json file to the secret.
-	usersJSON, err := json.Marshal(intentUsers)
-	if err != nil {
-		return err
-	}
-	intentUserSecret.Data["users.json"] = usersJSON
+	intentUserSecret.Data["users.json"], _ = json.Marshal(intentUsers)
 
 	err = errors.WithStack(r.setControllerReference(pgadmin, intentUserSecret))
 	if err == nil {

internal/upgradecheck/header.go

@@ -209,11 +209,8 @@ func getServerVersion(ctx context.Context, cfg *rest.Config) string {
 	return versionInfo.String()
 }
 
-func addHeader(req *http.Request, upgradeInfo *clientUpgradeData) (*http.Request, error) {
-	marshaled, err := json.Marshal(upgradeInfo)
-	if err == nil {
-		upgradeInfoString := string(marshaled)
-		req.Header.Add(clientHeader, upgradeInfoString)
-	}
-	return req, err
+func addHeader(req *http.Request, upgradeInfo *clientUpgradeData) *http.Request {
+	marshaled, _ := json.Marshal(upgradeInfo)
+	req.Header.Add(clientHeader, string(marshaled))
+	return req
 }

internal/upgradecheck/header_test.go

@@ -596,12 +596,11 @@ func TestAddHeader(t *testing.T) {
 			PGOVersion: versionString,
 		}
 
-		result, err := addHeader(req, upgradeInfo)
-		assert.NilError(t, err)
+		result := addHeader(req, upgradeInfo)
 		header := result.Header[clientHeader]
 
 		passedThroughData := &clientUpgradeData{}
-		err = json.Unmarshal([]byte(header[0]), passedThroughData)
+		err := json.Unmarshal([]byte(header[0]), passedThroughData)
 		assert.NilError(t, err)
 
 		assert.Equal(t, passedThroughData.PGOVersion, "1.2.3")

internal/upgradecheck/http.go

@@ -77,7 +77,7 @@ func checkForUpgrades(ctx context.Context, url, versionString string, backoff wa
 		// in case some of the checks return errors
 		headerPayloadStruct = generateHeader(ctx, cfg, crclient,
 			versionString, isOpenShift, registrationToken)
-		req, err = addHeader(req, headerPayloadStruct)
+		req = addHeader(req, headerPayloadStruct)
 	}
 
 	// wait.ExponentialBackoff will retry the func according to the backoff object until