[SEGDP-2781] Migrate AWS Go SDK to V2

cmd/topicctl/subcmd/apply.go

@@ -9,6 +9,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/segmentio/topicctl/pkg/admin"
 	"github.com/segmentio/topicctl/pkg/apply"
 	"github.com/segmentio/topicctl/pkg/cli"
@@ -223,7 +224,7 @@ func applyTopic(
 	if !ok {
 		adminClient, err = clusterConfig.NewAdminClient(
 			ctx,
-			nil,
+			aws.Config{},
 			config.AdminClientOpts{
 				ReadOnly:                  applyConfig.dryRun,
 				UsernameOverride:          applyConfig.shared.saslUsername,

cmd/topicctl/subcmd/bootstrap.go

@@ -3,6 +3,7 @@ package subcmd
 import (
 	"context"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/segmentio/topicctl/pkg/cli"
 	"github.com/segmentio/topicctl/pkg/config"
 	log "github.com/sirupsen/logrus"
@@ -78,7 +79,7 @@ func bootstrapRun(cmd *cobra.Command, args []string) error {
 	}
 	adminClient, err := clusterConfig.NewAdminClient(
 		ctx,
-		nil,
+		aws.Config{},
 		config.AdminClientOpts{
 			ReadOnly:                  true,
 			UsernameOverride:          bootstrapConfig.shared.saslUsername,

cmd/topicctl/subcmd/check.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/segmentio/topicctl/pkg/admin"
 	"github.com/segmentio/topicctl/pkg/check"
 	"github.com/segmentio/topicctl/pkg/cli"
@@ -136,7 +137,7 @@ func checkTopicFile(
 		if !ok {
 			adminClient, err = clusterConfig.NewAdminClient(
 				ctx,
-				nil,
+				aws.Config{},
 				config.AdminClientOpts{
 					ReadOnly:                  true,
 					UsernameOverride:          checkConfig.shared.saslUsername,

cmd/topicctl/subcmd/create.go

@@ -8,6 +8,7 @@ import (
 	"path/filepath"
 	"syscall"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/segmentio/topicctl/pkg/acl"
 	"github.com/segmentio/topicctl/pkg/admin"
 	"github.com/segmentio/topicctl/pkg/cli"
@@ -149,7 +150,7 @@ func createACL(
 	if !ok {
 		adminClient, err = clusterConfig.NewAdminClient(
 			ctx,
-			nil,
+			aws.Config{},
 			config.AdminClientOpts{
 				ReadOnly:                  createConfig.dryRun,
 				UsernameOverride:          createConfig.shared.saslUsername,

cmd/topicctl/subcmd/delete.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"strings"
 
-	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/segmentio/kafka-go"
 	"github.com/segmentio/topicctl/pkg/acl"
 	"github.com/segmentio/topicctl/pkg/admin"
@@ -69,9 +69,12 @@ $ topicctl delete acls --resource-type topic --resource-pattern-type literal --r
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := deleteConfig.shared.getAdminClient(ctx, sess, deleteConfig.dryRun)
+			adminClient, err := deleteConfig.shared.getAdminClient(ctx, cfg, deleteConfig.dryRun)
 			if err != nil {
 				return err
 			}
@@ -159,9 +162,12 @@ func deleteTopicCmd() *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := deleteConfig.shared.getAdminClient(ctx, sess, false)
+			adminClient, err := deleteConfig.shared.getAdminClient(ctx, cfg, false)
 			if err != nil {
 				return err
 			}

cmd/topicctl/subcmd/get.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/segmentio/kafka-go"
 	"github.com/segmentio/topicctl/pkg/admin"
 	"github.com/segmentio/topicctl/pkg/cli"
@@ -95,9 +95,12 @@ func balanceCmd() *cobra.Command {
 		Args: cobra.MaximumNArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -122,9 +125,12 @@ func brokersCmd() *cobra.Command {
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -143,9 +149,12 @@ func controllerCmd() *cobra.Command {
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -164,9 +173,12 @@ func clusterIDCmd() *cobra.Command {
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -185,9 +197,12 @@ func configCmd() *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -206,9 +221,12 @@ func groupsCmd() *cobra.Command {
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -227,9 +245,12 @@ func lagsCmd() *cobra.Command {
 		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -254,9 +275,12 @@ func membersCmd() *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -275,9 +299,12 @@ func partitionsCmd() *cobra.Command {
 		Args:  cobra.MinimumNArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -321,9 +348,12 @@ func offsetsCmd() *cobra.Command {
 		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -342,9 +372,12 @@ func topicsCmd() *cobra.Command {
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -397,9 +430,12 @@ $ topicctl get acls --host 198.51.100.0
 `,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}
@@ -467,9 +503,12 @@ func usersCmd() *cobra.Command {
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx := context.Background()
-			sess := session.Must(session.NewSession())
+			cfg, err := config.LoadDefaultConfig(ctx)
+			if err != nil {
+				return err
+			}
 
-			adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
+			adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
 			if err != nil {
 				return err
 			}

cmd/topicctl/subcmd/rebalance.go

@@ -10,6 +10,7 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/spf13/cobra"
 
 	"github.com/segmentio/topicctl/pkg/admin"
@@ -124,7 +125,7 @@ func rebalanceRun(cmd *cobra.Command, args []string) error {
 	}
 
 	adminClient, err := clusterConfig.NewAdminClient(ctx,
-		nil,
+		aws.Config{},
 		config.AdminClientOpts{
 			ReadOnly:                  rebalanceConfig.dryRun,
 			UsernameOverride:          rebalanceConfig.shared.saslUsername,

cmd/topicctl/subcmd/repl.go

@@ -3,7 +3,7 @@ package subcmd
 import (
 	"context"
 
-	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/segmentio/topicctl/pkg/cli"
 	"github.com/spf13/cobra"
 )
@@ -32,9 +32,12 @@ func replPreRun(cmd *cobra.Command, args []string) error {
 
 func replRun(cmd *cobra.Command, args []string) error {
 	ctx := context.Background()
-	sess := session.Must(session.NewSession())
+	cfg, err := config.LoadDefaultConfig(ctx)
+	if err != nil {
+		return err
+	}
 
-	adminClient, err := replConfig.shared.getAdminClient(ctx, sess, true)
+	adminClient, err := replConfig.shared.getAdminClient(ctx, cfg, true)
 	if err != nil {
 		return err
 	}

cmd/topicctl/subcmd/reset.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/segmentio/topicctl/pkg/cli"
 	"github.com/segmentio/topicctl/pkg/groups"
 	"github.com/segmentio/topicctl/pkg/util"
@@ -90,7 +91,7 @@ func resetOffsetsRun(cmd *cobra.Command, args []string) error {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
-	adminClient, err := resetOffsetsConfig.shared.getAdminClient(ctx, nil, true)
+	adminClient, err := resetOffsetsConfig.shared.getAdminClient(ctx, aws.Config{}, true)
 	if err != nil {
 		return err
 	}