Skip to content

Commit 83e63fd

Browse files
pazhang-25pazhang-25
authored
[SEGDP-2781] Migrate AWS Go SDK to V2 (#241)
1 parent 695a1d6 commit 83e63fd

File tree

22 files changed

+239
-140
lines changed

22 files changed

+239
-140
lines changed

‎cmd/topicctl/subcmd/apply.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"syscall"
1010
"time"
1111

12+
"github.com/aws/aws-sdk-go-v2/aws"
1213
"github.com/segmentio/topicctl/pkg/admin"
1314
"github.com/segmentio/topicctl/pkg/apply"
1415
"github.com/segmentio/topicctl/pkg/cli"
@@ -223,7 +224,7 @@ func applyTopic(
223224
if !ok {
224225
adminClient, err = clusterConfig.NewAdminClient(
225226
ctx,
226-
nil,
227+
aws.Config{},
227228
config.AdminClientOpts{
228229
ReadOnly: applyConfig.dryRun,
229230
UsernameOverride: applyConfig.shared.saslUsername,

‎cmd/topicctl/subcmd/bootstrap.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package subcmd
33
import (
44
"context"
55

6+
"github.com/aws/aws-sdk-go-v2/aws"
67
"github.com/segmentio/topicctl/pkg/cli"
78
"github.com/segmentio/topicctl/pkg/config"
89
log "github.com/sirupsen/logrus"
@@ -78,7 +79,7 @@ func bootstrapRun(cmd *cobra.Command, args []string) error {
7879
}
7980
adminClient, err := clusterConfig.NewAdminClient(
8081
ctx,
81-
nil,
82+
aws.Config{},
8283
config.AdminClientOpts{
8384
ReadOnly: true,
8485
UsernameOverride: bootstrapConfig.shared.saslUsername,

‎cmd/topicctl/subcmd/check.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"os"
77
"path/filepath"
88

9+
"github.com/aws/aws-sdk-go-v2/aws"
910
"github.com/segmentio/topicctl/pkg/admin"
1011
"github.com/segmentio/topicctl/pkg/check"
1112
"github.com/segmentio/topicctl/pkg/cli"
@@ -136,7 +137,7 @@ func checkTopicFile(
136137
if !ok {
137138
adminClient, err = clusterConfig.NewAdminClient(
138139
ctx,
139-
nil,
140+
aws.Config{},
140141
config.AdminClientOpts{
141142
ReadOnly: true,
142143
UsernameOverride: checkConfig.shared.saslUsername,

‎cmd/topicctl/subcmd/create.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88
"path/filepath"
99
"syscall"
1010

11+
"github.com/aws/aws-sdk-go-v2/aws"
1112
"github.com/segmentio/topicctl/pkg/acl"
1213
"github.com/segmentio/topicctl/pkg/admin"
1314
"github.com/segmentio/topicctl/pkg/cli"
@@ -149,7 +150,7 @@ func createACL(
149150
if !ok {
150151
adminClient, err = clusterConfig.NewAdminClient(
151152
ctx,
152-
nil,
153+
aws.Config{},
153154
config.AdminClientOpts{
154155
ReadOnly: createConfig.dryRun,
155156
UsernameOverride: createConfig.shared.saslUsername,

‎cmd/topicctl/subcmd/delete.go‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"context"
55
"strings"
66

7-
"github.com/aws/aws-sdk-go/aws/session"
7+
"github.com/aws/aws-sdk-go-v2/config"
88
"github.com/segmentio/kafka-go"
99
"github.com/segmentio/topicctl/pkg/acl"
1010
"github.com/segmentio/topicctl/pkg/admin"
@@ -69,9 +69,12 @@ $ topicctl delete acls --resource-type topic --resource-pattern-type literal --r
6969
`,
7070
RunE: func(cmd *cobra.Command, args []string) error {
7171
ctx := context.Background()
72-
sess := session.Must(session.NewSession())
72+
cfg, err := config.LoadDefaultConfig(ctx)
73+
if err != nil {
74+
return err
75+
}
7376

74-
adminClient, err := deleteConfig.shared.getAdminClient(ctx, sess, deleteConfig.dryRun)
77+
adminClient, err := deleteConfig.shared.getAdminClient(ctx, cfg, deleteConfig.dryRun)
7578
if err != nil {
7679
return err
7780
}
@@ -159,9 +162,12 @@ func deleteTopicCmd() *cobra.Command {
159162
Args: cobra.ExactArgs(1),
160163
RunE: func(cmd *cobra.Command, args []string) error {
161164
ctx := context.Background()
162-
sess := session.Must(session.NewSession())
165+
cfg, err := config.LoadDefaultConfig(ctx)
166+
if err != nil {
167+
return err
168+
}
163169

164-
adminClient, err := deleteConfig.shared.getAdminClient(ctx, sess, false)
170+
adminClient, err := deleteConfig.shared.getAdminClient(ctx, cfg, false)
165171
if err != nil {
166172
return err
167173
}

‎cmd/topicctl/subcmd/get.go‎

Lines changed: 66 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"fmt"
66
"strings"
77

8-
"github.com/aws/aws-sdk-go/aws/session"
8+
"github.com/aws/aws-sdk-go-v2/config"
99
"github.com/segmentio/kafka-go"
1010
"github.com/segmentio/topicctl/pkg/admin"
1111
"github.com/segmentio/topicctl/pkg/cli"
@@ -95,9 +95,12 @@ func balanceCmd() *cobra.Command {
9595
Args: cobra.MaximumNArgs(1),
9696
RunE: func(cmd *cobra.Command, args []string) error {
9797
ctx := context.Background()
98-
sess := session.Must(session.NewSession())
98+
cfg, err := config.LoadDefaultConfig(ctx)
99+
if err != nil {
100+
return err
101+
}
99102

100-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
103+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
101104
if err != nil {
102105
return err
103106
}
@@ -122,9 +125,12 @@ func brokersCmd() *cobra.Command {
122125
Args: cobra.NoArgs,
123126
RunE: func(cmd *cobra.Command, args []string) error {
124127
ctx := context.Background()
125-
sess := session.Must(session.NewSession())
128+
cfg, err := config.LoadDefaultConfig(ctx)
129+
if err != nil {
130+
return err
131+
}
126132

127-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
133+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
128134
if err != nil {
129135
return err
130136
}
@@ -143,9 +149,12 @@ func controllerCmd() *cobra.Command {
143149
Args: cobra.NoArgs,
144150
RunE: func(cmd *cobra.Command, args []string) error {
145151
ctx := context.Background()
146-
sess := session.Must(session.NewSession())
152+
cfg, err := config.LoadDefaultConfig(ctx)
153+
if err != nil {
154+
return err
155+
}
147156

148-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
157+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
149158
if err != nil {
150159
return err
151160
}
@@ -164,9 +173,12 @@ func clusterIDCmd() *cobra.Command {
164173
Args: cobra.NoArgs,
165174
RunE: func(cmd *cobra.Command, args []string) error {
166175
ctx := context.Background()
167-
sess := session.Must(session.NewSession())
176+
cfg, err := config.LoadDefaultConfig(ctx)
177+
if err != nil {
178+
return err
179+
}
168180

169-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
181+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
170182
if err != nil {
171183
return err
172184
}
@@ -185,9 +197,12 @@ func configCmd() *cobra.Command {
185197
Args: cobra.ExactArgs(1),
186198
RunE: func(cmd *cobra.Command, args []string) error {
187199
ctx := context.Background()
188-
sess := session.Must(session.NewSession())
200+
cfg, err := config.LoadDefaultConfig(ctx)
201+
if err != nil {
202+
return err
203+
}
189204

190-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
205+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
191206
if err != nil {
192207
return err
193208
}
@@ -206,9 +221,12 @@ func groupsCmd() *cobra.Command {
206221
Args: cobra.NoArgs,
207222
RunE: func(cmd *cobra.Command, args []string) error {
208223
ctx := context.Background()
209-
sess := session.Must(session.NewSession())
224+
cfg, err := config.LoadDefaultConfig(ctx)
225+
if err != nil {
226+
return err
227+
}
210228

211-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
229+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
212230
if err != nil {
213231
return err
214232
}
@@ -227,9 +245,12 @@ func lagsCmd() *cobra.Command {
227245
Args: cobra.ExactArgs(2),
228246
RunE: func(cmd *cobra.Command, args []string) error {
229247
ctx := context.Background()
230-
sess := session.Must(session.NewSession())
248+
cfg, err := config.LoadDefaultConfig(ctx)
249+
if err != nil {
250+
return err
251+
}
231252

232-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
253+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
233254
if err != nil {
234255
return err
235256
}
@@ -254,9 +275,12 @@ func membersCmd() *cobra.Command {
254275
Args: cobra.ExactArgs(1),
255276
RunE: func(cmd *cobra.Command, args []string) error {
256277
ctx := context.Background()
257-
sess := session.Must(session.NewSession())
278+
cfg, err := config.LoadDefaultConfig(ctx)
279+
if err != nil {
280+
return err
281+
}
258282

259-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
283+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
260284
if err != nil {
261285
return err
262286
}
@@ -275,9 +299,12 @@ func partitionsCmd() *cobra.Command {
275299
Args: cobra.MinimumNArgs(0),
276300
RunE: func(cmd *cobra.Command, args []string) error {
277301
ctx := context.Background()
278-
sess := session.Must(session.NewSession())
302+
cfg, err := config.LoadDefaultConfig(ctx)
303+
if err != nil {
304+
return err
305+
}
279306

280-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
307+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
281308
if err != nil {
282309
return err
283310
}
@@ -321,9 +348,12 @@ func offsetsCmd() *cobra.Command {
321348
Args: cobra.ExactArgs(1),
322349
RunE: func(cmd *cobra.Command, args []string) error {
323350
ctx := context.Background()
324-
sess := session.Must(session.NewSession())
351+
cfg, err := config.LoadDefaultConfig(ctx)
352+
if err != nil {
353+
return err
354+
}
325355

326-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
356+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
327357
if err != nil {
328358
return err
329359
}
@@ -342,9 +372,12 @@ func topicsCmd() *cobra.Command {
342372
Args: cobra.NoArgs,
343373
RunE: func(cmd *cobra.Command, args []string) error {
344374
ctx := context.Background()
345-
sess := session.Must(session.NewSession())
375+
cfg, err := config.LoadDefaultConfig(ctx)
376+
if err != nil {
377+
return err
378+
}
346379

347-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
380+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
348381
if err != nil {
349382
return err
350383
}
@@ -397,9 +430,12 @@ $ topicctl get acls --host 198.51.100.0
397430
`,
398431
RunE: func(cmd *cobra.Command, args []string) error {
399432
ctx := context.Background()
400-
sess := session.Must(session.NewSession())
433+
cfg, err := config.LoadDefaultConfig(ctx)
434+
if err != nil {
435+
return err
436+
}
401437

402-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
438+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
403439
if err != nil {
404440
return err
405441
}
@@ -467,9 +503,12 @@ func usersCmd() *cobra.Command {
467503
Args: cobra.NoArgs,
468504
RunE: func(cmd *cobra.Command, args []string) error {
469505
ctx := context.Background()
470-
sess := session.Must(session.NewSession())
506+
cfg, err := config.LoadDefaultConfig(ctx)
507+
if err != nil {
508+
return err
509+
}
471510

472-
adminClient, err := getConfig.shared.getAdminClient(ctx, sess, true)
511+
adminClient, err := getConfig.shared.getAdminClient(ctx, cfg, true)
473512
if err != nil {
474513
return err
475514
}

‎cmd/topicctl/subcmd/rebalance.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"syscall"
1111
"time"
1212

13+
"github.com/aws/aws-sdk-go-v2/aws"
1314
"github.com/spf13/cobra"
1415

1516
"github.com/segmentio/topicctl/pkg/admin"
@@ -124,7 +125,7 @@ func rebalanceRun(cmd *cobra.Command, args []string) error {
124125
}
125126

126127
adminClient, err := clusterConfig.NewAdminClient(ctx,
127-
nil,
128+
aws.Config{},
128129
config.AdminClientOpts{
129130
ReadOnly: rebalanceConfig.dryRun,
130131
UsernameOverride: rebalanceConfig.shared.saslUsername,

‎cmd/topicctl/subcmd/repl.go‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package subcmd
33
import (
44
"context"
55

6-
"github.com/aws/aws-sdk-go/aws/session"
6+
"github.com/aws/aws-sdk-go-v2/config"
77
"github.com/segmentio/topicctl/pkg/cli"
88
"github.com/spf13/cobra"
99
)
@@ -32,9 +32,12 @@ func replPreRun(cmd *cobra.Command, args []string) error {
3232

3333
func replRun(cmd *cobra.Command, args []string) error {
3434
ctx := context.Background()
35-
sess := session.Must(session.NewSession())
35+
cfg, err := config.LoadDefaultConfig(ctx)
36+
if err != nil {
37+
return err
38+
}
3639

37-
adminClient, err := replConfig.shared.getAdminClient(ctx, sess, true)
40+
adminClient, err := replConfig.shared.getAdminClient(ctx, cfg, true)
3841
if err != nil {
3942
return err
4043
}

‎cmd/topicctl/subcmd/reset.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import (
66
"fmt"
77
"strconv"
88

9+
"github.com/aws/aws-sdk-go-v2/aws"
910
"github.com/segmentio/topicctl/pkg/cli"
1011
"github.com/segmentio/topicctl/pkg/groups"
1112
"github.com/segmentio/topicctl/pkg/util"
@@ -90,7 +91,7 @@ func resetOffsetsRun(cmd *cobra.Command, args []string) error {
9091
ctx, cancel := context.WithCancel(context.Background())
9192
defer cancel()
9293

93-
adminClient, err := resetOffsetsConfig.shared.getAdminClient(ctx, nil, true)
94+
adminClient, err := resetOffsetsConfig.shared.getAdminClient(ctx, aws.Config{}, true)
9495
if err != nil {
9596
return err
9697
}

0 commit comments

Comments
 (0)