diff --git a/.golangci.yml b/.golangci.yml index 1123e70..cbe3312 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -36,7 +36,6 @@ linters: - durationcheck - errorlint - exhaustive - - exhaustivestruct - exportloopref - forbidigo - forcetypeassert diff --git a/internal/metric/recorder.go b/internal/metric/recorder.go index 0afe6a3..10526d8 100644 --- a/internal/metric/recorder.go +++ b/internal/metric/recorder.go @@ -42,7 +42,6 @@ type Recorder struct { } // NewRecorder registers all metrics and returns a new metric recorder. -// nolint: exhaustivestruct func NewRecorder() (*Recorder, error) { registry := prometheus.NewRegistry() @@ -83,7 +82,6 @@ func (r *Recorder) HTTPHandler() http.Handler { // NewRequestDuration configures and returns a new request_duration_seconds histogram. func NewRequestDuration() *prometheus.HistogramVec { return prometheus.NewHistogramVec( - // nolint:exhaustivestruct prometheus.HistogramOpts{ Name: requestDurMetricName, Help: requestDurMetricHelp, diff --git a/internal/metric/server.go b/internal/metric/server.go index 26f26f1..a35fc76 100644 --- a/internal/metric/server.go +++ b/internal/metric/server.go @@ -25,7 +25,6 @@ type Server struct { // NewServer configures a new Server. func NewServer(log *zerolog.Logger, metricCfg config.MetricsConfig, pRec PromRecorder) (*Server, error) { return &Server{ - // nolint: exhaustivestruct httpServer: &http.Server{ Addr: metricCfg.Address, ReadTimeout: time.Duration(metricCfg.ReadTimeoutSeconds) * time.Second, diff --git a/internal/servergrpc/chartapiserver.go b/internal/servergrpc/chartapiserver.go index 4388c9e..eb4867f 100644 --- a/internal/servergrpc/chartapiserver.go +++ b/internal/servergrpc/chartapiserver.go @@ -47,8 +47,6 @@ func NewServer(log *zerolog.Logger, bCon backend.ConnSupervisor, gRPCCfg config. interceptor.Observer(log, pRec), ), ) - - // nolint: exhaustivestruct chartAPIServer := &Server{ log: log, grpcServer: grpcServer, diff --git a/internal/servergrpc/chartapiserver_test.go b/internal/servergrpc/chartapiserver_test.go index 40edf03..f417b77 100644 --- a/internal/servergrpc/chartapiserver_test.go +++ b/internal/servergrpc/chartapiserver_test.go @@ -57,8 +57,6 @@ func newTestingChartAPIEnv(ctx context.Context, t *testing.T, opts testingChartA }() log := zerolog.New(os.Stderr) - - // nolint: exhaustivestruct cfg := config.Config{ GRPC: config.GRPCConfig{ Address: tcputils.LocalhostWithRandomPort, diff --git a/internal/servergrpchealthcheck/healthcheckserver.go b/internal/servergrpchealthcheck/healthcheckserver.go index a1b1434..4ad6043 100644 --- a/internal/servergrpchealthcheck/healthcheckserver.go +++ b/internal/servergrpchealthcheck/healthcheckserver.go @@ -32,8 +32,6 @@ func NewServer(log *zerolog.Logger, bCon backend.ConnSupervisor, hcCfg config.GR } grpcServer := grpc.NewServer() - - // nolint: exhaustivestruct hcServer := &Server{ log: log, grpcServer: grpcServer, diff --git a/internal/servergrpchealthcheck/healthcheckserver_test.go b/internal/servergrpchealthcheck/healthcheckserver_test.go index 6a652b6..7651614 100644 --- a/internal/servergrpchealthcheck/healthcheckserver_test.go +++ b/internal/servergrpchealthcheck/healthcheckserver_test.go @@ -63,7 +63,6 @@ func TestCheck_OK(t *testing.T) { hcClient := grpc_health_v1.NewHealthClient(testingHCEnv.hcServerConn) - // nolint: exhaustivestruct hcReply, hcErr := hcClient.Check(ctx, &grpc_health_v1.HealthCheckRequest{}) assert.NoError(t, hcErr) @@ -80,7 +79,6 @@ func TestCheck_Err(t *testing.T) { hcClient := grpc_health_v1.NewHealthClient(testingHCEnv.hcServerConn) - // nolint: exhaustivestruct hcReply, hcErr := hcClient.Check(ctx, &grpc_health_v1.HealthCheckRequest{}) assert.NoError(t, hcErr) diff --git a/internal/serverhttp/chartapiserver.go b/internal/serverhttp/chartapiserver.go index 638fdcb..3977c48 100644 --- a/internal/serverhttp/chartapiserver.go +++ b/internal/serverhttp/chartapiserver.go @@ -33,7 +33,6 @@ type Server struct { // NewServer configures a new Server. func NewServer(log *zerolog.Logger, bCon backend.ConnSupervisor, httpCfg config.HTTPConfig, pRec metric.PromRecorder) (*Server, error) { return &Server{ - // nolint: exhaustivestruct httpServer: &http.Server{ Addr: httpCfg.Address, ReadTimeout: time.Duration(httpCfg.ReadTimeoutSeconds) * time.Second, diff --git a/internal/serverhttp/v0/middleware/create_chart.go b/internal/serverhttp/v0/middleware/create_chart.go index a408cc7..2d37c5b 100644 --- a/internal/serverhttp/v0/middleware/create_chart.go +++ b/internal/serverhttp/v0/middleware/create_chart.go @@ -17,7 +17,6 @@ import ( func RequireCreateChartParams(log *zerolog.Logger) func(next http.Handler) http.Handler { return func(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - // nolint: exhaustivestruct createOptsJSON := view.CreateChartRequest{} err := json.NewDecoder(r.Body).Decode(&createOptsJSON) diff --git a/internal/serverhttp/v0/resource/chart/routes_create_chart_test.go b/internal/serverhttp/v0/resource/chart/routes_create_chart_test.go index e438403..7da756c 100644 --- a/internal/serverhttp/v0/resource/chart/routes_create_chart_test.go +++ b/internal/serverhttp/v0/resource/chart/routes_create_chart_test.go @@ -160,7 +160,6 @@ func TestCreateChart_VerticalAndLineOK(t *testing.T) { Chart *view.ChartReply `json:"chart"` } - // nolint: exhaustivestruct respBody := respChart{} if err = json.Unmarshal(body, &respBody); err != nil { @@ -231,7 +230,6 @@ func TestCreateChart_VerticalAndLineOKGZIP(t *testing.T) { Chart *view.ChartReply `json:"chart"` } - // nolint: exhaustivestruct respBody := respChart{} respReader, err := gzip.NewReader(resp.Body) diff --git a/internal/testutils/chartrequests.go b/internal/testutils/chartrequests.go index 3cd3ff2..ba037ff 100644 --- a/internal/testutils/chartrequests.go +++ b/internal/testutils/chartrequests.go @@ -11,7 +11,6 @@ type CreateChartRequest struct { } func NewCreateChartRequest() *CreateChartRequest { - // nolint: exhaustivestruct return &CreateChartRequest{&render.CreateChartRequest{}} } @@ -71,7 +70,6 @@ func (req *CreateChartRequest) SetBadMargins() *CreateChartRequest { func (req *CreateChartRequest) SetBandBottomAxis() *CreateChartRequest { axes := req.Axes if axes == nil { - // nolint: exhaustivestruct axes = &render.ChartAxes{} } @@ -84,7 +82,6 @@ func (req *CreateChartRequest) SetBandBottomAxis() *CreateChartRequest { func (req *CreateChartRequest) SetBottomAxisLabel() *CreateChartRequest { axes := req.Axes if axes == nil { - // nolint: exhaustivestruct axes = &render.ChartAxes{} } @@ -97,7 +94,6 @@ func (req *CreateChartRequest) SetBottomAxisLabel() *CreateChartRequest { func (req *CreateChartRequest) SetLinearLeftAxis() *CreateChartRequest { axes := req.Axes if axes == nil { - // nolint: exhaustivestruct axes = &render.ChartAxes{} } @@ -110,7 +106,6 @@ func (req *CreateChartRequest) SetLinearLeftAxis() *CreateChartRequest { func (req *CreateChartRequest) SetLeftAxisLabel() *CreateChartRequest { axes := req.Axes if axes == nil { - // nolint: exhaustivestruct axes = &render.ChartAxes{} } diff --git a/internal/testutils/chartviews.go b/internal/testutils/chartviews.go index 5cd0798..def5ddb 100644 --- a/internal/testutils/chartviews.go +++ b/internal/testutils/chartviews.go @@ -190,7 +190,6 @@ func (v *ChartView) SetDefaultColors() *ChartView { func (v *ChartView) SetFillAndStrokeColor() *ChartView { colors := v.Colors if colors == nil { - // nolint: exhaustivestruct colors = &render.ChartViewColors{} } @@ -212,7 +211,6 @@ func (v *ChartView) SetFillAndStrokeColor() *ChartView { func (v *ChartView) SetBadFillRGBColor() *ChartView { colors := v.Colors if colors == nil { - // nolint: exhaustivestruct colors = &render.ChartViewColors{} } diff --git a/internal/testutils/jsonchartrequests.go b/internal/testutils/jsonchartrequests.go index 8c08cbf..42f2761 100644 --- a/internal/testutils/jsonchartrequests.go +++ b/internal/testutils/jsonchartrequests.go @@ -7,7 +7,6 @@ type JSONCreateChartRequest struct { } func NewJSONCreateChartRequest() *JSONCreateChartRequest { - // nolint: exhaustivestruct return &JSONCreateChartRequest{&view.CreateChartRequest{}} } @@ -46,7 +45,6 @@ func (req *JSONCreateChartRequest) SetMargins() *JSONCreateChartRequest { func (req *JSONCreateChartRequest) SetBandBottomAxis() *JSONCreateChartRequest { axes := req.Chart.Axes if axes == nil { - // nolint: exhaustivestruct axes = &view.ChartAxes{} } @@ -59,7 +57,6 @@ func (req *JSONCreateChartRequest) SetBandBottomAxis() *JSONCreateChartRequest { func (req *JSONCreateChartRequest) SetBottomAxisLabel() *JSONCreateChartRequest { axes := req.Chart.Axes if axes == nil { - // nolint: exhaustivestruct axes = &view.ChartAxes{} } @@ -72,7 +69,6 @@ func (req *JSONCreateChartRequest) SetBottomAxisLabel() *JSONCreateChartRequest func (req *JSONCreateChartRequest) SetLinearLeftAxis() *JSONCreateChartRequest { axes := req.Chart.Axes if axes == nil { - // nolint: exhaustivestruct axes = &view.ChartAxes{} } @@ -85,7 +81,6 @@ func (req *JSONCreateChartRequest) SetLinearLeftAxis() *JSONCreateChartRequest { func (req *JSONCreateChartRequest) SetLeftAxisLabel() *JSONCreateChartRequest { axes := req.Chart.Axes if axes == nil { - // nolint: exhaustivestruct axes = &view.ChartAxes{} } diff --git a/internal/testutils/rendererserver.go b/internal/testutils/rendererserver.go index 59560b6..d7a01bb 100644 --- a/internal/testutils/rendererserver.go +++ b/internal/testutils/rendererserver.go @@ -51,8 +51,6 @@ func NewTestingChartRendererServer(opts Opts) (*TestingChartRendererServer, erro } grpcServer := grpc.NewServer() - - // nolint: exhaustivestruct chartRendererServer := &TestingChartRendererServer{ failMsg: opts.FailMsg, grpcServer: grpcServer,