diff --git a/auth/bearer.go b/auth/bearer.go index e5aabaf..6755d9d 100644 --- a/auth/bearer.go +++ b/auth/bearer.go @@ -88,9 +88,9 @@ const ( type Grants struct { ReadOnly bool - all bool - grants map[string]string - encoded string + all bool + grants map[string]string + encoded string } func DecodeGrants(ctx context.Context, grants string) Grants { diff --git a/auth/middleware.go b/auth/middleware.go index c3ab5ff..08954c2 100644 --- a/auth/middleware.go +++ b/auth/middleware.go @@ -85,7 +85,7 @@ func authError(w http.ResponseWriter, reason string, code int) { gqlerr := gqlerror.Errorf("Authentication error: %s", reason) b, err := json.Marshal(struct { Errors []*gqlerror.Error `json:"errors"` - } { + }{ Errors: []*gqlerror.Error{gqlerr}, }) if err != nil { diff --git a/client/graphql.go b/client/graphql.go index f4f4738..1b93e8b 100644 --- a/client/graphql.go +++ b/client/graphql.go @@ -50,7 +50,7 @@ func Execute(ctx context.Context, username string, svc string, Name: username, ClientID: config.ServiceName(ctx), // TODO: Populate this: - NodeID: "core-go", + NodeID: "core-go", } authBlob, err := json.Marshal(&auth) if err != nil { diff --git a/cmd/token/main.go b/cmd/token/main.go index de31da4..e84a73b 100644 --- a/cmd/token/main.go +++ b/cmd/token/main.go @@ -4,9 +4,9 @@ import ( "fmt" "os" + "git.sr.ht/~sircmpwn/core-go/auth" "git.sr.ht/~sircmpwn/core-go/config" "git.sr.ht/~sircmpwn/core-go/crypto" - "git.sr.ht/~sircmpwn/core-go/auth" ) func main() { diff --git a/config/config.go b/config/config.go index 24a20d2..102e146 100644 --- a/config/config.go +++ b/config/config.go @@ -38,10 +38,10 @@ func LoadConfig(defaultAddr string) ini.File { } for _, path := range []string{ - "config.ini", - "../config.ini", - "/etc/sr.ht/config.ini", - } { + "config.ini", + "../config.ini", + "/etc/sr.ht/config.ini", + } { config, err = ini.LoadFile(path) if err == nil { break diff --git a/email/send.go b/email/send.go index 204a900..df0f20a 100644 --- a/email/send.go +++ b/email/send.go @@ -7,9 +7,9 @@ import ( "net/mail" "strconv" + _ "github.com/emersion/go-message/charset" "github.com/emersion/go-sasl" "github.com/emersion/go-smtp" - _ "github.com/emersion/go-message/charset" "git.sr.ht/~sircmpwn/core-go/config" ) diff --git a/email/worker.go b/email/worker.go index 1ebe91c..437864f 100644 --- a/email/worker.go +++ b/email/worker.go @@ -13,10 +13,10 @@ import ( "time" "git.sr.ht/~sircmpwn/dowork" + _ "github.com/emersion/go-message/charset" "github.com/emersion/go-message/mail" "github.com/emersion/go-pgpmail" "golang.org/x/crypto/openpgp" - _ "github.com/emersion/go-message/charset" "git.sr.ht/~sircmpwn/core-go/config" ) diff --git a/server/email.go b/server/email.go index 1a9c8c2..6fe00ab 100644 --- a/server/email.go +++ b/server/email.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" "log" + gomail "net/mail" "runtime" "strings" - gomail "net/mail" "github.com/99designs/gqlgen/graphql" "github.com/emersion/go-message/mail" diff --git a/webhooks/config.go b/webhooks/config.go index f93f446..9faa70f 100644 --- a/webhooks/config.go +++ b/webhooks/config.go @@ -41,7 +41,7 @@ func NewAuthConfig(ctx context.Context) (AuthConfig, error) { _clientID := user.BearerToken.ClientID clientID = &_clientID } - return AuthConfig { + return AuthConfig{ AuthMethod: user.AuthMethod, TokenHash: &tokenHash, Grants: &grants, diff --git a/webhooks/legacy.go b/webhooks/legacy.go index b74e04b..8c1a5f3 100644 --- a/webhooks/legacy.go +++ b/webhooks/legacy.go @@ -13,8 +13,8 @@ import ( "time" "git.sr.ht/~sircmpwn/dowork" - "github.com/google/uuid" sq "github.com/Masterminds/squirrel" + "github.com/google/uuid" "git.sr.ht/~sircmpwn/core-go/crypto" "git.sr.ht/~sircmpwn/core-go/database" diff --git a/webhooks/legacy_test.go b/webhooks/legacy_test.go index 2e2f078..54c2976 100644 --- a/webhooks/legacy_test.go +++ b/webhooks/legacy_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/DATA-DOG/go-sqlmock" + sq "github.com/Masterminds/squirrel" "github.com/stretchr/testify/assert" "github.com/vaughan0/go-ini" - sq "github.com/Masterminds/squirrel" "git.sr.ht/~sircmpwn/core-go/crypto" "git.sr.ht/~sircmpwn/core-go/database" @@ -39,7 +39,7 @@ type argContains struct { matches []string } -func ArgMatchesAll(matches... string) *argContains { +func ArgMatchesAll(matches ...string) *argContains { return &argContains{matches} } @@ -100,7 +100,7 @@ func TestDelivery(t *testing.T) { WillReturnRows(sqlmock.NewRows([]string{ "sub.id", "sub.created", "sub.url", "sub.events", }).AddRow(1337, time.Now().UTC(), - srv.URL + "/webhook", "profile:update")). + srv.URL+"/webhook", "profile:update")). WithArgs(42, sqlmock.AnyArg()) // Any => events LIKE %profile:update% mock.ExpectCommit() @@ -132,7 +132,7 @@ func TestDelivery(t *testing.T) { "X-Webhook-Delivery", ), // Final request headers 4096). - WillReturnResult(sqlmock.NewResult(1, 1)) + WillReturnResult(sqlmock.NewResult(1, 1)) mock.ExpectCommit() ctx = database.Context(context.Background(), db) diff --git a/webhooks/queue.go b/webhooks/queue.go index b9c9e97..2a40428 100644 --- a/webhooks/queue.go +++ b/webhooks/queue.go @@ -14,8 +14,8 @@ import ( "git.sr.ht/~sircmpwn/dowork" "github.com/99designs/gqlgen/graphql" - "github.com/google/uuid" sq "github.com/Masterminds/squirrel" + "github.com/google/uuid" "git.sr.ht/~sircmpwn/core-go/auth" "git.sr.ht/~sircmpwn/core-go/crypto" @@ -28,9 +28,9 @@ type WebhookQueue struct { } type WebhookSubscription struct { - ID int - URL string - Query string + ID int + URL string + Query string // See AuthConfig in webhooks/config.go for an explanation of these fields AuthMethod string TokenHash *string @@ -120,7 +120,7 @@ func (queue *WebhookQueue) fetchSubscriptions(ctx context.Context, var subs []*WebhookSubscription if err := database.WithTx(ctx, &sql.TxOptions{ Isolation: 0, - ReadOnly: true, + ReadOnly: true, }, func(tx *sql.Tx) error { var ( err error