Skip to content

Commit db38948

Browse files
committed
aws: Drop support for AWS SDK v1 in everything except docstore.
1 parent ab732c4 commit db38948

File tree

480 files changed

+29916
-133156
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

480 files changed

+29916
-133156
lines changed

blob/s3blob/example_test.go

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ import (
1818
"context"
1919
"log"
2020

21-
awsv2cfg "github.com/aws/aws-sdk-go-v2/config"
22-
s3v2 "github.com/aws/aws-sdk-go-v2/service/s3"
23-
"github.com/aws/aws-sdk-go/aws"
24-
"github.com/aws/aws-sdk-go/aws/session"
21+
"github.com/aws/aws-sdk-go-v2/config"
22+
"github.com/aws/aws-sdk-go-v2/service/s3"
2523
"gocloud.dev/blob"
2624
"gocloud.dev/blob/s3blob"
2725
)
@@ -31,39 +29,16 @@ func ExampleOpenBucket() {
3129
// PRAGMA: On gocloud.dev, hide lines until the next blank line.
3230
ctx := context.Background()
3331

34-
// Establish an AWS session.
35-
// See https://docs.aws.amazon.com/sdk-for-go/api/aws/session/ for more info.
36-
// The region must match the region for "my-bucket".
37-
sess, err := session.NewSession(&aws.Config{
38-
Region: aws.String("us-west-1"),
39-
})
40-
if err != nil {
41-
log.Fatal(err)
42-
}
43-
44-
// Create a *blob.Bucket.
45-
bucket, err := s3blob.OpenBucket(ctx, sess, "my-bucket", nil)
46-
if err != nil {
47-
log.Fatal(err)
48-
}
49-
defer bucket.Close()
50-
}
51-
52-
func ExampleOpenBucketV2() {
53-
// PRAGMA: This example is used on gocloud.dev; PRAGMA comments adjust how it is shown and can be ignored.
54-
// PRAGMA: On gocloud.dev, hide lines until the next blank line.
55-
ctx := context.Background()
56-
57-
// Establish a AWS V2 Config.
32+
// Establish a AWS Config.
5833
// See https://aws.github.io/aws-sdk-go-v2/docs/configuring-sdk/ for more info.
59-
cfg, err := awsv2cfg.LoadDefaultConfig(ctx)
34+
cfg, err := config.LoadDefaultConfig(ctx)
6035
if err != nil {
6136
log.Fatal(err)
6237
}
6338

6439
// Create a *blob.Bucket.
65-
clientV2 := s3v2.NewFromConfig(cfg)
66-
bucket, err := s3blob.OpenBucketV2(ctx, clientV2, "my-bucket", nil)
40+
client := s3.NewFromConfig(cfg)
41+
bucket, err := s3blob.OpenBucket(ctx, client, "my-bucket", nil)
6742
if err != nil {
6843
log.Fatal(err)
6944
}
@@ -82,11 +57,4 @@ func Example_openBucketFromURL() {
8257
log.Fatal(err)
8358
}
8459
defer bucket.Close()
85-
86-
// Forcing AWS SDK V2.
87-
bucket, err = blob.OpenBucket(ctx, "s3://my-bucket?region=us-west-1&awssdk=v2")
88-
if err != nil {
89-
log.Fatal(err)
90-
}
91-
defer bucket.Close()
9260
}

0 commit comments

Comments
 (0)