[chore] Fix mage fmt and reformat code

belimawr · belimawr · commit 6317de082670 · 2025-10-24T16:45:19.000-04:00
This commit fixes `mage fmt` and reformat the code.
diff --git a/api/npipe/listener_windows_test.go b/api/npipe/listener_windows_test.go
@@ -24,9 +24,10 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/elastic/elastic-agent-libs/transport/httpcommon"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/elastic/elastic-agent-libs/transport/httpcommon"
 )
 
 func TestHTTPOverNamedPipe(t *testing.T) {
diff --git a/dev-tools/mage/benchmark.go b/dev-tools/mage/benchmark.go
@@ -28,9 +28,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/elastic/elastic-agent-libs/dev-tools/mage/gotool"
 	"github.com/magefile/mage/mg"
 	"github.com/magefile/mage/sh"
+
+	"github.com/elastic/elastic-agent-libs/dev-tools/mage/gotool"
 )
 
 const (
diff --git a/dev-tools/mage/fmt.go b/dev-tools/mage/fmt.go
@@ -31,7 +31,7 @@ import (
 
 const (
 	// GoImportsImportPath controls the import path used to install goimports.
-	GoImportsImportPath = "golang.org/x/tools/cmd/goimports"
+	GoImportsImportPath = "golang.org/x/tools/cmd/goimports@latest"
 
 	// GoImportsLocalPrefix is a string prefix matching imports that should be
 	// grouped after third-party packages.
diff --git a/helpers/windows/pdh/zpdh_windows.go b/helpers/windows/pdh/zpdh_windows.go
diff --git a/logp/configure/logging_test.go b/logp/configure/logging_test.go
@@ -20,9 +20,10 @@ package configure
 import (
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/elastic/elastic-agent-libs/config"
 	"github.com/elastic/elastic-agent-libs/logp"
-	"github.com/stretchr/testify/require"
 )
 
 func TestLoggerOutputEnvironment(t *testing.T) {
diff --git a/logp/logptest/logptest.go b/logp/logptest/logptest.go
@@ -20,11 +20,12 @@ package logptest
 import (
 	"testing"
 
-	"github.com/elastic/elastic-agent-libs/logp"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"go.uber.org/zap/zaptest"
 	"go.uber.org/zap/zaptest/observer"
+
+	"github.com/elastic/elastic-agent-libs/logp"
 )
 
 // NewTestingLogger returns a testing suitable logp.Logger.
diff --git a/monitoring/metrics_test.go b/monitoring/metrics_test.go
@@ -144,7 +144,7 @@ func TestSafeVars(t *testing.T) {
 			})
 			wg.Wait()
 		})
-		
+
 		t.Run("NewTimestamp", func(t *testing.T) {
 			reg := NewRegistry()
 			name := "foo"
diff --git a/periodic/ratelimited_test.go b/periodic/ratelimited_test.go
@@ -27,9 +27,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/elastic/elastic-agent-libs/iobuf"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/elastic/elastic-agent-libs/iobuf"
 )
 
 type syncBuffer struct {
diff --git a/processors/dissect/delimiter.go b/processors/dissect/delimiter.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 )
 
-//delimiter represents a text section after or before a key, it keeps track of the needle and allows
+// delimiter represents a text section after or before a key, it keeps track of the needle and allows
 // to retrieve the position where it starts from a haystack.
 type delimiter interface {
 	// IndexOf receives the haystack and a offset position and will return the absolute position where
diff --git a/processors/dissect/field.go b/processors/dissect/field.go
@@ -114,6 +114,7 @@ func (f baseField) String() string {
 // dissect: %{key}
 // message: hello
 // result:
+//
 //	key: hello
 type normalField struct {
 	baseField
@@ -129,6 +130,7 @@ func (f normalField) Apply(b string, m Map) {
 // dissect: %{} %{key}
 // message: hello world
 // result:
+//
 //	key: world
 type skipField struct {
 	baseField
@@ -147,6 +149,7 @@ func (f skipField) IsSaveable() bool {
 // dissect: %{?key} %{&key}
 // message: hello world
 // result:
+//
 //	hello: world
 //
 // Deprecated: see pointerField
@@ -182,6 +185,7 @@ func (f pointerField) IsSaveable() bool {
 // dissect: %{?key} %{&key}
 // message: hello world
 // result:
+//
 //	hello: world
 type indirectField struct {
 	baseField
@@ -201,11 +205,13 @@ func (f indirectField) Apply(b string, m Map) {
 // dissect: %{+key} %{+key}
 // message: hello world
 // result:
+//
 //	key: hello world
 //
 // dissect: %{+key/2} %{+key/1}
 // message: hello world
 // result:
+//
 //	key: world hello
 type appendField struct {
 	baseField
diff --git a/safemapstr/safemapstr.go b/safemapstr/safemapstr.go
@@ -28,10 +28,10 @@ const alternativeKey = "value"
 // Put This method implements a way to put dotted keys into a M while
 // ensuring they don't override each other. For example:
 //
-//  a := M{}
-//  safemapstr.Put(a, "com.docker.swarm.task", "x")
-//  safemapstr.Put(a, "com.docker.swarm.task.id", 1)
-//  safemapstr.Put(a, "com.docker.swarm.task.name", "foobar")
+//	a := M{}
+//	safemapstr.Put(a, "com.docker.swarm.task", "x")
+//	safemapstr.Put(a, "com.docker.swarm.task.id", 1)
+//	safemapstr.Put(a, "com.docker.swarm.task.name", "foobar")
 //
 // Will result in `{"com":{"docker":{"swarm":{"task":{"id":1,"name":"foobar","value":"x"}}}}}`
 //
diff --git a/transform/typeconv/typeconv.go b/transform/typeconv/typeconv.go
@@ -118,11 +118,12 @@ func (c *Converter) Convert(to, from interface{}) (err error) {
 // Go structures can influence the transformation via tags using the `struct` namespace.
 // If the tag is missing, the structs field names are used. Additional options are separates by `,`.
 // options:
-//   `squash`, `inline`: The fields in the child struct/map are assumed to be inlined, without reporting a sub-oject.
-//   `omitempty`: The field is not converted if it is "empty". For example an
-//                empty string, array or `nil` pointers are assumed to be empty. In either case the original value
-//                in `to` will not be overwritten.
-//   `omit`, `-`: Do not convert the field.
+//
+//	`squash`, `inline`: The fields in the child struct/map are assumed to be inlined, without reporting a sub-oject.
+//	`omitempty`: The field is not converted if it is "empty". For example an
+//	             empty string, array or `nil` pointers are assumed to be empty. In either case the original value
+//	             in `to` will not be overwritten.
+//	`omit`, `-`: Do not convert the field.
 func Convert(to, from interface{}) (err error) {
 	c, _ := convPool.Get().(*Converter)
 	defer convPool.Put(c)
diff --git a/transport/httpcommon/diag_test.go b/transport/httpcommon/diag_test.go
@@ -34,8 +34,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/elastic/elastic-agent-libs/transport/tlscommon"
 	"github.com/stretchr/testify/require"
+
+	"github.com/elastic/elastic-agent-libs/transport/tlscommon"
 )
 
 var ser int64 = 1
diff --git a/transport/tlscommon/tls_fips_test.go b/transport/tlscommon/tls_fips_test.go
@@ -26,9 +26,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/elastic/elastic-agent-libs/logp/logptest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/elastic/elastic-agent-libs/logp/logptest"
 )
 
 // TestFIPSCertifacteAndKeys tests that encrypted private keys fail in FIPS mode
diff --git a/transport/tlscommon/tls_nofips_test.go b/transport/tlscommon/tls_nofips_test.go
@@ -26,9 +26,10 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/elastic/elastic-agent-libs/logp/logptest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/elastic/elastic-agent-libs/logp/logptest"
 )
 
 // TestNoFIPSCertificateAndKeys tests that encrypted private keys are supported in none FIPS mode

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ import (`
`22`	`22`	`"strings"`
`23`	`23`	`)`
`24`	`24`
`25`		`-//delimiter represents a text section after or before a key, it keeps track of the needle and allows`
	`25`	`+// delimiter represents a text section after or before a key, it keeps track of the needle and allows`
`26`	`26`	`// to retrieve the position where it starts from a haystack.`
`27`	`27`	`type delimiter interface {`
`28`	`28`	`// IndexOf receives the haystack and a offset position and will return the absolute position where`