ci: add fieldalignment

.golangci.yaml

@@ -1,3 +1,12 @@
 linters:
   disable:
   - errcheck
+linters-settings:
+  govet:
+    enable:
+    - fieldalignment
+issues:
+  exclude-rules:
+  - path: _test\.go
+    linters:
+    - govet

cert.go

@@ -12,6 +12,8 @@ import (
 )
 
 // SelfSign options
+//
+//nolint:govet
 type SelfSign struct {
 	CommonName string
 	Hosts      []string

pkg/authn/authn.go

@@ -5,6 +5,8 @@ import (
 )
 
 // Authenticator middleware
+//
+//nolint:govet
 type Authenticator struct {
 	Type         string
 	Authenticate func(*http.Request) error

pkg/authn/basic.go

@@ -27,6 +27,8 @@ func Basic(username, password string) *BasicAuthenticator {
 }
 
 // BasicAuthenticator middleware
+//
+//nolint:govet
 type BasicAuthenticator struct {
 	Realm        string
 	Authenticate func(r *http.Request, username, password string) error

pkg/authn/forward.go

@@ -126,10 +126,10 @@ func (m ForwardAuthenticator) ServeHandler(h http.Handler) http.Handler {
 }
 
 type ForwardServerError struct {
+	Response         *http.Response
+	OriginError      error
 	StatusCode       int
 	IsTransportError bool
-	OriginError      error
-	Response         *http.Response
 }
 
 func (err *ForwardServerError) Error() string {

pkg/block/block.go

@@ -15,9 +15,8 @@ func New(match func(r *http.Request) bool) *Block {
 
 // Block is middleware block
 type Block struct {
-	ms parapet.Middlewares
-
 	Match func(r *http.Request) bool
+	ms    parapet.Middlewares
 }
 
 // Use uses middleware

pkg/body/limit.go

@@ -12,6 +12,8 @@ func LimitRequest(size int64) *RequestLimiter {
 }
 
 // RequestLimiter limits request body size
+//
+//nolint:govet
 type RequestLimiter struct {
 	Size           int64
 	LimitedHandler http.Handler

pkg/compress/compress.go

@@ -13,6 +13,8 @@ import (
 )
 
 // Compress is the compress middleware
+//
+//nolint:govet
 type Compress struct {
 	New       func() Compressor
 	Encoding  string // http Accept-Encoding, Content-Encoding value
@@ -93,12 +95,13 @@ type Compressor interface {
 
 type compressWriter struct {
 	http.ResponseWriter
+
 	pool        *sync.Pool
+	types       map[string]struct{}
 	encoder     Compressor
 	encoding    string
-	types       map[string]struct{}
-	wroteHeader bool
 	minLength   int
+	wroteHeader bool
 }
 
 func (w *compressWriter) init() {

pkg/cors/cors.go

@@ -31,13 +31,13 @@ func AllowOrigins(origins ...string) AllowOriginFunc {
 
 // CORS middleware
 type CORS struct {
-	AllowAllOrigins  bool
 	AllowOrigins     AllowOriginFunc
 	AllowMethods     []string
 	AllowHeaders     []string
-	AllowCredentials bool
 	ExposeHeaders    []string
 	MaxAge           time.Duration
+	AllowAllOrigins  bool
+	AllowCredentials bool
 }
 
 // ServeHandler implements middleware interface

pkg/fileserver/fileserver.go

@@ -57,10 +57,11 @@ func (fs *fileSystem) Open(name string) (http.File, error) {
 
 type responseWriter struct {
 	http.ResponseWriter
-	wroteHeader bool
+
 	header      http.Header
-	noop        bool
 	notFound    func()
+	wroteHeader bool
+	noop        bool
 }
 
 func (w *responseWriter) Header() http.Header {

pkg/gcs/gcs.go

@@ -24,6 +24,8 @@ func New(client *storage.Client, bucket string, basePath string) *GCS {
 }
 
 // GCS proxies request to google cloud storage
+//
+//nolint:govet
 type GCS struct {
 	Client       *storage.Client
 	Bucket       string

pkg/h2push/preload.go

@@ -37,8 +37,8 @@ func (m PreloadPusher) ServeHandler(h http.Handler) http.Handler {
 type preloadPusherRW struct {
 	http.ResponseWriter
 
-	wroteHeader bool
 	header      http.Header
+	wroteHeader bool
 }
 
 func (w *preloadPusherRW) Header() http.Header {

pkg/headers/intercept.go

@@ -68,10 +68,11 @@ func (m ResponseInterceptor) ServeHandler(h http.Handler) http.Handler {
 
 type interceptRW struct {
 	http.ResponseWriter
+
+	f           ResponseInterceptFunc
+	status      int
 	wroteHeader bool
 	intercepted bool
-	status      int
-	f           ResponseInterceptFunc
 }
 
 func (w *interceptRW) intercept() {

pkg/logger/logger.go

@@ -94,10 +94,11 @@ func (m Logger) ServeHandler(h http.Handler) http.Handler {
 
 type responseWriter struct {
 	http.ResponseWriter
-	wroteHeader   bool
+
 	wroteHeaderAt time.Time
-	statusCode    int
 	length        int64
+	statusCode    int
+	wroteHeader   bool
 }
 
 func (w *responseWriter) WriteHeader(statusCode int) {

pkg/logger/record.go

@@ -9,9 +9,9 @@ import (
 type ctxKeyRecord struct{}
 
 type record struct {
+	data    map[string]interface{}
 	mu      sync.RWMutex
 	disable bool
-	data    map[string]interface{}
 }
 
 func newRecord() *record {

pkg/prom/connections.go

@@ -10,6 +10,7 @@ import (
 	"github.com/moonrhythm/parapet"
 )
 
+//nolint:govet
 type connections struct {
 	once    sync.Once
 	vec     *prometheus.GaugeVec

pkg/prom/networks.go

@@ -9,6 +9,7 @@ import (
 	"github.com/moonrhythm/parapet"
 )
 
+//nolint:govet
 type networks struct {
 	once      sync.Once
 	requests  prometheus.Counter

pkg/prom/requests.go

@@ -12,6 +12,7 @@ import (
 	"github.com/moonrhythm/parapet"
 )
 
+//nolint:govet
 type requests struct {
 	once sync.Once
 	vec  *prometheus.CounterVec

pkg/ratelimit/concurrent.go

@@ -15,6 +15,8 @@ func Concurrent(capacity int) *RateLimiter {
 // ConcurrentStrategy implements Strategy
 // that allow only max concurrent requests at a time
 // other requests will drop
+//
+//nolint:govet
 type ConcurrentStrategy struct {
 	mu      sync.Mutex
 	storage map[string]int

pkg/ratelimit/concurrentqueue.go

@@ -16,6 +16,8 @@ func ConcurrentQueue(capacity, size int) *RateLimiter {
 // ConcurrentQueueStrategy implements Strategy
 // that allow only max concurrent requests at a time
 // other requests will queue, until queue full then the request wil drop
+//
+//nolint:govet
 type ConcurrentQueueStrategy struct {
 	mu      sync.Mutex
 	storage map[string]*concurrentQueueItem

pkg/ratelimit/fixedwindow.go

@@ -29,6 +29,8 @@ func FixedWindowPerHour(rate int) *RateLimiter {
 }
 
 // FixedWindowStrategy implements Strategy using fixed window algorithm
+//
+//nolint:govet
 type FixedWindowStrategy struct {
 	mu         sync.RWMutex
 	lastWindow int64

pkg/ratelimit/leakybucket.go

@@ -14,6 +14,8 @@ func LeakyBucket(perRequest time.Duration, size int) *RateLimiter {
 }
 
 // LeakyBucketStrategy implements Strategy using leaky bucket algorithm
+//
+//nolint:govet
 type LeakyBucketStrategy struct {
 	mu      sync.RWMutex
 	storage map[string]*leakyItem

pkg/requestid/requestid.go

@@ -9,9 +9,11 @@ import (
 )
 
 // RequestID middleware
+//
+//nolint:govet
 type RequestID struct {
 	// TrustProxy trusts request id from request header
-	// sets to false to always generate new request id
+	// sets TrustProxy to false for always generate new request id
 	TrustProxy bool
 
 	// Header is the http header key

pkg/stackdriver/trace.go

@@ -19,6 +19,8 @@ func NewTrace() *Trace {
 }
 
 // Trace middleware
+//
+//nolint:govet
 type Trace struct {
 	ProjectID               string
 	Propagation             propagation.HTTPFormat

pkg/timeout/timeout.go

@@ -16,8 +16,8 @@ func New(timeout time.Duration) *Timout {
 
 // Timout sets a write header timeout
 type Timout struct {
-	Timeout        time.Duration
 	TimeoutHandler http.Handler
+	Timeout        time.Duration
 }
 
 // ServeHandler implements middleware interface
@@ -69,10 +69,10 @@ func (m Timout) ServeHandler(h http.Handler) http.Handler {
 type timeoutRW struct {
 	http.ResponseWriter
 
-	mu          sync.Mutex
+	header      http.Header
 	done        chan struct{}
+	mu          sync.Mutex
 	wroteHeader bool
-	header      http.Header
 	timeout     bool
 }
 

pkg/upstream/loadbalancer.go

@@ -7,8 +7,8 @@ import (
 
 // Target is the load balancer target
 type Target struct {
-	Host      string
 	Transport http.RoundTripper
+	Host      string
 }
 
 // NewRoundRobinLoadBalancer creates new round-robin load balancer
@@ -20,9 +20,8 @@ func NewRoundRobinLoadBalancer(targets []*Target) *RoundRobinLoadBalancer {
 
 // RoundRobinLoadBalancer strategy
 type RoundRobinLoadBalancer struct {
-	i uint32
-
 	Targets []*Target
+	i       uint32
 }
 
 // RoundTrip sends a request to upstream server

pkg/upstream/loadbalancer_test.go

@@ -77,8 +77,8 @@ func TestRoundRobinLoadBalancer(t *testing.T) {
 }
 
 type fakeTransport struct {
-	called bool
 	host   string
+	called bool
 }
 
 func (tr *fakeTransport) RoundTrip(r *http.Request) (*http.Response, error) {

pkg/upstream/transport.go

@@ -21,6 +21,8 @@ const (
 )
 
 // H2CTransport type
+//
+//nolint:govet
 type H2CTransport struct {
 	once   sync.Once
 	dialer *net.Dialer
@@ -75,6 +77,8 @@ func (t *H2CTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 }
 
 // HTTPTransport type
+//
+//nolint:govet
 type HTTPTransport struct {
 	once sync.Once
 	h    *http.Transport
@@ -126,6 +130,8 @@ func (t *HTTPTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 }
 
 // HTTPSTransport type
+//
+//nolint:govet
 type HTTPSTransport struct {
 	once sync.Once
 	h    *http.Transport
@@ -185,6 +191,8 @@ func (t *HTTPSTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 }
 
 // UnixTransport type
+//
+//nolint:govet
 type UnixTransport struct {
 	once sync.Once
 	h    *http.Transport
@@ -229,6 +237,8 @@ func (t *UnixTransport) RoundTrip(r *http.Request) (*http.Response, error) {
 }
 
 // Transport does RoundTrip dynamically from request's scheme
+//
+//nolint:govet
 type Transport struct {
 	once   sync.Once
 	dialer *net.Dialer

pkg/upstream/upstream.go

@@ -162,8 +162,8 @@ func SingleHost(host string, transport http.RoundTripper) *Upstream {
 }
 
 type singleHostTransport struct {
-	Host      string
 	Transport http.RoundTripper
+	Host      string
 }
 
 func (l *singleHostTransport) RoundTrip(r *http.Request) (*http.Response, error) {

proxy.go

@@ -43,6 +43,7 @@ const (
 	headerXRealIP         = "X-Real-Ip"
 )
 
+//nolint:govet
 type proxy struct {
 	Trust                   func(r *http.Request) bool
 	ComputeFullForwardedFor bool

server.go

@@ -18,6 +18,8 @@ import (
 )
 
 // Server is the parapet server
+//
+//nolint:govet
 type Server struct {
 	s          http.Server
 	once       sync.Once