From 8cc59801122e309d6e532cef9399aa4cb7bec1ab Mon Sep 17 00:00:00 2001 From: Matthieu MOREL Date: Tue, 12 Nov 2024 07:52:36 +0100 Subject: [PATCH] [chore]: enable whitespace linter for extension Signed-off-by: Matthieu MOREL --- extension/basicauthextension/extension.go | 1 - extension/basicauthextension/extension_test.go | 1 - .../bearertokenauth_test.go | 1 - extension/headerssetterextension/extension.go | 2 -- .../healthcheckextension/healthcheckextension.go | 1 - .../internal/grpc/grpc_test.go | 1 - .../internal/http/server_test.go | 1 - extension/jaegerremotesampling/config_test.go | 1 - extension/observer/ecsobserver/fetcher_test.go | 1 - .../ecsobserver/internal/errctx/value_test.go | 1 - extension/observer/hostobserver/extension_test.go | 1 - .../observer/k8sobserver/ingress_endpoint.go | 1 - .../observer/k8sobserver/pod_endpoint_test.go | 1 - extension/opampextension/monitor_ppid_test.go | 2 -- extension/opampextension/opamp_agent_test.go | 1 - extension/remotetapextension/extension.go | 1 - extension/sigv4authextension/extension_test.go | 1 - extension/sigv4authextension/factory_test.go | 1 - extension/storage/dbstorage/extension_test.go | 1 - extension/storage/filestorage/client_test.go | 2 -- extension/storage/filestorage/config_test.go | 1 - extension/storage/filestorage/extension_test.go | 2 -- .../redisstorageextension/extension_test.go | 2 -- extension/sumologicextension/extension.go | 2 -- extension/sumologicextension/extension_test.go | 15 --------------- 25 files changed, 45 deletions(-) diff --git a/extension/basicauthextension/extension.go b/extension/basicauthextension/extension.go index 08114aae258b..b1a24d2ab068 100644 --- a/extension/basicauthextension/extension.go +++ b/extension/basicauthextension/extension.go @@ -44,7 +44,6 @@ func newClientAuthExtension(cfg *Config) auth.Client { } func newServerAuthExtension(cfg *Config) (auth.Server, error) { - if cfg.Htpasswd == nil || (cfg.Htpasswd.File == "" && cfg.Htpasswd.Inline == "") { return nil, errNoCredentialSource } diff --git a/extension/basicauthextension/extension_test.go b/extension/basicauthextension/extension_test.go index d68cb069f4bd..01569d3db242 100644 --- a/extension/basicauthextension/extension_test.go +++ b/extension/basicauthextension/extension_test.go @@ -273,7 +273,6 @@ func TestBasicAuth_ClientValid(t *testing.T) { } func TestBasicAuth_ClientInvalid(t *testing.T) { - t.Run("invalid username format", func(t *testing.T) { ext := newClientAuthExtension(&Config{ ClientAuth: &ClientAuthSettings{ diff --git a/extension/bearertokenauthextension/bearertokenauth_test.go b/extension/bearertokenauthextension/bearertokenauth_test.go index 2ed8dc81283b..55d3cc6c3805 100644 --- a/extension/bearertokenauthextension/bearertokenauth_test.go +++ b/extension/bearertokenauthextension/bearertokenauth_test.go @@ -62,7 +62,6 @@ func TestBearerAuthenticatorHttp(t *testing.T) { assert.NoError(t, err) authHeaderValue := resp.Header.Get("Authorization") assert.Equal(t, authHeaderValue, fmt.Sprintf("%s %s", scheme, string(cfg.BearerToken))) - } func TestBearerAuthenticator(t *testing.T) { diff --git a/extension/headerssetterextension/extension.go b/extension/headerssetterextension/extension.go index c49588987f95..72eb56278671 100644 --- a/extension/headerssetterextension/extension.go +++ b/extension/headerssetterextension/extension.go @@ -75,7 +75,6 @@ func newHeadersSetterExtension(cfg *Config, logger *zap.Logger) (auth.Client, er return &headersPerRPC{headers: headers}, nil }), ), nil - } // headersPerRPC is a gRPC credentials.PerRPCCredentials implementation sets @@ -89,7 +88,6 @@ func (h *headersPerRPC) GetRequestMetadata( ctx context.Context, _ ...string, ) (map[string]string, error) { - metadata := make(map[string]string, len(h.headers)) for _, header := range h.headers { value, err := header.source.Get(ctx) diff --git a/extension/healthcheckextension/healthcheckextension.go b/extension/healthcheckextension/healthcheckextension.go index ac597dcb006e..e0745b459b34 100644 --- a/extension/healthcheckextension/healthcheckextension.go +++ b/extension/healthcheckextension/healthcheckextension.go @@ -29,7 +29,6 @@ type healthCheckExtension struct { var _ extensioncapabilities.PipelineWatcher = (*healthCheckExtension)(nil) func (hc *healthCheckExtension) Start(ctx context.Context, host component.Host) error { - hc.logger.Info("Starting health_check extension", zap.Any("config", hc.config)) ln, err := hc.config.ToListener(ctx) if err != nil { diff --git a/extension/healthcheckv2extension/internal/grpc/grpc_test.go b/extension/healthcheckv2extension/internal/grpc/grpc_test.go index 837a58ebdf63..6294d14d8963 100644 --- a/extension/healthcheckv2extension/internal/grpc/grpc_test.go +++ b/extension/healthcheckv2extension/internal/grpc/grpc_test.go @@ -741,7 +741,6 @@ func TestCheck(t *testing.T) { } }) } - } func TestWatch(t *testing.T) { diff --git a/extension/healthcheckv2extension/internal/http/server_test.go b/extension/healthcheckv2extension/internal/http/server_test.go index de365258206e..2f390ef4ec65 100644 --- a/extension/healthcheckv2extension/internal/http/server_test.go +++ b/extension/healthcheckv2extension/internal/http/server_test.go @@ -3143,5 +3143,4 @@ func TestConfig(t *testing.T) { assert.Equal(t, tc.expectedBody, body) }) } - } diff --git a/extension/jaegerremotesampling/config_test.go b/extension/jaegerremotesampling/config_test.go index 05704929d5e0..22ccf9bf08a7 100644 --- a/extension/jaegerremotesampling/config_test.go +++ b/extension/jaegerremotesampling/config_test.go @@ -72,7 +72,6 @@ func TestLoadConfig(t *testing.T) { } func TestValidate(t *testing.T) { - testCases := []struct { desc string cfg Config diff --git a/extension/observer/ecsobserver/fetcher_test.go b/extension/observer/ecsobserver/fetcher_test.go index 155b2bbd5d1b..38576347553d 100644 --- a/extension/observer/ecsobserver/fetcher_test.go +++ b/extension/observer/ecsobserver/fetcher_test.go @@ -263,7 +263,6 @@ func TestFetcher_AttachService(t *testing.T) { deployID := i % nServices task.TaskDefinitionArn = aws.String(fmt.Sprintf("def%d:1", deployID)) task.StartedBy = aws.String(fmt.Sprintf("deploy%d", deployID)) - })) ctx := context.Background() diff --git a/extension/observer/ecsobserver/internal/errctx/value_test.go b/extension/observer/ecsobserver/internal/errctx/value_test.go index 25cdca44a544..1041122fdaa2 100644 --- a/extension/observer/ecsobserver/internal/errctx/value_test.go +++ b/extension/observer/ecsobserver/internal/errctx/value_test.go @@ -83,5 +83,4 @@ func TestValueFrom(t *testing.T) { assert.True(t, ok) assert.Equal(t, "e2", v) }) - } diff --git a/extension/observer/hostobserver/extension_test.go b/extension/observer/hostobserver/extension_test.go index 5c531b01dd49..e46aed434c2c 100644 --- a/extension/observer/hostobserver/extension_test.go +++ b/extension/observer/hostobserver/extension_test.go @@ -111,7 +111,6 @@ func TestHostObserver(t *testing.T) { assert.Equal(t, filepath.Base(exe), details.ProcessName) assert.Equal(t, tt.protocol, details.Transport) assert.Equal(t, isIPv6, details.IsIPv6) - } }) } diff --git a/extension/observer/k8sobserver/ingress_endpoint.go b/extension/observer/k8sobserver/ingress_endpoint.go index 57c6a1af3a16..622a7fe1ba4d 100644 --- a/extension/observer/k8sobserver/ingress_endpoint.go +++ b/extension/observer/k8sobserver/ingress_endpoint.go @@ -46,7 +46,6 @@ func convertIngressToEndpoints(idNamespace string, ingress *v1.Ingress) []observ }) } } - } return endpoints diff --git a/extension/observer/k8sobserver/pod_endpoint_test.go b/extension/observer/k8sobserver/pod_endpoint_test.go index 820832a3f3b9..d28953f982aa 100644 --- a/extension/observer/k8sobserver/pod_endpoint_test.go +++ b/extension/observer/k8sobserver/pod_endpoint_test.go @@ -48,5 +48,4 @@ func TestPodObjectToPortEndpoint(t *testing.T) { endpoints := convertPodToEndpoints("namespace", podWithNamedPorts) require.Equal(t, expectedEndpoints, endpoints) - } diff --git a/extension/opampextension/monitor_ppid_test.go b/extension/opampextension/monitor_ppid_test.go index bf6ee3aaf18f..f61abeb23fff 100644 --- a/extension/opampextension/monitor_ppid_test.go +++ b/extension/opampextension/monitor_ppid_test.go @@ -79,9 +79,7 @@ func TestMonitorPPID(t *testing.T) { case <-time.After(5 * time.Second): t.Fatalf("Timed out waiting for command to stop") } - }) - } func longRunningComand(ctx context.Context) *exec.Cmd { diff --git a/extension/opampextension/opamp_agent_test.go b/extension/opampextension/opamp_agent_test.go index a0f18d8f778e..0d3d964212c5 100644 --- a/extension/opampextension/opamp_agent_test.go +++ b/extension/opampextension/opamp_agent_test.go @@ -132,7 +132,6 @@ func TestCreateAgentDescription(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - cfg := createDefaultConfig().(*Config) tc.cfg(cfg) diff --git a/extension/remotetapextension/extension.go b/extension/remotetapextension/extension.go index acea71adc3ff..c63b07aebf61 100644 --- a/extension/remotetapextension/extension.go +++ b/extension/remotetapextension/extension.go @@ -25,7 +25,6 @@ type remoteObserverExtension struct { } func (s *remoteObserverExtension) Start(ctx context.Context, host component.Host) error { - htmlContent, err := fs.Sub(httpFS, "html") if err != nil { return err diff --git a/extension/sigv4authextension/extension_test.go b/extension/sigv4authextension/extension_test.go index 021faedf5201..260d6b46ba01 100644 --- a/extension/sigv4authextension/extension_test.go +++ b/extension/sigv4authextension/extension_test.go @@ -44,7 +44,6 @@ func TestRoundTripper(t *testing.T) { assert.Equal(t, cfg.Service, si.service) assert.Equal(t, awsSDKInfo, si.awsSDKInfo) assert.Equal(t, cfg.credsProvider, si.credsProvider) - } func TestPerRPCCredentials(t *testing.T) { diff --git a/extension/sigv4authextension/factory_test.go b/extension/sigv4authextension/factory_test.go index f20b32e484c9..31762460e0d7 100644 --- a/extension/sigv4authextension/factory_test.go +++ b/extension/sigv4authextension/factory_test.go @@ -36,5 +36,4 @@ func TestCreate(t *testing.T) { ext, err := createExtension(context.Background(), extensiontest.NewNopSettings(), cfg) assert.NoError(t, err) assert.NotNil(t, ext) - } diff --git a/extension/storage/dbstorage/extension_test.go b/extension/storage/dbstorage/extension_test.go index b888c88321b3..11210b6ddeb3 100644 --- a/extension/storage/dbstorage/extension_test.go +++ b/extension/storage/dbstorage/extension_test.go @@ -85,7 +85,6 @@ func testExtensionIntegrity(t *testing.T, se storage.Extension) { // Repeatedly thrash client for j := 0; j < 100; j++ { - // Make sure my values are still mine for i := 0; i < len(keys); i++ { v, err := c.Get(ctx, keys[i]) diff --git a/extension/storage/filestorage/client_test.go b/extension/storage/filestorage/client_test.go index 2d524be8560f..09c97469f7ad 100644 --- a/extension/storage/filestorage/client_test.go +++ b/extension/storage/filestorage/client_test.go @@ -122,7 +122,6 @@ func TestClientBatchOperations(t *testing.T) { for i := range testGetEntries { require.Equal(t, testGetEntries[i].Key, testEntriesDelete[i].Key) require.Nil(t, testGetEntries[i].Value) - } } @@ -175,7 +174,6 @@ func TestNewClientTransactionErrors(t *testing.T) { for _, tc := range testCases { t.Run(tc.name, func(t *testing.T) { - tempDir := t.TempDir() dbFile := filepath.Join(tempDir, "my_db") diff --git a/extension/storage/filestorage/config_test.go b/extension/storage/filestorage/config_test.go index e52937dd35e3..8f14a3ec88fc 100644 --- a/extension/storage/filestorage/config_test.go +++ b/extension/storage/filestorage/config_test.go @@ -195,7 +195,6 @@ func TestDirectoryCreateConfig(t *testing.T) { cfg.CreateDirectory = false cfg.DirectoryPermissions = "07771" return cfg - }, err: nil, }, diff --git a/extension/storage/filestorage/extension_test.go b/extension/storage/filestorage/extension_test.go index bb6f779bd6b2..dd49cf9a2295 100644 --- a/extension/storage/filestorage/extension_test.go +++ b/extension/storage/filestorage/extension_test.go @@ -69,7 +69,6 @@ func TestExtensionIntegrity(t *testing.T) { // Repeatedly thrash client for j := 0; j < 100; j++ { - // Make sure my values are still mine for i := 0; i < len(keys); i++ { v, err := c.Get(ctx, keys[i]) @@ -143,7 +142,6 @@ func TestClientHandlesSimpleCases(t *testing.T) { data, err = client.Get(ctx, "key") require.NoError(t, err) require.Nil(t, data) - } func TestTwoClientsWithDifferentNames(t *testing.T) { diff --git a/extension/storage/redisstorageextension/extension_test.go b/extension/storage/redisstorageextension/extension_test.go index f4e025d5d7de..4f24e0ec91cd 100644 --- a/extension/storage/redisstorageextension/extension_test.go +++ b/extension/storage/redisstorageextension/extension_test.go @@ -61,7 +61,6 @@ func TestExtensionIntegrity(t *testing.T) { // Repeatedly thrash client for j := 0; j < 100; j++ { - // Make sure my values are still mine for i := 0; i < len(keys); i++ { v, err := c.Get(ctx, keys[i]) @@ -136,7 +135,6 @@ func TestClientHandlesSimpleCases(t *testing.T) { data, err = client.Get(ctx, "key") require.NoError(t, err) require.Nil(t, data) - } func TestTwoClientsWithDifferentNames(t *testing.T) { diff --git a/extension/sumologicextension/extension.go b/extension/sumologicextension/extension.go index ae73938d14d7..13904c184cdc 100644 --- a/extension/sumologicextension/extension.go +++ b/extension/sumologicextension/extension.go @@ -604,7 +604,6 @@ func (se *SumologicExtension) heartbeatLoop() { zap.String(collectorNameField, colCreds.Credentials.CollectorName), zap.String(collectorIDField, colCreds.Credentials.CollectorID), ) - } else { se.logger.Error("Heartbeat error", zap.Error(err)) } @@ -618,7 +617,6 @@ func (se *SumologicExtension) heartbeatLoop() { timer.Reset(se.conf.HeartBeatInterval) case <-se.closeChan: } - } } } diff --git a/extension/sumologicextension/extension_test.go b/extension/sumologicextension/extension_test.go index 29477f352383..3773e004a02e 100644 --- a/extension/sumologicextension/extension_test.go +++ b/extension/sumologicextension/extension_test.go @@ -97,7 +97,6 @@ func TestBasicStart(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -159,7 +158,6 @@ func TestStoreCredentials(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -402,7 +400,6 @@ func TestLocalFSCredentialsStore_WorkCorrectlyForMultipleExtensions(t *testing.T reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -506,7 +503,6 @@ func TestRegisterEmptyCollectorName(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -575,7 +571,6 @@ func TestRegisterEmptyCollectorNameForceRegistration(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -669,7 +664,6 @@ func TestCollectorSendsBasicAuthHeadersOnRegistration(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -773,7 +767,6 @@ func TestCollectorCheckingCredentialsFoundInLocalStorage(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // heatbeat case 1: assert.NotEqual(t, registerURL, req.URL.Path, @@ -821,7 +814,6 @@ func TestCollectorCheckingCredentialsFoundInLocalStorage(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // failing heatbeat case 1: assert.NotEqual(t, registerURL, req.URL.Path, @@ -885,7 +877,6 @@ func TestCollectorCheckingCredentialsFoundInLocalStorage(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // failing heatbeat case 1: assert.NotEqual(t, registerURL, req.URL.Path, @@ -953,7 +944,6 @@ func TestCollectorCheckingCredentialsFoundInLocalStorage(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch reqNum { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -1044,7 +1034,6 @@ func TestRegisterEmptyCollectorNameWithBackoff(t *testing.T) { reqNum := atomic.AddInt32(&reqCount, 1) switch { - // register case reqNum <= retriesLimit: assert.Equal(t, registerURL, req.URL.Path) @@ -1056,7 +1045,6 @@ func TestRegisterEmptyCollectorNameWithBackoff(t *testing.T) { if reqCount < retriesLimit { w.WriteHeader(http.StatusTooManyRequests) } else { - _, err = w.Write([]byte(`{ "collectorCredentialID": "aaaaaaaaaaaaaaaaaaaa", "collectorCredentialKey": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", @@ -1163,7 +1151,6 @@ func TestRegistrationRedirect(t *testing.T) { destSrv := httptest.NewServer(http.HandlerFunc( func(w http.ResponseWriter, req *http.Request) { switch atomic.AddInt32(&destReqCount, 1) { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -1221,7 +1208,6 @@ func TestRegistrationRedirect(t *testing.T) { origSrv := httptest.NewServer(http.HandlerFunc( func(w http.ResponseWriter, req *http.Request) { switch atomic.AddInt32(&origReqCount, 1) { - // register case 1: assert.Equal(t, registerURL, req.URL.Path) @@ -1431,7 +1417,6 @@ func TestRegistrationRequestPayload(t *testing.T) { assert.Equal(t, metadataURL, req.URL.Path) w.WriteHeader(http.StatusOK) } - }) }())