make gen

Author: Stevenjin8

cmd/protoc-gen-golang-jsonshim/test/jsonshim_test.go

@@ -20,9 +20,8 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/golang/protobuf/jsonpb" // nolint: depguard // We need the deprecated module since the jsonpb replacement is not backwards compatible.
-	// nolint: staticcheck
-	legacyproto "github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/jsonpb"            // nolint: depguard,staticcheck // We need the deprecated module since the jsonpb replacement is not backwards compatible.
+	legacyproto "github.com/golang/protobuf/proto" // nolint:staticcheck // We need the deprecated module since the jsonpb replacement is not backwards compatible.
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/protobuf/testing/protocmp"
 

docker/build-tools/prow-entrypoint.sh

@@ -99,6 +99,7 @@ function log() {
   fi
 }
 
+# shellcheck disable=SC2329
 function load_cf_secrets() {
     # Loads secrets from a cloudflare secret file into environment variables.
     # The secret file is expected to be a JSON file with the following structure:

perf/benchmark/security/generate_policies/generate_policies.go

@@ -26,9 +26,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/golang/protobuf/jsonpb" // nolint: depguard // We need the deprecated module since the jsonpb replacement is not backwards compatible.
-	// nolint: staticcheck
-	legacyproto "github.com/golang/protobuf/proto"
+	"github.com/golang/protobuf/jsonpb"            // nolint: depguard,staticcheck // We need the deprecated module since the jsonpb replacement is not backwards compatible.
+	legacyproto "github.com/golang/protobuf/proto" // nolint:staticcheck // We need the deprecated module since the jsonpb replacement is not backwards compatible.
 	"google.golang.org/protobuf/proto"
 	"sigs.k8s.io/yaml"