Skip to content

Commit 812fde7

Browse files
authored
br: upgrade AWS SDK from v1 to v2 #66634 (#68216)
ref #61547, close #62541
1 parent 34227a6 commit 812fde7

37 files changed

Lines changed: 2932 additions & 6121 deletions

DEPS.bzl

Lines changed: 298 additions & 12 deletions
Large diffs are not rendered by default.

Makefile

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -475,10 +475,6 @@ br_compatibility_test_prepare:
475475
br_compatibility_test:
476476
@cd br && tests/run_compatible.sh run
477477

478-
.PHONY: mock_s3iface
479-
mock_s3iface: mockgen
480-
tools/bin/mockgen -package mock github.com/aws/aws-sdk-go/service/s3/s3iface S3API > br/pkg/mock/s3iface.go
481-
482478
# mock interface for lightning and IMPORT INTO
483479
.PHONY: mock_lightning
484480
mock_lightning: mockgen

br/cmd/br/operator.go

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ func newOperatorCommand() *cobra.Command {
3737
cmd.AddCommand(newMigrateToCommand())
3838
cmd.AddCommand(newForceFlushCommand())
3939
cmd.AddCommand(newChecksumCommand())
40+
cmd.AddCommand(newTestStorageCommand())
4041
return cmd
4142
}
4243

@@ -153,3 +154,24 @@ func newForceFlushCommand() *cobra.Command {
153154
operator.DefineFlagsForForceFlushConfig(cmd.Flags())
154155
return cmd
155156
}
157+
158+
func newTestStorageCommand() *cobra.Command {
159+
cmd := &cobra.Command{
160+
Use: "test-storage",
161+
Short: "test all operations of an external storage",
162+
Long: "Test all ExternalStorage operations including read, write, delete, " +
163+
"rename, walk, and streaming operations. This helps verify storage " +
164+
"configuration and permissions before using it for backup/restore.",
165+
Args: cobra.NoArgs,
166+
RunE: func(cmd *cobra.Command, args []string) error {
167+
cfg := operator.TestStorageConfig{}
168+
if err := cfg.ParseFromFlags(cmd.Flags()); err != nil {
169+
return err
170+
}
171+
ctx := GetDefaultContext()
172+
return operator.RunTestStorage(ctx, cfg)
173+
},
174+
}
175+
operator.DefineFlagsForTestStorageConfig(cmd.Flags())
176+
return cmd
177+
}

br/pkg/aws/BUILD.bazel

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@ go_library(
88
deps = [
99
"//br/pkg/config",
1010
"//br/pkg/glue",
11-
"//br/pkg/logutil",
1211
"//br/pkg/utils",
1312
"//pkg/util",
14-
"@com_github_aws_aws_sdk_go//aws",
15-
"@com_github_aws_aws_sdk_go//aws/awserr",
16-
"@com_github_aws_aws_sdk_go//aws/client",
17-
"@com_github_aws_aws_sdk_go//aws/request",
18-
"@com_github_aws_aws_sdk_go//aws/session",
19-
"@com_github_aws_aws_sdk_go//service/cloudwatch",
20-
"@com_github_aws_aws_sdk_go//service/ec2",
21-
"@com_github_aws_aws_sdk_go//service/ec2/ec2iface",
13+
"@com_github_aws_aws_sdk_go_v2//aws",
14+
"@com_github_aws_aws_sdk_go_v2_config//:config",
15+
"@com_github_aws_aws_sdk_go_v2_service_cloudwatch//:cloudwatch",
16+
"@com_github_aws_aws_sdk_go_v2_service_cloudwatch//types",
17+
"@com_github_aws_aws_sdk_go_v2_service_ec2//:ec2",
18+
"@com_github_aws_aws_sdk_go_v2_service_ec2//types",
19+
"@com_github_aws_smithy_go//:smithy-go",
2220
"@com_github_pingcap_errors//:errors",
2321
"@com_github_pingcap_log//:log",
2422
"@org_golang_x_sync//errgroup",
@@ -35,9 +33,10 @@ go_test(
3533
flaky = True,
3634
shard_count = 3,
3735
deps = [
38-
"@com_github_aws_aws_sdk_go//aws",
39-
"@com_github_aws_aws_sdk_go//service/ec2",
40-
"@com_github_aws_aws_sdk_go//service/ec2/ec2iface",
36+
"@com_github_aws_aws_sdk_go_v2//aws",
37+
"@com_github_aws_aws_sdk_go_v2_service_ec2//:ec2",
38+
"@com_github_aws_aws_sdk_go_v2_service_ec2//types",
39+
"@com_github_pingcap_errors//:errors",
4140
"@com_github_stretchr_testify//require",
4241
],
4342
)

0 commit comments

Comments
 (0)