From d1b09fc601b562fe771f7262162ccacbf251d5ee Mon Sep 17 00:00:00 2001 From: Derrick Burns Date: Wed, 3 Apr 2019 18:11:09 -0700 Subject: [PATCH] Use new version of go-common. --- .gitignore | 2 +- Gopkg.lock | 10 +++++----- .../aws/aws-sdk-go/aws/awsutil/equal.go | 2 +- .../aws/aws-sdk-go/aws/endpoints/defaults.go | 20 +++++++++++++++++++ .../github.com/aws/aws-sdk-go/aws/version.go | 2 +- .../go-common/clients/shoreline/shoreline.go | 2 ++ 6 files changed, 30 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c6e8634d8..ecf5de02b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ deploy/ dist/ - +hydrophone artifact_go.sh diff --git a/Gopkg.lock b/Gopkg.lock index 2940874c2..638f7ec6a 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,7 +2,7 @@ [[projects]] - digest = "1:09a551e015616c8d6f8c0b21821d220a1c665eff2b77531251c7c3ea1dd0e0f6" + digest = "1:dfbaef49cec8445748822346a7cf949c06339eb6effad4eb71cbfcb2d8fc9086" name = "github.com/aws/aws-sdk-go" packages = [ "aws", @@ -37,8 +37,8 @@ "service/sts", ] pruneopts = "UT" - revision = "bae168494294b48b3fc9d6722a711246a8543034" - version = "v1.19.2" + revision = "97ab38e1626747eaa660ff7e5e7d3f1a37172b36" + version = "v1.19.9" [[projects]] digest = "1:ca59b1175189b3f0e9f1793d2c350114be36eaabbe5b9f554b35edee1de50aea" @@ -57,7 +57,7 @@ [[projects]] branch = "master" - digest = "1:f843fd15ea011f9d4e8bafa4c0d01c00f307b57da558e0a3b8e6dc8148aa26aa" + digest = "1:8d2948d501e8fdc1eac0c4d2c1aeed8a7a8d5f3de5a35c7bb410d74923bece77" name = "github.com/tidepool-org/go-common" packages = [ ".", @@ -72,7 +72,7 @@ "jepson", ] pruneopts = "UT" - revision = "28539d5d0ecdf8749c3f4c3197969b9a5b84331b" + revision = "917f1c799174c7d00c672467c2e0de79378f9bf4" [[projects]] branch = "(default)" diff --git a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go index 59fa4a558..142a7a01c 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/awsutil/equal.go @@ -15,7 +15,7 @@ func DeepEqual(a, b interface{}) bool { rb := reflect.Indirect(reflect.ValueOf(b)) if raValid, rbValid := ra.IsValid(), rb.IsValid(); !raValid && !rbValid { - // If the elements are both nil, and of the same type the are equal + // If the elements are both nil, and of the same type they are equal // If they are of different types they are not equal return reflect.TypeOf(a) == reflect.TypeOf(b) } else if raValid != rbValid { diff --git a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go index 4a2277917..d020c66c2 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/endpoints/defaults.go @@ -440,6 +440,7 @@ var awsPartition = partition{ "ap-south-1": endpoint{}, "ap-southeast-1": endpoint{}, "ap-southeast-2": endpoint{}, + "ca-central-1": endpoint{}, "eu-central-1": endpoint{}, "eu-west-1": endpoint{}, "eu-west-2": endpoint{}, @@ -1755,6 +1756,25 @@ var awsPartition = partition{ "us-east-1": endpoint{}, }, }, + "mediaconnect": service{ + + Endpoints: endpoints{ + "ap-northeast-1": endpoint{}, + "ap-northeast-2": endpoint{}, + "ap-south-1": endpoint{}, + "ap-southeast-1": endpoint{}, + "ap-southeast-2": endpoint{}, + "eu-central-1": endpoint{}, + "eu-west-1": endpoint{}, + "eu-west-2": endpoint{}, + "eu-west-3": endpoint{}, + "sa-east-1": endpoint{}, + "us-east-1": endpoint{}, + "us-east-2": endpoint{}, + "us-west-1": endpoint{}, + "us-west-2": endpoint{}, + }, + }, "mediaconvert": service{ Endpoints: endpoints{ diff --git a/vendor/github.com/aws/aws-sdk-go/aws/version.go b/vendor/github.com/aws/aws-sdk-go/aws/version.go index cb36d3bcc..d22b3a458 100644 --- a/vendor/github.com/aws/aws-sdk-go/aws/version.go +++ b/vendor/github.com/aws/aws-sdk-go/aws/version.go @@ -5,4 +5,4 @@ package aws const SDKName = "aws-sdk-go" // SDKVersion is the version of this SDK -const SDKVersion = "1.19.2" +const SDKVersion = "1.19.9" diff --git a/vendor/github.com/tidepool-org/go-common/clients/shoreline/shoreline.go b/vendor/github.com/tidepool-org/go-common/clients/shoreline/shoreline.go index 6df09964c..56722090f 100644 --- a/vendor/github.com/tidepool-org/go-common/clients/shoreline/shoreline.go +++ b/vendor/github.com/tidepool-org/go-common/clients/shoreline/shoreline.go @@ -324,6 +324,7 @@ func (client *ShorelineClient) CheckToken(token string) *TokenData { log.Println("Error checking token", err) return nil } + defer res.Body.Close() switch res.StatusCode { case 200: @@ -409,6 +410,7 @@ func (client *ShorelineClient) UpdateUser(userID string, userUpdate UserUpdate, if err != nil { return errors.Wrap(err, "Failure to get a user") } + defer res.Body.Close() switch res.StatusCode { case http.StatusOK: