mirror of
https://github.com/aptly-dev/aptly.git
synced 2026-06-01 04:40:38 +00:00
Update Go AWS SDK to the latest version
This commit is contained in:
Andrey Smirnov
committed by
Andrey Smirnov
Andrey Smirnov
parent
d08be990ef
commit
94a72b23ff
+200
-69
@@ -1,3 +1,5 @@
|
||||
// +build go1.9
|
||||
|
||||
package rds
|
||||
|
||||
import (
|
||||
@@ -5,7 +7,6 @@ import (
|
||||
"io/ioutil"
|
||||
"net/url"
|
||||
"regexp"
|
||||
"strings"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
@@ -15,8 +16,7 @@ import (
|
||||
"github.com/aws/aws-sdk-go/awstesting/unit"
|
||||
)
|
||||
|
||||
func TestPresignWithPresignNotSet(t *testing.T) {
|
||||
reqs := map[string]*request.Request{}
|
||||
func TestCopyDBSnapshotNoPanic(t *testing.T) {
|
||||
svc := New(unit.Session, &aws.Config{Region: aws.String("us-west-2")})
|
||||
|
||||
f := func() {
|
||||
@@ -27,70 +27,180 @@ func TestPresignWithPresignNotSet(t *testing.T) {
|
||||
if paniced, p := awstesting.DidPanic(f); paniced {
|
||||
t.Errorf("expect no panic, got %v", p)
|
||||
}
|
||||
|
||||
reqs[opCopyDBSnapshot], _ = svc.CopyDBSnapshotRequest(&CopyDBSnapshotInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBSnapshotIdentifier: aws.String("bar"),
|
||||
})
|
||||
|
||||
reqs[opCreateDBInstanceReadReplica], _ = svc.CreateDBInstanceReadReplicaRequest(&CreateDBInstanceReadReplicaInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBInstanceIdentifier: aws.String("foo"),
|
||||
DBInstanceIdentifier: aws.String("bar"),
|
||||
})
|
||||
|
||||
for op, req := range reqs {
|
||||
req.Sign()
|
||||
b, _ := ioutil.ReadAll(req.HTTPRequest.Body)
|
||||
q, _ := url.ParseQuery(string(b))
|
||||
|
||||
u, _ := url.QueryUnescape(q.Get("PreSignedUrl"))
|
||||
|
||||
exp := fmt.Sprintf(`^https://rds.us-west-1\.amazonaws\.com/\?Action=%s.+?DestinationRegion=us-west-2.+`, op)
|
||||
if re, a := regexp.MustCompile(exp), u; !re.MatchString(a) {
|
||||
t.Errorf("expect %s to match %s", re, a)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestPresignWithPresignSet(t *testing.T) {
|
||||
reqs := map[string]*request.Request{}
|
||||
svc := New(unit.Session, &aws.Config{Region: aws.String("us-west-2")})
|
||||
func TestPresignCrossRegionRequest(t *testing.T) {
|
||||
const targetRegion = "us-west-2"
|
||||
|
||||
f := func() {
|
||||
// Doesn't panic on nil input
|
||||
req, _ := svc.CopyDBSnapshotRequest(nil)
|
||||
req.Sign()
|
||||
}
|
||||
if paniced, p := awstesting.DidPanic(f); paniced {
|
||||
t.Errorf("expect no panic, got %v", p)
|
||||
svc := New(unit.Session, &aws.Config{Region: aws.String(targetRegion)})
|
||||
|
||||
const regexPattern = `^https://rds.us-west-1\.amazonaws\.com/\?Action=%s.+?DestinationRegion=%s.+`
|
||||
|
||||
cases := map[string]struct {
|
||||
Req *request.Request
|
||||
Assert func(*testing.T, string)
|
||||
}{
|
||||
opCopyDBSnapshot: {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CopyDBSnapshotRequest(&CopyDBSnapshotInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBSnapshotIdentifier: aws.String("bar"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsRegexMatch(fmt.Sprintf(regexPattern,
|
||||
opCopyDBSnapshot, targetRegion)),
|
||||
},
|
||||
opCreateDBInstanceReadReplica: {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CreateDBInstanceReadReplicaRequest(
|
||||
&CreateDBInstanceReadReplicaInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBInstanceIdentifier: aws.String("foo"),
|
||||
DBInstanceIdentifier: aws.String("bar"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsRegexMatch(fmt.Sprintf(regexPattern,
|
||||
opCreateDBInstanceReadReplica, targetRegion)),
|
||||
},
|
||||
opCopyDBClusterSnapshot: {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CopyDBClusterSnapshotRequest(
|
||||
&CopyDBClusterSnapshotInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBClusterSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBClusterSnapshotIdentifier: aws.String("bar"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsRegexMatch(fmt.Sprintf(regexPattern,
|
||||
opCopyDBClusterSnapshot, targetRegion)),
|
||||
},
|
||||
opCreateDBCluster: {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CreateDBClusterRequest(
|
||||
&CreateDBClusterInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
DBClusterIdentifier: aws.String("foo"),
|
||||
Engine: aws.String("bar"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsRegexMatch(fmt.Sprintf(regexPattern,
|
||||
opCreateDBCluster, targetRegion)),
|
||||
},
|
||||
opCopyDBSnapshot + " same region": {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CopyDBSnapshotRequest(&CopyDBSnapshotInput{
|
||||
SourceRegion: aws.String("us-west-2"),
|
||||
SourceDBSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBSnapshotIdentifier: aws.String("bar"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsEmpty(),
|
||||
},
|
||||
opCreateDBInstanceReadReplica + " same region": {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CreateDBInstanceReadReplicaRequest(&CreateDBInstanceReadReplicaInput{
|
||||
SourceRegion: aws.String("us-west-2"),
|
||||
SourceDBInstanceIdentifier: aws.String("foo"),
|
||||
DBInstanceIdentifier: aws.String("bar"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsEmpty(),
|
||||
},
|
||||
opCopyDBClusterSnapshot + " same region": {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CopyDBClusterSnapshotRequest(
|
||||
&CopyDBClusterSnapshotInput{
|
||||
SourceRegion: aws.String("us-west-2"),
|
||||
SourceDBClusterSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBClusterSnapshotIdentifier: aws.String("bar"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsEmpty(),
|
||||
},
|
||||
opCreateDBCluster + " same region": {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CreateDBClusterRequest(
|
||||
&CreateDBClusterInput{
|
||||
SourceRegion: aws.String("us-west-2"),
|
||||
DBClusterIdentifier: aws.String("foo"),
|
||||
Engine: aws.String("bar"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsEmpty(),
|
||||
},
|
||||
opCopyDBSnapshot + " presignURL set": {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CopyDBSnapshotRequest(&CopyDBSnapshotInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBSnapshotIdentifier: aws.String("bar"),
|
||||
PreSignedUrl: aws.String("mockPresignedURL"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsEqual("mockPresignedURL"),
|
||||
},
|
||||
opCreateDBInstanceReadReplica + " presignURL set": {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CreateDBInstanceReadReplicaRequest(&CreateDBInstanceReadReplicaInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBInstanceIdentifier: aws.String("foo"),
|
||||
DBInstanceIdentifier: aws.String("bar"),
|
||||
PreSignedUrl: aws.String("mockPresignedURL"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsEqual("mockPresignedURL"),
|
||||
},
|
||||
opCopyDBClusterSnapshot + " presignURL set": {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CopyDBClusterSnapshotRequest(
|
||||
&CopyDBClusterSnapshotInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBClusterSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBClusterSnapshotIdentifier: aws.String("bar"),
|
||||
PreSignedUrl: aws.String("mockPresignedURL"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsEqual("mockPresignedURL"),
|
||||
},
|
||||
opCreateDBCluster + " presignURL set": {
|
||||
Req: func() *request.Request {
|
||||
req, _ := svc.CreateDBClusterRequest(
|
||||
&CreateDBClusterInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
DBClusterIdentifier: aws.String("foo"),
|
||||
Engine: aws.String("bar"),
|
||||
PreSignedUrl: aws.String("mockPresignedURL"),
|
||||
})
|
||||
return req
|
||||
}(),
|
||||
Assert: assertAsEqual("mockPresignedURL"),
|
||||
},
|
||||
}
|
||||
|
||||
reqs[opCopyDBSnapshot], _ = svc.CopyDBSnapshotRequest(&CopyDBSnapshotInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBSnapshotIdentifier: aws.String("bar"),
|
||||
PreSignedUrl: aws.String("presignedURL"),
|
||||
})
|
||||
for name, c := range cases {
|
||||
t.Run(name, func(t *testing.T) {
|
||||
if err := c.Req.Sign(); err != nil {
|
||||
t.Fatalf("expect no error, got %v", err)
|
||||
}
|
||||
b, _ := ioutil.ReadAll(c.Req.HTTPRequest.Body)
|
||||
q, _ := url.ParseQuery(string(b))
|
||||
|
||||
reqs[opCreateDBInstanceReadReplica], _ = svc.CreateDBInstanceReadReplicaRequest(&CreateDBInstanceReadReplicaInput{
|
||||
SourceRegion: aws.String("us-west-1"),
|
||||
SourceDBInstanceIdentifier: aws.String("foo"),
|
||||
DBInstanceIdentifier: aws.String("bar"),
|
||||
PreSignedUrl: aws.String("presignedURL"),
|
||||
})
|
||||
u, _ := url.QueryUnescape(q.Get("PreSignedUrl"))
|
||||
|
||||
for _, req := range reqs {
|
||||
req.Sign()
|
||||
|
||||
b, _ := ioutil.ReadAll(req.HTTPRequest.Body)
|
||||
q, _ := url.ParseQuery(string(b))
|
||||
|
||||
u, _ := url.QueryUnescape(q.Get("PreSignedUrl"))
|
||||
if e, a := "presignedURL", u; !strings.Contains(a, e) {
|
||||
t.Errorf("expect %s to be in %s", e, a)
|
||||
}
|
||||
c.Assert(t, u)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
@@ -98,15 +208,6 @@ func TestPresignWithSourceNotSet(t *testing.T) {
|
||||
reqs := map[string]*request.Request{}
|
||||
svc := New(unit.Session, &aws.Config{Region: aws.String("us-west-2")})
|
||||
|
||||
f := func() {
|
||||
// Doesn't panic on nil input
|
||||
req, _ := svc.CopyDBSnapshotRequest(nil)
|
||||
req.Sign()
|
||||
}
|
||||
if paniced, p := awstesting.DidPanic(f); paniced {
|
||||
t.Errorf("expect no panic, got %v", p)
|
||||
}
|
||||
|
||||
reqs[opCopyDBSnapshot], _ = svc.CopyDBSnapshotRequest(&CopyDBSnapshotInput{
|
||||
SourceDBSnapshotIdentifier: aws.String("foo"),
|
||||
TargetDBSnapshotIdentifier: aws.String("bar"),
|
||||
@@ -119,3 +220,33 @@ func TestPresignWithSourceNotSet(t *testing.T) {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func assertAsRegexMatch(exp string) func(*testing.T, string) {
|
||||
return func(t *testing.T, v string) {
|
||||
t.Helper()
|
||||
|
||||
if re, a := regexp.MustCompile(exp), v; !re.MatchString(a) {
|
||||
t.Errorf("expect %s to match %s", re, a)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func assertAsEmpty() func(*testing.T, string) {
|
||||
return func(t *testing.T, v string) {
|
||||
t.Helper()
|
||||
|
||||
if len(v) != 0 {
|
||||
t.Errorf("expect empty, got %v", v)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func assertAsEqual(expect string) func(*testing.T, string) {
|
||||
return func(t *testing.T, v string) {
|
||||
t.Helper()
|
||||
|
||||
if e, a := expect, v; e != a {
|
||||
t.Errorf("expect %v, got %v", e, a)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user