Fix arc lint errors from gci modifications (more outstanding issues brought into scope). Remove goimports from arc since it conflicts with gci

Signed-off-by: Dom Del Nano <ddelnano@gmail.com>

Author: ddelnano

.arclint

@@ -127,12 +127,6 @@
       "script-and-regex.script": "./tools/linters/gazelle.sh",
       "script-and-regex.regex": "/^(?P<severity>[[:alpha:]]+)\n(?P<file>[^\n]+)\n(?P<message>[^\n]+)\n((?P<line>\\d),(?P<char>\\d)\n<<<<<\n(?P<original>.*)=====\n(?P<replacement>.*)>>>>>\n)$/s"
     },
-    "goimports": {
-      "type": "goimports",
-      "include": [
-        "(\\.go$)"
-      ]
-    },
     "golangci-lint": {
       "type": "golangci-lint",
       "include": [

src/cloud/api/controllers/session_middleware.go

@@ -170,7 +170,7 @@ func getAugmentedToken(env apienv.APIEnv, r *http.Request) (string, error) {
 
 	// If the header "X-Use-Bearer is true we force the use of Bearer auth and ignore sessions.
 	// This is needed to prevent logged in pixie sessions to show up in embedded versions.
-	forceBearer := false
+	forceBearer := false //nolint:staticcheck
 	if strings.ToLower(r.Header.Get("X-Use-Bearer")) == "true" {
 		forceBearer = true
 	}

src/cloud/artifact_tracker/controllers/server.go

@@ -173,7 +173,7 @@ func (s *Server) GetDownloadLink(ctx context.Context, in *apb.GetDownloadLinkReq
 		return nil, status.Error(codes.InvalidArgument, "artifact type cannot be unknown")
 	}
 
-	if !(at == vpb.AT_DARWIN_AMD64 || at == vpb.AT_LINUX_AMD64 || at == vpb.AT_CONTAINER_SET_YAMLS || at == vpb.AT_CONTAINER_SET_TEMPLATE_YAMLS) {
+	if at != vpb.AT_CONTAINER_SET_LINUX_AMD64 && at != vpb.AT_CONTAINER_SET_YAMLS && at != vpb.AT_CONTAINER_SET_TEMPLATE_YAMLS {
 		return nil, status.Error(codes.InvalidArgument, "artifact type cannot be downloaded")
 	}
 

src/cloud/autocomplete/suggester.go

@@ -172,9 +172,10 @@ func (e *ElasticSuggester) GetSuggestions(reqs []*SuggestionRequest) ([]*Suggest
 			scriptArgMap[s.ScriptName] = make([]cloudpb.AutocompleteEntityKind, 0)
 			for _, a := range s.Vis.Variables {
 				aKind := cloudpb.AEK_UNKNOWN
-				if a.Type == vispb.PX_POD {
+				switch a.Type {
+				case vispb.PX_POD:
 					aKind = cloudpb.AEK_POD
-				} else if a.Type == vispb.PX_SERVICE {
+				case vispb.PX_SERVICE:
 					aKind = cloudpb.AEK_SVC
 				}
 
@@ -272,7 +273,7 @@ func (e *ElasticSuggester) GetSuggestions(reqs []*SuggestionRequest) ([]*Suggest
 			// TODO(michellenguyen): Remove namespace handling when we create a new index and ensure there are no more
 			// documents with namespace.
 			resName := res.Name
-			if res.NS != "" && !(md.EsMDType(res.Kind) == md.EsMDTypeNamespace || md.EsMDType(res.Kind) == md.EsMDTypeNode) {
+			if res.NS != "" && !(md.EsMDType(res.Kind) == md.EsMDTypeNamespace || md.EsMDType(res.Kind) == md.EsMDTypeNode) { //nolint:staticcheck
 				resName = fmt.Sprintf("%s/%s", res.NS, res.Name)
 			}
 

src/cloud/plugin/controllers/server.go

@@ -560,7 +560,7 @@ func (s *Server) UpdateOrgRetentionPluginConfig(ctx context.Context, req *plugin
 	if req.Version != nil {
 		version = req.Version.Value
 	}
-	if req.Configurations != nil && len(req.Configurations) > 0 {
+	if len(req.Configurations) > 0 {
 		configurations, _ = json.Marshal(req.Configurations)
 	}
 

src/cloud/profile/controllers/server.go

@@ -167,12 +167,14 @@ func orgInfoToProto(o *datastore.OrgInfo) *profilepb.OrgInfo {
 }
 
 func toExternalError(err error) error {
-	if err == datastore.ErrOrgNotFound {
+	switch err {
+	case datastore.ErrOrgNotFound:
 		return status.Error(codes.NotFound, "no such org")
-	} else if err == datastore.ErrUserNotFound {
+	case datastore.ErrUserNotFound:
 		return status.Error(codes.NotFound, "no such user")
+	default:
+		return err
 	}
-	return err
 }
 
 // CreateUser is the GRPC method to create  new user.

src/cloud/project_manager/datastore/datastore_test.go

@@ -24,8 +24,8 @@ import (
 	"testing"
 
 	"github.com/gofrs/uuid"
-	_ "github.com/golang-migrate/migrate/source/go_bindata"
-	bindata "github.com/golang-migrate/migrate/source/go_bindata"
+	_ "github.com/golang-migrate/migrate/source/go_bindata"       //nolint:staticcheck
+	bindata "github.com/golang-migrate/migrate/source/go_bindata" //nolint:staticcheck
 	_ "github.com/jackc/pgx/stdlib"
 	"github.com/jmoiron/sqlx"
 	"github.com/stretchr/testify/assert"

src/cloud/shared/idprovider/client.go

@@ -531,7 +531,7 @@ func (c *HydraKratosClient) HandleLogin(session *sessions.Session, w http.Respon
 	// Copy the header because the header contains a necessary Set-Cookie from the OAuth server.
 	for k, vv := range respHeader {
 		// We only want to cookie and Location headers, otherwise Firefox and Safari complain.
-		if !(k == "Set-Cookie" || k == "Location") {
+		if k != "Set-Cookie" && k != "Location" {
 			continue
 		}
 		for _, v := range vv {

src/cloud/shared/idprovider/client_test.go

@@ -94,7 +94,7 @@ func makeClientFromConfig(t *testing.T, p *testClientConfig) (*HydraKratosClient
 		assert.Equal(t, "abcd", r.Header.Get("ory_hydra_session"))
 		// The actual endpoint sets a cookie, so we want do forward that as well.
 		w.Header().Set("Set-Cookie", p.hydraPublicHostCookie)
-		http.Redirect(w, r, consentURL.String(), 302)
+		http.Redirect(w, r, consentURL.String(), http.StatusFound)
 	}))
 
 	acceptConsentRequestFn := func(params *hydraAdmin.AcceptConsentRequestParams) (*hydraAdmin.AcceptConsentRequestOK, error) {

src/common/testing/test_utils/cert_generator/cert_generator.go

@@ -115,12 +115,14 @@ func generateAndWriteCertPair(ca *x509.Certificate, caKey *rsa.PrivateKey, certP
 	}
 
 	keyType := viper.GetString("secret_key_type")
-	if keyType == "pkcs1" {
+	switch keyType {
+	case "pkcs1":
+
 		err = pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(privateKey)})
 		if err != nil {
 			panic(err)
 		}
-	} else if keyType == "pkcs8" {
+	case "pkcs8":
 		b, err := x509.MarshalPKCS8PrivateKey(privateKey)
 		if err != nil {
 			panic(err)
@@ -130,7 +132,7 @@ func generateAndWriteCertPair(ca *x509.Certificate, caKey *rsa.PrivateKey, certP
 		if err != nil {
 			panic(err)
 		}
-	} else {
+	default:
 		panic(fmt.Sprintf("Unsupported private key type: %s", keyType))
 	}
 	err = keyOut.Close()