Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Updated revive linter and fixed issues #1456

Merged
merged 1 commit into from
Feb 9, 2024
Merged

chore: Updated revive linter and fixed issues #1456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ build-windows-x86:
install-tools:
go install github.com/client9/misspell/cmd/[email protected]
go install github.com/google/[email protected]
go install github.com/mgechev/[email protected].4
go install github.com/mgechev/[email protected].7
go install github.com/open-telemetry/opentelemetry-collector-contrib/cmd/[email protected]
go install github.com/securego/gosec/v2/cmd/[email protected]
# update cosign in release.yml when updating this version
Expand Down
6 changes: 3 additions & 3 deletions exporter/azureblobexporter/exporter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func Test_exporter_metricsDataPusher(t *testing.T) {
}{
{
desc: "marshal error",
mockGen: func(t *testing.T, input pmetric.Metrics, expectBuff []byte) (blobClient, marshaler) {
mockGen: func(t *testing.T, input pmetric.Metrics, _ []byte) (blobClient, marshaler) {
mockBlobClient := mocks.NewMockBlobClient(t)
mockMarshaler := mocks.NewMockMarshaler(t)

Expand Down Expand Up @@ -129,7 +129,7 @@ func Test_exporter_logsDataPusher(t *testing.T) {
}{
{
desc: "marshal error",
mockGen: func(t *testing.T, input plog.Logs, expectBuff []byte) (blobClient, marshaler) {
mockGen: func(t *testing.T, input plog.Logs, _ []byte) (blobClient, marshaler) {
mockBlobClient := mocks.NewMockBlobClient(t)
mockMarshaler := mocks.NewMockMarshaler(t)

Expand Down Expand Up @@ -208,7 +208,7 @@ func Test_exporter_traceDataPusher(t *testing.T) {
}{
{
desc: "marshal error",
mockGen: func(t *testing.T, input ptrace.Traces, expectBuff []byte) (blobClient, marshaler) {
mockGen: func(t *testing.T, input ptrace.Traces, _ []byte) (blobClient, marshaler) {
mockBlobClient := mocks.NewMockBlobClient(t)
mockMarshaler := mocks.NewMockMarshaler(t)

Expand Down
2 changes: 1 addition & 1 deletion internal/logging/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func (l *LoggerConfig) Options() ([]zap.Option, error) {
return nil, err
}

opt := zap.WrapCore(func(c zapcore.Core) zapcore.Core {
opt := zap.WrapCore(func(_ zapcore.Core) zapcore.Core {
return core
})

Expand Down
6 changes: 3 additions & 3 deletions internal/processor/snapshotprocessor/processor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func Test_processTraces(t *testing.T) {
{
desc: "disabled",
enabled: false,
setupMocks: func(m *mocks.MockSnapshotter) {},
setupMocks: func(_ *mocks.MockSnapshotter) {},
},
{
desc: "enabled",
Expand Down Expand Up @@ -99,7 +99,7 @@ func Test_processLogs(t *testing.T) {
{
desc: "disabled",
enabled: false,
setupMocks: func(m *mocks.MockSnapshotter) {},
setupMocks: func(_ *mocks.MockSnapshotter) {},
},
{
desc: "enabled",
Expand Down Expand Up @@ -138,7 +138,7 @@ func Test_processMetrics(t *testing.T) {
{
desc: "disabled",
enabled: false,
setupMocks: func(m *mocks.MockSnapshotter) {},
setupMocks: func(_ *mocks.MockSnapshotter) {},
},
{
desc: "enabled",
Expand Down
2 changes: 1 addition & 1 deletion internal/report/agent_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func TestAgentClientDo(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.desc, func(t *testing.T) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
s := httptest.NewServer(http.HandlerFunc(func(_ http.ResponseWriter, r *http.Request) {
headerID := r.Header.Get("Agent-ID")
require.Equal(t, tc.agentID, headerID)

Expand Down
2 changes: 1 addition & 1 deletion internal/service/standalone_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func TestStandaloneCollectorService(t *testing.T) {

col.On("Run", ctx).Return(nil)
col.On("Status").Return((<-chan *collector.Status)(make(chan *collector.Status))).Maybe()
col.On("Stop", mock.Anything).Run(func(args mock.Arguments) { time.Sleep(100 * time.Second) }).Maybe()
col.On("Stop", mock.Anything).Run(func(_ mock.Arguments) { time.Sleep(100 * time.Second) }).Maybe()

srv := NewStandaloneCollectorService(col)

Expand Down
2 changes: 1 addition & 1 deletion opamp/observiq/agent_config_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ func TestApplyConfigChanges(t *testing.T) {
assert.NoError(t, err)

manager := NewAgentConfigManager(zap.NewNop())
mangedConfig, err := opamp.NewManagedConfig(configPath, func(data []byte) (changed bool, err error) {
mangedConfig, err := opamp.NewManagedConfig(configPath, func(_ []byte) (changed bool, err error) {
return false, expectedError
}, true)
assert.NoError(t, err)
Expand Down
2 changes: 1 addition & 1 deletion opamp/observiq/observiq_client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,7 +1277,7 @@ func TestClient_onPackagesAvailableHandler(t *testing.T) {
mockProvider.On("LastReportedStatuses").Return(savedPackageStatuses, nil)
mockProvider.On("SetLastReportedStatuses", mock.Anything).Return(nil)
mockFileManager := mocks.NewMockDownloadableFileManager(t)
mockFileManager.On("FetchAndExtractArchive", mock.Anything).Return(nil).Run(func(args mock.Arguments) {
mockFileManager.On("FetchAndExtractArchive", mock.Anything).Return(nil).Run(func(_ mock.Arguments) {
wg.Done()
})
mockFileManager.On("CleanupArtifacts").Return().Times(1)
Expand Down
6 changes: 3 additions & 3 deletions opamp/observiq/observiq_downloadable_file_manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ func TestDownloadFile(t *testing.T) {
t.Run("Server returns 404", func(t *testing.T) {
tmpDir := t.TempDir()

s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusNotFound)
}))
defer s.Close()
Expand Down Expand Up @@ -242,7 +242,7 @@ func TestDownloadAndVerifyExtraction(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
tmpDir := t.TempDir()

s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
archiveBytes, err := os.ReadFile(tc.archivePath)
if err != nil {
t.Errorf("Failed to open archive for sending over http: %s", err)
Expand Down Expand Up @@ -292,7 +292,7 @@ func TestDownloadAndVerifyExtraction(t *testing.T) {
func TestDownloadAndVerifyHTTPFailure(t *testing.T) {
tmpDir := t.TempDir()

s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
s := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, _ *http.Request) {
w.WriteHeader(http.StatusForbidden)
}))
defer s.Close()
Expand Down
6 changes: 3 additions & 3 deletions receiver/pluginreceiver/emitter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func defaultEmitterConfig() component.Config {
// createLogEmitterFactory creates a log emitter factory.
// The resulting factory will create an exporter that can emit logs from an internal pipeline to an external consumer.
func createLogEmitterFactory(consumer consumer.Logs) exporter.Factory {
createExporter := func(_ context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Logs, error) {
createExporter := func(_ context.Context, _ exporter.CreateSettings, _ component.Config) (exporter.Logs, error) {
return &Emitter{Logs: consumer}, nil
}

Expand All @@ -73,7 +73,7 @@ func createLogEmitterFactory(consumer consumer.Logs) exporter.Factory {
// createLogEmitterFactory creates a metric emitter factory.
// The resulting factory will create an exporter that can emit metrics from an internal pipeline to an external consumer.
func createMetricEmitterFactory(consumer consumer.Metrics) exporter.Factory {
createExporter := func(_ context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Metrics, error) {
createExporter := func(_ context.Context, _ exporter.CreateSettings, _ component.Config) (exporter.Metrics, error) {
return &Emitter{Metrics: consumer}, nil
}

Expand All @@ -87,7 +87,7 @@ func createMetricEmitterFactory(consumer consumer.Metrics) exporter.Factory {
// createLogEmitterFactory creates a trace emitter factory.
// The resulting factory will create an exporter that can emit traces from an internal pipeline to an external consumer.
func createTraceEmitterFactory(consumer consumer.Traces) exporter.Factory {
createExporter := func(_ context.Context, set exporter.CreateSettings, cfg component.Config) (exporter.Traces, error) {
createExporter := func(_ context.Context, _ exporter.CreateSettings, _ component.Config) (exporter.Traces, error) {
return &Emitter{Traces: consumer}, nil
}

Expand Down
18 changes: 9 additions & 9 deletions receiver/pluginreceiver/receiver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func TestReceiverCreateServiceFailure(t *testing.T) {
renderedCfg: renderedCfg,
emitterFactory: emitterFactory,
logger: zap.NewNop(),
createService: func(factories otelcol.Factories, configProvider otelcol.ConfigProvider, logger *zap.Logger) (Service, error) {
createService: func(_ otelcol.Factories, _ otelcol.ConfigProvider, _ *zap.Logger) (Service, error) {
return nil, errors.New("failure")
},
doneChan: make(chan struct{}),
Expand Down Expand Up @@ -105,7 +105,7 @@ func TestReceiverStartServiceFailure(t *testing.T) {
renderedCfg: renderedCfg,
emitterFactory: emitterFactory,
logger: zap.NewNop(),
createService: func(factories otelcol.Factories, configProvider otelcol.ConfigProvider, logger *zap.Logger) (Service, error) {
createService: func(_ otelcol.Factories, _ otelcol.ConfigProvider, _ *zap.Logger) (Service, error) {
return svc, nil
},
doneChan: make(chan struct{}),
Expand Down Expand Up @@ -141,7 +141,7 @@ func TestReceiverStartServiceContext(t *testing.T) {
renderedCfg: renderedCfg,
emitterFactory: emitterFactory,
logger: zap.NewNop(),
createService: func(factories otelcol.Factories, configProvider otelcol.ConfigProvider, logger *zap.Logger) (Service, error) {
createService: func(_ otelcol.Factories, _ otelcol.ConfigProvider, _ *zap.Logger) (Service, error) {
return svc, nil
},
doneChan: make(chan struct{}),
Expand Down Expand Up @@ -175,7 +175,7 @@ func TestReceiverStartSuccess(t *testing.T) {
renderedCfg: renderedCfg,
emitterFactory: emitterFactory,
logger: zap.NewNop(),
createService: func(factories otelcol.Factories, configProvider otelcol.ConfigProvider, logger *zap.Logger) (Service, error) {
createService: func(_ otelcol.Factories, _ otelcol.ConfigProvider, _ *zap.Logger) (Service, error) {
return svc, nil
},
doneChan: make(chan struct{}),
Expand All @@ -202,11 +202,11 @@ func TestReceiverShutdown(t *testing.T) {
blockChan := make(chan struct{})

svc := &MockService{}
svc.On("Run", mock.Anything).Run(func(args mock.Arguments) {
svc.On("Run", mock.Anything).Run(func(_ mock.Arguments) {
<-blockChan
}).Return(nil)
svc.On("GetState").Return(otelcol.StateRunning)
svc.On("Shutdown").Run(func(args mock.Arguments) {
svc.On("Shutdown").Run(func(_ mock.Arguments) {
close(blockChan)
}).Return()

Expand All @@ -215,7 +215,7 @@ func TestReceiverShutdown(t *testing.T) {
renderedCfg: renderedCfg,
emitterFactory: emitterFactory,
logger: zap.NewNop(),
createService: func(factories otelcol.Factories, configProvider otelcol.ConfigProvider, logger *zap.Logger) (Service, error) {
createService: func(_ otelcol.Factories, _ otelcol.ConfigProvider, _ *zap.Logger) (Service, error) {
return svc, nil
},
doneChan: make(chan struct{}),
Expand Down Expand Up @@ -248,7 +248,7 @@ func TestReceiverShutdownCancelledContext(t *testing.T) {
})

svc := &MockService{}
svc.On("Run", mock.Anything).Run(func(args mock.Arguments) {
svc.On("Run", mock.Anything).Run(func(_ mock.Arguments) {
<-blockChan
}).Return(nil)
svc.On("GetState").Return(otelcol.StateRunning)
Expand All @@ -259,7 +259,7 @@ func TestReceiverShutdownCancelledContext(t *testing.T) {
renderedCfg: renderedCfg,
emitterFactory: emitterFactory,
logger: zap.NewNop(),
createService: func(factories otelcol.Factories, configProvider otelcol.ConfigProvider, logger *zap.Logger) (Service, error) {
createService: func(_ otelcol.Factories, _ otelcol.ConfigProvider, _ *zap.Logger) (Service, error) {
return svc, nil
},
doneChan: make(chan struct{}),
Expand Down
4 changes: 2 additions & 2 deletions updater/internal/rollback/rollback_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ func TestRollbackerRollback(t *testing.T) {
for i := 0; i < 10; i++ {
actionNum := i
action := action_mocks.NewMockRollbackableAction(t)
action.On("Rollback").Run(func(args mock.Arguments) {
action.On("Rollback").Run(func(_ mock.Arguments) {
// Rollback should be done in reverse order; So action 0
// should be done last (10th action, seq == 9), while
// the last action (action 9) should be done first (seq == 0)
Expand All @@ -145,7 +145,7 @@ func TestRollbackerRollback(t *testing.T) {
actionNum := i
action := action_mocks.NewMockRollbackableAction(t)

call := action.On("Rollback").Run(func(args mock.Arguments) {
call := action.On("Rollback").Run(func(_ mock.Arguments) {
// Rollback should be done in reverse order; So action 0
// should be done last (10th action, seq == 9), while
// the last action (action 9) should be done first (seq == 0)
Expand Down
Loading