Update vendored deps, including AWS SDK, openpgp, ftp, ...

vendor/github.com/aws/aws-sdk-go/service/ec2/customizations_test.go

@@ -3,22 +3,27 @@ package ec2_test
 import (
 	"io/ioutil"
 	"net/url"
+	"regexp"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/awstesting/unit"
 	"github.com/aws/aws-sdk-go/service/ec2"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestCopySnapshotPresignedURL(t *testing.T) {
 	svc := ec2.New(unit.Session, &aws.Config{Region: aws.String("us-west-2")})
 
-	assert.NotPanics(t, func() {
+	func() {
+		defer func() {
+			if r := recover(); r != nil {
+				t.Fatalf("expect CopySnapshotRequest with nill")
+			}
+		}()
 		// Doesn't panic on nil input
 		req, _ := svc.CopySnapshotRequest(nil)
 		req.Sign()
-	})
+	}()
 
 	req, _ := svc.CopySnapshotRequest(&ec2.CopySnapshotInput{
 		SourceRegion:     aws.String("us-west-1"),
@@ -29,7 +34,15 @@ func TestCopySnapshotPresignedURL(t *testing.T) {
 	b, _ := ioutil.ReadAll(req.HTTPRequest.Body)
 	q, _ := url.ParseQuery(string(b))
 	u, _ := url.QueryUnescape(q.Get("PresignedUrl"))
-	assert.Equal(t, "us-west-2", q.Get("DestinationRegion"))
-	assert.Equal(t, "us-west-1", q.Get("SourceRegion"))
-	assert.Regexp(t, `^https://ec2\.us-west-1\.amazonaws\.com/.+&DestinationRegion=us-west-2`, u)
+	if e, a := "us-west-2", q.Get("DestinationRegion"); e != a {
+		t.Errorf("expect %v, got %v", e, a)
+	}
+	if e, a := "us-west-1", q.Get("SourceRegion"); e != a {
+		t.Errorf("expect %v, got %v", e, a)
+	}
+
+	r := regexp.MustCompile(`^https://ec2\.us-west-1\.amazonaws\.com/.+&DestinationRegion=us-west-2`)
+	if !r.MatchString(u) {
+		t.Errorf("expect %v to match, got %v", r.String(), u)
+	}
 }