From addbfee593c7296f69969f6e7c5963380ad08df3 Mon Sep 17 00:00:00 2001 From: Jim Date: Tue, 19 Apr 2022 11:42:54 -0400 Subject: [PATCH] chore: upgrade gofumpt to v0.3.1 (#2028) --- go.mod | 3 ++- go.sum | 8 ++++++-- internal/auth/oidc/service_callback.go | 3 ++- internal/auth/oidc/testing.go | 3 ++- internal/credential/vault/jobs_test.go | 6 ++++-- internal/db/clause.go | 1 - internal/host/plugin/job_set_sync.go | 3 ++- internal/servers/controller/auth/auth.go | 6 ++++-- internal/servers/controller/auth/authorized_actions.go | 3 ++- internal/servers/controller/common/scopeids/scope_ids.go | 3 ++- internal/servers/controller/interceptor.go | 6 ++++-- internal/session/service_authorize_connection.go | 3 ++- internal/session/service_close_connections.go | 3 ++- 13 files changed, 34 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index feb270d46d..d863db0470 100644 --- a/go.mod +++ b/go.mod @@ -79,7 +79,7 @@ require ( google.golang.org/protobuf v1.27.1 gorm.io/driver/postgres v1.2.2 gorm.io/gorm v1.22.3 - mvdan.cc/gofumpt v0.2.0 + mvdan.cc/gofumpt v0.3.1 nhooyr.io/websocket v1.8.7 ) @@ -178,6 +178,7 @@ require ( golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3 // indirect golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect golang.org/x/text v0.3.7 // indirect golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect diff --git a/go.sum b/go.sum index cb5c9eb365..a081fa5926 100644 --- a/go.sum +++ b/go.sum @@ -212,8 +212,9 @@ github.com/favadi/protoc-go-inject-tag v1.3.0 h1:JPrmsmc/uBShG85uY5xGZIa5WJ0IaNZ github.com/favadi/protoc-go-inject-tag v1.3.0/go.mod h1:SSkUBgfqw2IJ2p7NPNKWk0Idwxt/qIt2LQgFPUgRGtc= github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= github.com/frankban/quicktest v1.13.0/go.mod h1:qLE0fzW0VuyUAJgPU19zByoIr0HtCHN/r/VLSOOIySU= -github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= +github.com/frankban/quicktest v1.14.2 h1:SPb1KFFmM+ybpEjPUhCCkZOM5xlovT5UbrMvWnXyBns= +github.com/frankban/quicktest v1.14.2/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsouza/fake-gcs-server v1.17.0/go.mod h1:D1rTE4YCyHFNa99oyJJ5HyclvN/0uQR+pM/VdlL83bw= @@ -1075,6 +1076,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180224232135-f6cff0780e54/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1154,6 +1156,7 @@ golang.org/x/sys v0.0.0-20211102192858-4dd72447c267/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220319134239-a9b59b0215f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY= golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= @@ -1454,8 +1457,9 @@ modernc.org/sortutil v1.1.0/go.mod h1:ZyL98OQHJgH9IEfN71VsamvJgrtRX9Dj2gX+vH86L1 modernc.org/strutil v1.1.0/go.mod h1:lstksw84oURvj9y3tn8lGvRxyRC1S2+g5uuIzNfIOBs= modernc.org/zappy v1.0.0/go.mod h1:hHe+oGahLVII/aTTyWK/b53VDHMAGCBYYeZ9sn83HC4= mvdan.cc/gofumpt v0.1.1/go.mod h1:yXG1r1WqZVKWbVRtBWKWX9+CxGYfA51nSomhM0woR48= -mvdan.cc/gofumpt v0.2.0 h1:AInyCTHfhp4bFrP2VYC5kR2wPwgWj7eGSb+7437zn7I= mvdan.cc/gofumpt v0.2.0/go.mod h1:TiGmrf914DAuT6+hDIxOqoDb4QXIzAuEUSXqEf9hGKY= +mvdan.cc/gofumpt v0.3.1 h1:avhhrOmv0IuvQVK7fvwV91oFSGAk5/6Po8GXTzICeu8= +mvdan.cc/gofumpt v0.3.1/go.mod h1:w3ymliuxvzVx8DAutBnVyDqYb1Niy/yCJt/lk821YCE= nhooyr.io/websocket v1.8.7 h1:usjR2uOr/zjjkVMy0lW+PPohFok7PCow5sDjLgX4P4g= nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= diff --git a/internal/auth/oidc/service_callback.go b/internal/auth/oidc/service_callback.go index 667d9e3b00..9a95eacaef 100644 --- a/internal/auth/oidc/service_callback.go +++ b/internal/auth/oidc/service_callback.go @@ -49,7 +49,8 @@ func Callback( iamRepoFn IamRepoFactory, atRepoFn AuthTokenRepoFactory, am *AuthMethod, - state, code string) (finalRedirect string, e error) { + state, code string, +) (finalRedirect string, e error) { const op = "oidc.Callback" if oidcRepoFn == nil { return "", errors.New(ctx, errors.InvalidParameter, op, "missing oidc repository function") diff --git a/internal/auth/oidc/testing.go b/internal/auth/oidc/testing.go index 51694e365d..a122ad0b2e 100644 --- a/internal/auth/oidc/testing.go +++ b/internal/auth/oidc/testing.go @@ -46,7 +46,8 @@ func TestAuthMethod( state AuthMethodState, clientId string, clientSecret ClientSecret, - opt ...Option) *AuthMethod { + opt ...Option, +) *AuthMethod { t.Helper() ctx := context.TODO() opts := getOpts(opt...) diff --git a/internal/credential/vault/jobs_test.go b/internal/credential/vault/jobs_test.go index 1be734b005..2647505d53 100644 --- a/internal/credential/vault/jobs_test.go +++ b/internal/credential/vault/jobs_test.go @@ -38,7 +38,8 @@ func testVaultToken(t *testing.T, v *TestVaultServer, cs *CredentialStore, status TokenStatus, - expiration time.Duration) *Token { + expiration time.Duration, +) *Token { t.Helper() assert, require := assert.New(t), require.New(t) kmsCache := kms.TestKms(t, conn, wrapper) @@ -93,7 +94,8 @@ func testVaultCred(t *testing.T, sess *session.Session, token *Token, status CredentialStatus, - expiration time.Duration) (*vault.Secret, *Credential) { + expiration time.Duration, +) (*vault.Secret, *Credential) { t.Helper() assert, require := assert.New(t), require.New(t) rw := db.New(conn) diff --git a/internal/db/clause.go b/internal/db/clause.go index 41a3dc8164..ad666c2af3 100644 --- a/internal/db/clause.go +++ b/internal/db/clause.go @@ -66,7 +66,6 @@ func SetColumns(names []string) []ColumnValue { // OnConflict specifies how to handle alternative actions to take when an insert // results in a unique constraint or exclusion constraint error. type OnConflict struct { - // Target specifies what conflict you want to define a policy for. This can // be any one of these: // Columns: the name of a specific column or columns diff --git a/internal/host/plugin/job_set_sync.go b/internal/host/plugin/job_set_sync.go index 4a3118bc8e..a3dbc00a45 100644 --- a/internal/host/plugin/job_set_sync.go +++ b/internal/host/plugin/job_set_sync.go @@ -314,7 +314,8 @@ func (r *SetSyncJob) upsertAndCleanHosts( hc *HostCatalog, setIds []string, phs []*plgpb.ListHostsResponseHost, - _ ...Option) ([]*Host, error) { + _ ...Option, +) ([]*Host, error) { const op = "plugin.(SetSyncJob).upsertAndCleanHosts" for _, ph := range phs { if ph.GetExternalId() == "" { diff --git a/internal/servers/controller/auth/auth.go b/internal/servers/controller/auth/auth.go index fe7bb85427..309f825894 100644 --- a/internal/servers/controller/auth/auth.go +++ b/internal/servers/controller/auth/auth.go @@ -111,7 +111,8 @@ func NewVerifierContext(ctx context.Context, authTokenRepoFn common.AuthTokenRepoFactory, serversRepoFn common.ServersRepoFactory, kms *kms.Kms, - requestInfo *authpb.RequestInfo) context.Context { + requestInfo *authpb.RequestInfo, +) context.Context { return context.WithValue(ctx, verifierKey, &verifier{ iamRepoFn: iamRepoFn, authTokenRepoFn: authTokenRepoFn, @@ -439,7 +440,8 @@ func (v verifier) performAuthCheck(ctx context.Context) ( scopeInfo *scopes.ScopeInfo, retAcl perms.ACL, grantTuples []perms.GrantTuple, - retErr error) { + retErr error, +) { const op = "auth.(verifier).performAuthCheck" // Ensure we return an error by default if we forget to set this somewhere retErr = errors.New(ctx, errors.Unknown, op, "default auth error", errors.WithoutEvent()) diff --git a/internal/servers/controller/auth/authorized_actions.go b/internal/servers/controller/auth/authorized_actions.go index 4e67ede4b5..8241e42f0d 100644 --- a/internal/servers/controller/auth/authorized_actions.go +++ b/internal/servers/controller/auth/authorized_actions.go @@ -19,7 +19,8 @@ import ( func CalculateAuthorizedCollectionActions(ctx context.Context, authResults VerifyResults, mapToRange map[resource.Type]action.ActionSet, - scopeId, pin string) (map[string]*structpb.ListValue, error) { + scopeId, pin string, +) (map[string]*structpb.ListValue, error) { res := &perms.Resource{ ScopeId: scopeId, Pin: pin, diff --git a/internal/servers/controller/common/scopeids/scope_ids.go b/internal/servers/controller/common/scopeids/scope_ids.go index 92a9af7165..7a6fec7cbb 100644 --- a/internal/servers/controller/common/scopeids/scope_ids.go +++ b/internal/servers/controller/common/scopeids/scope_ids.go @@ -39,7 +39,8 @@ func GetListingScopeIds( recursive bool, // Whether to only return scopes with exact permissions, or whether parent // scopes with appropriate permissions are sufficient - directOnly bool) ([]string, map[string]*scopes.ScopeInfo, error) { + directOnly bool, +) ([]string, map[string]*scopes.ScopeInfo, error) { const op = "GetListingScopeIds" // Validation diff --git a/internal/servers/controller/interceptor.go b/internal/servers/controller/interceptor.go index e62a5c1b83..5fd96e14c5 100644 --- a/internal/servers/controller/interceptor.go +++ b/internal/servers/controller/interceptor.go @@ -75,7 +75,8 @@ func requestCtxInterceptor( return func(interceptorCtx context.Context, req interface{}, _ *grpc.UnaryServerInfo, - handler grpc.UnaryHandler) (interface{}, error) { + handler grpc.UnaryHandler, + ) (interface{}, error) { md, ok := metadata.FromIncomingContext(interceptorCtx) if !ok { return nil, errors.New(interceptorCtx, errors.Internal, op, "No metadata") @@ -279,7 +280,8 @@ func workerRequestInfoInterceptor(ctx context.Context, eventer *event.Eventer) ( return func(interceptorCtx context.Context, req interface{}, srvInfo *grpc.UnaryServerInfo, - handler grpc.UnaryHandler) (interface{}, error) { + handler grpc.UnaryHandler, + ) (interface{}, error) { var err error id, err := event.NewId(event.IdPrefix) if err != nil { diff --git a/internal/session/service_authorize_connection.go b/internal/session/service_authorize_connection.go index c5130e3ef5..3d491535bb 100644 --- a/internal/session/service_authorize_connection.go +++ b/internal/session/service_authorize_connection.go @@ -13,7 +13,8 @@ import ( // * The session has not reached its connection limit or has a connection limit of -1. // If any of these criteria is not met, it returns an error with Code InvalidSessionState. func AuthorizeConnection(ctx context.Context, sessionRepoFn *Repository, connectionRepoFn *ConnectionRepository, - sessionId, workerId string, opt ...Option) (*Connection, []*ConnectionState, *AuthzSummary, error) { + sessionId, workerId string, opt ...Option, +) (*Connection, []*ConnectionState, *AuthzSummary, error) { const op = "session.AuthorizeConnection" connection, connectionStates, err := connectionRepoFn.AuthorizeConnection(ctx, sessionId, workerId) diff --git a/internal/session/service_close_connections.go b/internal/session/service_close_connections.go index 34971722ab..3efedf9985 100644 --- a/internal/session/service_close_connections.go +++ b/internal/session/service_close_connections.go @@ -10,7 +10,8 @@ import ( // * closes requested connections // * uses the sessionId of the connection to see if the session meets conditions for termination func CloseConnections(ctx context.Context, sessionRepoFn *Repository, connectionRepoFn *ConnectionRepository, - closeWiths []CloseWith) ([]closeConnectionResp, error) { + closeWiths []CloseWith, +) ([]closeConnectionResp, error) { const op = "session.AuthorizeConnection" closeInfos, err := connectionRepoFn.closeConnections(ctx, closeWiths)