Replaces interface{} with any

Author: gdavison

aws_config_test.go

@@ -1174,7 +1174,7 @@ func cancelRequestMiddleware(t *testing.T, id string, f func(t *testing.T, reque
 		})
 }
 
-func fullTypeName(i interface{}) string {
+func fullTypeName(i any) string {
 	return fullValueTypeName(reflect.ValueOf(i))
 }
 
@@ -3806,7 +3806,7 @@ func TestRetryHandlers(t *testing.T) {
 
 			am := retry.NewAttemptMiddleware(&withNoDelay{
 				Retryer: awsConfig.Retryer(),
-			}, func(i interface{}) interface{} {
+			}, func(i any) any {
 				return i
 			})
 			_, metadata, err := am.HandleFinalize(ctx, middleware.FinalizeInput{Request: nil}, testcase.NextHandler())

endpoints.go

@@ -19,7 +19,7 @@ import (
 func credentialsEndpointResolver(ctx context.Context, c *Config) aws.EndpointResolverWithOptions {
 	logger := logging.RetrieveLogger(ctx)
 
-	resolver := func(service, region string, options ...interface{}) (aws.Endpoint, error) {
+	resolver := func(service, region string, options ...any) (aws.Endpoint, error) {
 		switch service {
 		case iam.ServiceID:
 			if endpoint := c.IamEndpoint; endpoint != "" {

internal/awsconfig/resolvers.go

@@ -17,7 +17,7 @@ type UseFIPSEndpointProvider interface {
 }
 
 // Copied from https://github.com/aws/aws-sdk-go-v2/blob/main/internal/configsources/config.go
-func ResolveUseFIPSEndpoint(ctx context.Context, configSources []interface{}) (value aws.FIPSEndpointState, found bool, err error) {
+func ResolveUseFIPSEndpoint(ctx context.Context, configSources []any) (value aws.FIPSEndpointState, found bool, err error) {
 	for _, cfg := range configSources {
 		if p, ok := cfg.(UseFIPSEndpointProvider); ok {
 			value, found, err = p.GetUseFIPSEndpoint(ctx)
@@ -47,7 +47,7 @@ type UseDualStackEndpointProvider interface {
 }
 
 // Copied from https://github.com/aws/aws-sdk-go-v2/blob/main/internal/configsources/config.go
-func ResolveUseDualStackEndpoint(ctx context.Context, configSources []interface{}) (value aws.DualStackEndpointState, found bool, err error) {
+func ResolveUseDualStackEndpoint(ctx context.Context, configSources []any) (value aws.DualStackEndpointState, found bool, err error) {
 	for _, cfg := range configSources {
 		if p, ok := cfg.(UseDualStackEndpointProvider); ok {
 			value, found, err = p.GetUseDualStackEndpoint(ctx)
@@ -77,7 +77,7 @@ type EC2IMDSClientEnableStateResolver interface {
 }
 
 // Copied and renamed from https://github.com/aws/aws-sdk-go-v2/blob/main/feature/ec2/imds/internal/config/resolvers.go
-func ResolveEC2IMDSClientEnableState(sources []interface{}) (value imds.ClientEnableState, found bool, err error) {
+func ResolveEC2IMDSClientEnableState(sources []any) (value imds.ClientEnableState, found bool, err error) {
 	for _, source := range sources {
 		if resolver, ok := source.(EC2IMDSClientEnableStateResolver); ok {
 			value, found, err = resolver.GetEC2IMDSClientEnableState()
@@ -107,7 +107,7 @@ type EC2IMDSEndpointResolver interface {
 }
 
 // Copied and renamed from https://github.com/aws/aws-sdk-go-v2/blob/main/feature/ec2/imds/internal/config/resolvers.go
-func ResolveEC2IMDSEndpointConfig(configSources []interface{}) (value string, found bool, err error) {
+func ResolveEC2IMDSEndpointConfig(configSources []any) (value string, found bool, err error) {
 	for _, cfg := range configSources {
 		if p, ok := cfg.(EC2IMDSEndpointResolver); ok {
 			value, found, err = p.GetEC2IMDSEndpoint()
@@ -125,7 +125,7 @@ type EC2IMDSEndpointModeResolver interface {
 }
 
 // Copied and renamed from https://github.com/aws/aws-sdk-go-v2/blob/main/feature/ec2/imds/internal/config/resolvers.go
-func ResolveEC2IMDSEndpointModeConfig(sources []interface{}) (value imds.EndpointModeState, found bool, err error) {
+func ResolveEC2IMDSEndpointModeConfig(sources []any) (value imds.EndpointModeState, found bool, err error) {
 	for _, source := range sources {
 		if resolver, ok := source.(EC2IMDSEndpointModeResolver); ok {
 			value, found, err = resolver.GetEC2IMDSEndpointMode()
@@ -155,7 +155,7 @@ type RetryMaxAttemptsProvider interface {
 }
 
 // Copied and renamed from https://github.com/aws/aws-sdk-go-v2/blob/main/config/provider.go
-func GetRetryMaxAttempts(ctx context.Context, sources []interface{}) (v int, found bool, err error) {
+func GetRetryMaxAttempts(ctx context.Context, sources []any) (v int, found bool, err error) {
 	for _, c := range sources {
 		if p, ok := c.(RetryMaxAttemptsProvider); ok {
 			v, found, err = p.GetRetryMaxAttempts(ctx)

internal/generate/common/generator.go

@@ -26,24 +26,24 @@ func NewGenerator() *Generator {
 	return &Generator{}
 }
 
-func (g *Generator) Infof(format string, a ...interface{}) {
+func (g *Generator) Infof(format string, a ...any) {
 	g.output(os.Stdout, format, a...)
 }
 
-func (g *Generator) Warnf(format string, a ...interface{}) {
+func (g *Generator) Warnf(format string, a ...any) {
 	g.Errorf(format, a...)
 }
 
-func (g *Generator) Errorf(format string, a ...interface{}) {
+func (g *Generator) Errorf(format string, a ...any) {
 	g.output(os.Stderr, format, a...)
 }
 
-func (g *Generator) Fatalf(format string, a ...interface{}) {
+func (g *Generator) Fatalf(format string, a ...any) {
 	g.Errorf(format, a...)
 	os.Exit(1)
 }
 
-func (g *Generator) output(w io.Writer, format string, a ...interface{}) {
+func (g *Generator) output(w io.Writer, format string, a ...any) {
 	fmt.Fprintf(w, format, a...)
 	fmt.Fprint(w, "\n")
 }

logger.go

@@ -35,7 +35,7 @@ type debugLogger struct {
 	ctx context.Context
 }
 
-func (l debugLogger) Logf(classification smithylogging.Classification, format string, v ...interface{}) {
+func (l debugLogger) Logf(classification smithylogging.Classification, format string, v ...any) {
 	s := fmt.Sprintf(format, v...)
 	if l.ctx != nil {
 		logger := logging.RetrieveLogger(l.ctx)

mockdata/mocks.go

@@ -23,7 +23,7 @@ func GetMockedAwsApiSession(svcName string, endpoints []*servicemocks.MockEndpoi
 	awsConfig := aws.Config{
 		Credentials: sc,
 		Region:      "us-east-1",
-		EndpointResolverWithOptions: aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...interface{}) (aws.Endpoint, error) {
+		EndpointResolverWithOptions: aws.EndpointResolverWithOptionsFunc(func(service, region string, options ...any) (aws.Endpoint, error) {
 			return aws.Endpoint{
 				URL:    ts.URL,
 				Source: aws.EndpointSourceCustom,

v2/awsv1shim/logger.go

@@ -30,7 +30,7 @@ const (
 
 type debugLogger struct{}
 
-func (l debugLogger) Log(args ...interface{}) {
+func (l debugLogger) Log(args ...any) {
 	tokens := make([]string, 0, len(args))
 	for _, arg := range args {
 		if token, ok := arg.(string); ok {

v2/awsv1shim/resolvers.go

@@ -13,7 +13,7 @@ import (
 	"github.com/hashicorp/aws-sdk-go-base/v2/logging"
 )
 
-func resolveCustomCABundle(ctx context.Context, configSources []interface{}) (value io.Reader, found bool, err error) {
+func resolveCustomCABundle(ctx context.Context, configSources []any) (value io.Reader, found bool, err error) {
 	for _, source := range configSources {
 		switch cfg := source.(type) {
 		case configv2.LoadOptions: