mirrors/tailscale
1
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

Replace AWS SDK v1 dependency with v2

Browse Source 
This change drops AWS SDKv1 dependency, leaving only SDK v2 in use.

Closes #3461

Signed-off-by: Artyom Pervukhin <github@artyom.dev>
This commit is contained in:
Artyom Pervukhin
2021-12-01 13:10:32 +03:00
committed by Brad Fitzpatrick
parent 56c72d9cde
commit 49a9e62d58
3 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
tstest/integration/vms/vm_setup_test.go
View File

@ -9,6 +9,7 @@ package vms
import (
"bytes"
"context"
"crypto/sha256"
"encoding/hex"
"fmt"
@ -23,10 +24,10 @@ import (
"strings"
"testing"
"github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"
"github.com/aws/aws-sdk-go/service/s3/s3manager"
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/feature/s3/manager"
"github.com/aws/aws-sdk-go-v2/service/s3"
"github.com/pkg/sftp"
"golang.org/x/crypto/ssh"
"tailscale.com/types/logger"
@ -171,21 +172,19 @@ func fetchFromS3(t *testing.T, fout *os.File, d Distro) bool {
return false
}
sess, err := session.NewSession(&aws.Config{
Region: aws.String("us-east-1"),
})
cfg, err := config.LoadDefaultConfig(context.TODO(), config.WithRegion("us-east-1"))
if err != nil {
t.Logf("can't make AWS session: %v", err)
t.Logf("can't load AWS credentials: %v", err)
return false
}
dler := s3manager.NewDownloader(sess, func(d *s3manager.Downloader) {
dler := manager.NewDownloader(s3.NewFromConfig(cfg), func(d *manager.Downloader) {
d.PartSize = 64 * 1024 * 1024 // 64MB per part
})
t.Logf("fetching s3://%s/%s", bucketName, d.SHA256Sum)
_, err = dler.Download(fout, &s3.GetObjectInput{
_, err = dler.Download(context.TODO(), fout, &s3.GetObjectInput{
Bucket: aws.String(bucketName),
Key: aws.String(d.SHA256Sum),
})