chore(linters): Enable import-alias-naming and redundant-import-alias rules for revive

.golangci.yml

@@ -258,6 +258,9 @@ linters-settings:
         arguments: [ 3 ]
       - name: identical-branches
       - name: if-return
+      - name: import-alias-naming
+        arguments:
+          - "^[a-z][a-z0-9_]*[a-z0-9]+$"
       - name: import-shadowing
       - name: increment-decrement
       - name: indent-error-flow
@@ -269,6 +272,7 @@ linters-settings:
       - name: range-val-in-closure
       - name: receiver-naming
       - name: redefines-builtin-id
+      - name: redundant-import-alias
       - name: string-of-int
       - name: struct-tag
       - name: superfluous-else

internal/internal.go

@@ -4,7 +4,7 @@ import (
 	"bufio"
 	"compress/gzip"
 	"context"
-	cryptoRand "crypto/rand"
+	crypto_rand "crypto/rand"
 	"errors"
 	"fmt"
 	"io"
@@ -94,7 +94,7 @@ func ReadLines(filename string) ([]string, error) {
 // RandomString returns a random string of alphanumeric characters
 func RandomString(n int) (string, error) {
 	var bytes = make([]byte, n)
-	_, err := cryptoRand.Read(bytes)
+	_, err := crypto_rand.Read(bytes)
 	if err != nil {
 		return "", err
 	}

plugins/aggregators/histogram/histogram.go

@@ -8,7 +8,7 @@ import (
 	"time"
 
 	"github.com/influxdata/telegraf"
-	telegrafConfig "github.com/influxdata/telegraf/config"
+	telegraf_config "github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/plugins/aggregators"
 )
 
@@ -29,11 +29,11 @@ const bucketNegInf = "-Inf"
 
 // HistogramAggregator is aggregator with histogram configs and particular histograms for defined metrics
 type HistogramAggregator struct {
-	Configs            []config                `toml:"config"`
-	ResetBuckets       bool                    `toml:"reset"`
-	Cumulative         bool                    `toml:"cumulative"`
-	ExpirationInterval telegrafConfig.Duration `toml:"expiration_interval"`
-	PushOnlyOnUpdate   bool                    `toml:"push_only_on_update"`
+	Configs            []config                 `toml:"config"`
+	ResetBuckets       bool                     `toml:"reset"`
+	Cumulative         bool                     `toml:"cumulative"`
+	ExpirationInterval telegraf_config.Duration `toml:"expiration_interval"`
+	PushOnlyOnUpdate   bool                     `toml:"push_only_on_update"`
 
 	buckets bucketsByMetrics
 	cache   map[uint64]metricHistogramCollection

plugins/aggregators/histogram/histogram_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/influxdata/telegraf"
-	telegrafConfig "github.com/influxdata/telegraf/config"
+	telegraf_config "github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/testutil"
 )
@@ -26,7 +26,7 @@ func NewTestHistogramWithExpirationInterval(
 	reset bool,
 	cumulative bool,
 	pushOnlyOnUpdate bool,
-	expirationInterval telegrafConfig.Duration,
+	expirationInterval telegraf_config.Duration,
 ) telegraf.Aggregator {
 	htm := NewHistogramAggregator()
 	htm.Configs = cfg
@@ -435,7 +435,7 @@ func TestHistogramMetricExpiration(t *testing.T) {
 		{Metric: "first_metric_name", Fields: []string{"a"}, Buckets: []float64{0.0, 10.0, 20.0, 30.0, 40.0}},
 		{Metric: "second_metric_name", Buckets: []float64{0.0, 4.0, 10.0, 23.0, 30.0}},
 	}
-	histogram := NewTestHistogramWithExpirationInterval(cfg, false, true, false, telegrafConfig.Duration(30))
+	histogram := NewTestHistogramWithExpirationInterval(cfg, false, true, false, telegraf_config.Duration(30))
 
 	acc := &testutil.Accumulator{}
 

plugins/common/auth/basic_auth_test.go

@@ -1,9 +1,10 @@
 package auth
 
 import (
-	"github.com/stretchr/testify/require"
 	"net/http/httptest"
 	"testing"
+
+	"github.com/stretchr/testify/require"
 )
 
 func TestBasicAuth_VerifyWithCredentials(t *testing.T) {

plugins/common/aws/credentials.go

@@ -3,10 +3,10 @@ package aws
 import (
 	"context"
 
-	awsV2 "github.com/aws/aws-sdk-go-v2/aws"
-	configV2 "github.com/aws/aws-sdk-go-v2/config"
-	credentialsV2 "github.com/aws/aws-sdk-go-v2/credentials"
-	stscredsV2 "github.com/aws/aws-sdk-go-v2/credentials/stscreds"
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/credentials"
+	"github.com/aws/aws-sdk-go-v2/credentials/stscreds"
 	"github.com/aws/aws-sdk-go-v2/service/sts"
 )
 
@@ -24,61 +24,61 @@ type CredentialConfig struct {
 	WebIdentityTokenFile string `toml:"web_identity_token_file"`
 }
 
-func (c *CredentialConfig) Credentials() (awsV2.Config, error) {
+func (c *CredentialConfig) Credentials() (aws.Config, error) {
 	if c.RoleARN != "" {
 		return c.configWithAssumeCredentials()
 	}
 	return c.configWithRootCredentials()
 }
 
-func (c *CredentialConfig) configWithRootCredentials() (awsV2.Config, error) {
-	options := []func(*configV2.LoadOptions) error{
-		configV2.WithRegion(c.Region),
+func (c *CredentialConfig) configWithRootCredentials() (aws.Config, error) {
+	options := []func(*config.LoadOptions) error{
+		config.WithRegion(c.Region),
 	}
 
 	if c.Profile != "" {
-		options = append(options, configV2.WithSharedConfigProfile(c.Profile))
+		options = append(options, config.WithSharedConfigProfile(c.Profile))
 	}
 	if c.Filename != "" {
-		options = append(options, configV2.WithSharedCredentialsFiles([]string{c.Filename}))
+		options = append(options, config.WithSharedCredentialsFiles([]string{c.Filename}))
 	}
 
 	if c.AccessKey != "" || c.SecretKey != "" {
-		provider := credentialsV2.NewStaticCredentialsProvider(c.AccessKey, c.SecretKey, c.Token)
-		options = append(options, configV2.WithCredentialsProvider(provider))
+		provider := credentials.NewStaticCredentialsProvider(c.AccessKey, c.SecretKey, c.Token)
+		options = append(options, config.WithCredentialsProvider(provider))
 	}
 
-	return configV2.LoadDefaultConfig(context.Background(), options...)
+	return config.LoadDefaultConfig(context.Background(), options...)
 }
 
-func (c *CredentialConfig) configWithAssumeCredentials() (awsV2.Config, error) {
+func (c *CredentialConfig) configWithAssumeCredentials() (aws.Config, error) {
 	// To generate credentials using assumeRole, we need to create AWS STS client with the default AWS endpoint,
 	defaultConfig, err := c.configWithRootCredentials()
 	if err != nil {
-		return awsV2.Config{}, err
+		return aws.Config{}, err
 	}
 
-	var provider awsV2.CredentialsProvider
+	var provider aws.CredentialsProvider
 	stsService := sts.NewFromConfig(defaultConfig)
 	if c.WebIdentityTokenFile != "" {
-		provider = stscredsV2.NewWebIdentityRoleProvider(
+		provider = stscreds.NewWebIdentityRoleProvider(
 			stsService,
 			c.RoleARN,
-			stscredsV2.IdentityTokenFile(c.WebIdentityTokenFile),
-			func(opts *stscredsV2.WebIdentityRoleOptions) {
+			stscreds.IdentityTokenFile(c.WebIdentityTokenFile),
+			func(opts *stscreds.WebIdentityRoleOptions) {
 				if c.RoleSessionName != "" {
 					opts.RoleSessionName = c.RoleSessionName
 				}
 			},
 		)
 	} else {
-		provider = stscredsV2.NewAssumeRoleProvider(stsService, c.RoleARN, func(opts *stscredsV2.AssumeRoleOptions) {
+		provider = stscreds.NewAssumeRoleProvider(stsService, c.RoleARN, func(opts *stscreds.AssumeRoleOptions) {
 			if c.RoleSessionName != "" {
 				opts.RoleSessionName = c.RoleSessionName
 			}
 		})
 	}
 
-	defaultConfig.Credentials = awsV2.NewCredentialsCache(provider)
+	defaultConfig.Credentials = aws.NewCredentialsCache(provider)
 	return defaultConfig, nil
 }

plugins/common/http/config.go

@@ -12,7 +12,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/plugins/common/cookie"
-	oauthConfig "github.com/influxdata/telegraf/plugins/common/oauth"
+	"github.com/influxdata/telegraf/plugins/common/oauth"
 	"github.com/influxdata/telegraf/plugins/common/proxy"
 	"github.com/influxdata/telegraf/plugins/common/tls"
 )
@@ -27,7 +27,7 @@ type HTTPClientConfig struct {
 
 	proxy.HTTPProxy
 	tls.ClientConfig
-	oauthConfig.OAuth2Config
+	oauth.OAuth2Config
 	cookie.CookieAuthConfig
 }
 

plugins/common/kafka/config.go

@@ -9,7 +9,7 @@ import (
 	"github.com/IBM/sarama"
 
 	"github.com/influxdata/telegraf"
-	tgConf "github.com/influxdata/telegraf/config"
+	telegraf_config "github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/plugins/common/tls"
 )
 
@@ -55,16 +55,16 @@ type Config struct {
 	SASLAuth
 	tls.ClientConfig
 
-	Version          string           `toml:"version"`
-	ClientID         string           `toml:"client_id"`
-	CompressionCodec int              `toml:"compression_codec"`
-	EnableTLS        *bool            `toml:"enable_tls"`
-	KeepAlivePeriod  *tgConf.Duration `toml:"keep_alive_period"`
+	Version          string                    `toml:"version"`
+	ClientID         string                    `toml:"client_id"`
+	CompressionCodec int                       `toml:"compression_codec"`
+	EnableTLS        *bool                     `toml:"enable_tls"`
+	KeepAlivePeriod  *telegraf_config.Duration `toml:"keep_alive_period"`
 
-	MetadataRetryMax         int             `toml:"metadata_retry_max"`
-	MetadataRetryType        string          `toml:"metadata_retry_type"`
-	MetadataRetryBackoff     tgConf.Duration `toml:"metadata_retry_backoff"`
-	MetadataRetryMaxDuration tgConf.Duration `toml:"metadata_retry_max_duration"`
+	MetadataRetryMax         int                      `toml:"metadata_retry_max"`
+	MetadataRetryType        string                   `toml:"metadata_retry_type"`
+	MetadataRetryBackoff     telegraf_config.Duration `toml:"metadata_retry_backoff"`
+	MetadataRetryMaxDuration telegraf_config.Duration `toml:"metadata_retry_max_duration"`
 
 	// Disable full metadata fetching
 	MetadataFull *bool `toml:"metadata_full"`
@@ -145,7 +145,7 @@ func (k *Config) SetConfig(config *sarama.Config, log telegraf.Logger) error {
 		return errors.New("invalid metadata retry type")
 	case "exponential":
 		if k.MetadataRetryBackoff == 0 {
-			k.MetadataRetryBackoff = tgConf.Duration(250 * time.Millisecond)
+			k.MetadataRetryBackoff = telegraf_config.Duration(250 * time.Millisecond)
 			log.Warnf("metadata_retry_backoff is 0, using %s", time.Duration(k.MetadataRetryBackoff))
 		}
 		config.Metadata.Retry.BackoffFunc = makeBackoffFunc(

plugins/common/proxy/connect.go

@@ -8,12 +8,12 @@ import (
 	"net/http"
 	"net/url"
 
-	netProxy "golang.org/x/net/proxy"
+	"golang.org/x/net/proxy"
 )
 
 // httpConnectProxy proxies (only?) TCP over a HTTP tunnel using the CONNECT method
 type httpConnectProxy struct {
-	forward netProxy.Dialer
+	forward proxy.Dialer
 	url     *url.URL
 }
 
@@ -25,7 +25,7 @@ func (c *httpConnectProxy) DialContext(ctx context.Context, network, addr string
 
 	var proxyConn net.Conn
 	var err error
-	if dialer, ok := c.forward.(netProxy.ContextDialer); ok {
+	if dialer, ok := c.forward.(proxy.ContextDialer); ok {
 		proxyConn, err = dialer.DialContext(ctx, "tcp", c.url.Host)
 	} else {
 		shim := contextDialerShim{c.forward}
@@ -93,22 +93,22 @@ func (c *httpConnectProxy) Dial(network, addr string) (net.Conn, error) {
 	return c.DialContext(context.Background(), network, addr)
 }
 
-func newHTTPConnectProxy(proxyURL *url.URL, forward netProxy.Dialer) (netProxy.Dialer, error) {
+func newHTTPConnectProxy(proxyURL *url.URL, forward proxy.Dialer) (proxy.Dialer, error) {
 	return &httpConnectProxy{forward, proxyURL}, nil
 }
 
 func init() {
 	// Register new proxy types
-	netProxy.RegisterDialerType("http", newHTTPConnectProxy)
-	netProxy.RegisterDialerType("https", newHTTPConnectProxy)
+	proxy.RegisterDialerType("http", newHTTPConnectProxy)
+	proxy.RegisterDialerType("https", newHTTPConnectProxy)
 }
 
 // contextDialerShim allows cancellation of the dial from a context even if the underlying
 // dialer does not implement `proxy.ContextDialer`. Arguably, this shouldn't actually get run,
 // unless a new proxy type is added that doesn't implement `proxy.ContextDialer`, as all the
 // standard library dialers implement `proxy.ContextDialer`.
 type contextDialerShim struct {
-	dialer netProxy.Dialer
+	dialer proxy.Dialer
 }
 
 func (cd *contextDialerShim) Dial(network, addr string) (net.Conn, error) {

plugins/common/proxy/dialer.go

@@ -5,19 +5,19 @@ import (
 	"net"
 	"time"
 
-	netProxy "golang.org/x/net/proxy"
+	"golang.org/x/net/proxy"
 )
 
 type ProxiedDialer struct {
-	dialer netProxy.Dialer
+	dialer proxy.Dialer
 }
 
 func (pd *ProxiedDialer) Dial(network, addr string) (net.Conn, error) {
 	return pd.dialer.Dial(network, addr)
 }
 
 func (pd *ProxiedDialer) DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
-	if contextDialer, ok := pd.dialer.(netProxy.ContextDialer); ok {
+	if contextDialer, ok := pd.dialer.(proxy.ContextDialer); ok {
 		return contextDialer.DialContext(ctx, network, addr)
 	}
 

plugins/common/shim/config_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/influxdata/telegraf"
-	tgConfig "github.com/influxdata/telegraf/config"
+	telegraf_config "github.com/influxdata/telegraf/config"
 	"github.com/influxdata/telegraf/plugins/inputs"
 	"github.com/influxdata/telegraf/plugins/processors"
 )
@@ -61,9 +61,9 @@ func TestLoadingProcessorWithConfig(t *testing.T) {
 }
 
 type testDurationInput struct {
-	Duration tgConfig.Duration `toml:"duration"`
-	Size     tgConfig.Size     `toml:"size"`
-	Hex      int64             `toml:"hex"`
+	Duration telegraf_config.Duration `toml:"duration"`
+	Size     telegraf_config.Size     `toml:"size"`
+	Hex      int64                    `toml:"hex"`
 }
 
 func (i *testDurationInput) SampleConfig() string {

plugins/common/shim/processor_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/metric"
 	"github.com/influxdata/telegraf/plugins/parsers/influx"
-	influxSerializer "github.com/influxdata/telegraf/plugins/serializers/influx"
+	influx_serializer "github.com/influxdata/telegraf/plugins/serializers/influx"
 )
 
 func TestProcessorShim(t *testing.T) {
@@ -52,7 +52,7 @@ func testSendAndReceive(t *testing.T, fieldKey string, fieldValue string) {
 		wg.Done()
 	}()
 
-	serializer := &influxSerializer.Serializer{}
+	serializer := &influx_serializer.Serializer{}
 	require.NoError(t, serializer.Init())
 
 	parser := influx.Parser{}

plugins/common/socket/socket.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/influxdata/telegraf"
 	"github.com/influxdata/telegraf/config"
-	tlsint "github.com/influxdata/telegraf/plugins/common/tls"
+	common_tls "github.com/influxdata/telegraf/plugins/common/tls"
 )
 
 type CallbackData func(net.Addr, []byte)
@@ -34,7 +34,7 @@ type Config struct {
 	SocketMode           string           `toml:"socket_mode"`
 	ContentEncoding      string           `toml:"content_encoding"`
 	MaxDecompressionSize config.Size      `toml:"max_decompression_size"`
-	tlsint.ServerConfig
+	common_tls.ServerConfig
 }
 
 type Socket struct {