aws: Drop support for AWS SDK v1 in everything except docstore. (#3534)

Author: vangent

blob/s3blob/example_test.go

@@ -18,10 +18,8 @@ import (
 	"context"
 	"log"
 
-	awsv2cfg "github.com/aws/aws-sdk-go-v2/config"
-	s3v2 "github.com/aws/aws-sdk-go-v2/service/s3"
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/session"
+	"github.com/aws/aws-sdk-go-v2/config"
+	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"gocloud.dev/blob"
 	"gocloud.dev/blob/s3blob"
 )
@@ -31,39 +29,16 @@ func ExampleOpenBucket() {
 	// PRAGMA: On gocloud.dev, hide lines until the next blank line.
 	ctx := context.Background()
 
-	// Establish an AWS session.
-	// See https://docs.aws.amazon.com/sdk-for-go/api/aws/session/ for more info.
-	// The region must match the region for "my-bucket".
-	sess, err := session.NewSession(&aws.Config{
-		Region: aws.String("us-west-1"),
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Create a *blob.Bucket.
-	bucket, err := s3blob.OpenBucket(ctx, sess, "my-bucket", nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer bucket.Close()
-}
-
-func ExampleOpenBucketV2() {
-	// PRAGMA: This example is used on gocloud.dev; PRAGMA comments adjust how it is shown and can be ignored.
-	// PRAGMA: On gocloud.dev, hide lines until the next blank line.
-	ctx := context.Background()
-
-	// Establish a AWS V2 Config.
+	// Establish a AWS Config.
 	// See https://aws.github.io/aws-sdk-go-v2/docs/configuring-sdk/ for more info.
-	cfg, err := awsv2cfg.LoadDefaultConfig(ctx)
+	cfg, err := config.LoadDefaultConfig(ctx)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Create a *blob.Bucket.
-	clientV2 := s3v2.NewFromConfig(cfg)
-	bucket, err := s3blob.OpenBucketV2(ctx, clientV2, "my-bucket", nil)
+	client := s3.NewFromConfig(cfg)
+	bucket, err := s3blob.OpenBucket(ctx, client, "my-bucket", nil)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -82,11 +57,4 @@ func Example_openBucketFromURL() {
 		log.Fatal(err)
 	}
 	defer bucket.Close()
-
-	// Forcing AWS SDK V2.
-	bucket, err = blob.OpenBucket(ctx, "s3://my-bucket?region=us-west-1&awssdk=v2")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer bucket.Close()
 }