From ebf9c0bf912d9c2a8a15ddb3766f91b6ba87db69 Mon Sep 17 00:00:00 2001 From: Dale Hui Date: Sat, 21 Jul 2018 01:48:20 -0700 Subject: [PATCH 1/3] Update package dependencies --- Gopkg.lock | 93 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 53 insertions(+), 40 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index da482fe..1916b66 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -26,14 +26,14 @@ [[projects]] name = "github.com/Microsoft/go-winio" packages = ["."] - revision = "7da180ee92d8bd8bb8c37fc560e673e6557c392f" - version = "v0.4.7" + revision = "a6d595ae73cf27a1b8fc32930668708f45ce1c85" + version = "v0.4.9" [[projects]] name = "github.com/Sirupsen/logrus" packages = ["."] - revision = "d26492970760ca5d33129d2d799e34be5c4782eb" - version = "v0.11.0" + revision = "3e01752db0189b9157070a0e1668a620f9a85da2" + version = "v1.0.6" [[projects]] name = "github.com/aws/aws-sdk-go" @@ -48,6 +48,7 @@ "aws/credentials/ec2rolecreds", "aws/credentials/endpointcreds", "aws/credentials/stscreds", + "aws/csm", "aws/defaults", "aws/ec2metadata", "aws/endpoints", @@ -56,8 +57,11 @@ "aws/signer/v4", "internal/sdkio", "internal/sdkrand", + "internal/sdkuri", "internal/shareddefaults", "private/protocol", + "private/protocol/eventstream", + "private/protocol/eventstream/eventstreamapi", "private/protocol/query", "private/protocol/query/queryutil", "private/protocol/rest", @@ -67,8 +71,8 @@ "service/s3/s3iface", "service/sts" ] - revision = "31a85efbe3bc741eb539d6310c8e66030b7c5cb7" - version = "v1.13.47" + revision = "bc3f534c19ffdf835e524e11f0f825b3eaf541c3" + version = "v1.14.31" [[projects]] branch = "master" @@ -141,10 +145,11 @@ [[projects]] name = "github.com/docker/distribution" packages = [ - "digestset", + "digest", "reference" ] - revision = "b38e5838b7b2f2ad48e06ec4b500011976080621" + revision = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89" + version = "v2.6.2" [[projects]] name = "github.com/docker/docker" @@ -180,17 +185,20 @@ "sockets", "tlsconfig" ] - revision = "e15c02316c12de00874640cd76311849de2aeed5" + revision = "3ede32e2033de7505e6500d6c868c2b9ed9f169d" + version = "v0.3.0" [[projects]] name = "github.com/docker/go-units" packages = ["."] - revision = "9e638d38cf6977a37a8ea0078f3ee75a7cdb2dd1" + revision = "47565b4f722fb6ceae66b95f853feed578a4a51c" + version = "v0.3.3" [[projects]] + branch = "master" name = "github.com/docker/libtrust" packages = ["."] - revision = "9cbd2a1374f46905c68a4eb3694a130610adc62a" + revision = "aabc10ec26b754e797f9028f4589c5b7bd90dc20" [[projects]] branch = "master" @@ -207,8 +215,8 @@ [[projects]] name = "github.com/go-ini/ini" packages = ["."] - revision = "6529cf7c58879c08d927016dde4477f18a0634cb" - version = "v1.36.0" + revision = "358ee7663966325963d4e8b2e1fbd570c5195153" + version = "v1.38.1" [[projects]] name = "github.com/go-sql-driver/mysql" @@ -225,7 +233,7 @@ "internal/murmur", "internal/streams" ] - revision = "3c37daec2f4d3def4b3b21668c6c2e80d3265a69" + revision = "e06f8c1bcd787e6bf0608288b314522f08cc7848" [[projects]] name = "github.com/golang/protobuf" @@ -246,7 +254,7 @@ branch = "master" name = "github.com/golang/snappy" packages = ["."] - revision = "553a641470496b2327abcac10b36396bd98e45c9" + revision = "2e65f85255dbc3072edf28d6b5b8efc472979f5a" [[projects]] name = "github.com/google/go-github" @@ -269,8 +277,8 @@ [[projects]] name = "github.com/gorilla/context" packages = ["."] - revision = "1ea25387ff6f684839d82767c1733ff4d4d15d0a" - version = "v1.1" + revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42" + version = "v1.1.1" [[projects]] name = "github.com/gorilla/mux" @@ -310,27 +318,24 @@ ".", "oid" ] - revision = "d34b9ff171c21ad295489235aec8b6626023cd04" + revision = "90697d60dd844d5ef6ff15135d0203f65d2f53b8" [[projects]] name = "github.com/mattn/go-sqlite3" packages = ["."] - revision = "6c771bb9887719704b210e87e934f08be014bdb1" - version = "v1.6.0" - -[[projects]] - name = "github.com/opencontainers/go-digest" - packages = ["."] - revision = "a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb" + revision = "25ecb14adfc7543176f7d85291ec7dba82c6f7e4" + version = "v1.9.0" [[projects]] name = "github.com/pkg/errors" packages = ["."] - revision = "839d9e913e063e28dfd0e6c7b7512793e0a48be9" + revision = "645ef00459ed84a119197bfb8d8205042c6df63d" + version = "v0.8.0" [[projects]] name = "go.opencensus.io" packages = [ + ".", "exporter/stackdriver/propagation", "internal", "internal/tagencoding", @@ -345,8 +350,14 @@ "trace/internal", "trace/propagation" ] - revision = "c3ed530f775d85e577ca652cb052a52c078aad26" - version = "v0.11.0" + revision = "e262766cd0d230a1bb7c37281e345e465f19b41b" + version = "v0.14.0" + +[[projects]] + branch = "master" + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] + revision = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9" [[projects]] branch = "master" @@ -363,7 +374,7 @@ "proxy", "trace" ] - revision = "2491c5de3490fced2f6cff376127c667efeed857" + revision = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1" [[projects]] branch = "master" @@ -375,15 +386,16 @@ "jws", "jwt" ] - revision = "cdc340f7c179dbbfa4afd43b7614e8fcadde4269" + revision = "ef147856a6ddbb60760db74283d2424e98c87bff" [[projects]] + branch = "master" name = "golang.org/x/sys" packages = [ "unix", "windows" ] - revision = "8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9" + revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4" [[projects]] name = "golang.org/x/text" @@ -413,7 +425,7 @@ "godoc/vfs", "godoc/vfs/mapfs" ] - revision = "c06a8d8ed11aae27b08c1c109a509ada9de81240" + revision = "99195f4d4ffa6331a9bc856c72697a15d9842950" [[projects]] branch = "master" @@ -431,7 +443,7 @@ "transport/grpc", "transport/http" ] - revision = "15aea8711db98e640b277da9771a9d74270c2edc" + revision = "efcb5f25ac56eae06c8b5672456c0b7767522685" [[projects]] name = "google.golang.org/appengine" @@ -450,8 +462,8 @@ "socket", "urlfetch" ] - revision = "150dc57a1b433e64154302bdc40b6bb8aefa313a" - version = "v1.0.0" + revision = "b1f26356af11148e710935ed1ac8a7f5702c7612" + version = "v1.1.0" [[projects]] branch = "master" @@ -466,7 +478,7 @@ "googleapis/spanner/admin/database/v1", "googleapis/spanner/v1" ] - revision = "86e600f69ee4704c6efbf6a2a40a5c10700e76c2" + revision = "fedd2861243fd1a8152376292b921b394c7bef7e" [[projects]] name = "google.golang.org/grpc" @@ -475,16 +487,17 @@ "balancer", "balancer/base", "balancer/roundrobin", - "channelz", "codes", "connectivity", "credentials", "credentials/oauth", "encoding", "encoding/proto", - "grpclb/grpc_lb_v1/messages", "grpclog", "internal", + "internal/backoff", + "internal/channelz", + "internal/grpcrand", "keepalive", "metadata", "naming", @@ -497,8 +510,8 @@ "tap", "transport" ] - revision = "41344da2231b913fa3d983840a57a6b1b7b631a1" - version = "v1.12.0" + revision = "168a6198bcb0ef175f7dacec0b8691fc141dc9b8" + version = "v1.13.0" [[projects]] name = "gopkg.in/inf.v0" From ffcbbd5fea6ca089269c970249afab7c6db0c744 Mon Sep 17 00:00:00 2001 From: Dale Hui Date: Sat, 21 Jul 2018 02:31:58 -0700 Subject: [PATCH 2/3] Override dependency on docker/distribution to fix build https://github.com/golang/dep/issues/1890#issuecomment-404036309 --- Gopkg.lock | 14 ++++++++++---- Gopkg.toml | 4 ++++ 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 1916b66..34b9779 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -143,13 +143,13 @@ revision = "2533cb5b45cc6c07421468ce262899ddc9d53fb7" [[projects]] + branch = "master" name = "github.com/docker/distribution" packages = [ - "digest", + "digestset", "reference" ] - revision = "48294d928ced5dd9b378f7fd7c6f5da3ff3f2c89" - version = "v2.6.2" + revision = "0dae0957e5fe3156c265d22bef4cba9efbf388e2" [[projects]] name = "github.com/docker/docker" @@ -326,6 +326,12 @@ revision = "25ecb14adfc7543176f7d85291ec7dba82c6f7e4" version = "v1.9.0" +[[projects]] + name = "github.com/opencontainers/go-digest" + packages = ["."] + revision = "279bed98673dd5bef374d3b6e4b09e2af76183bf" + version = "v1.0.0-rc1" + [[projects]] name = "github.com/pkg/errors" packages = ["."] @@ -522,6 +528,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "7ee6325e2189d621cfa0b4ab393ceaf53b863fc53d805567100f9abbd991792d" + inputs-digest = "9096636db76a3fa5e1b6fae202bfd3d6462ad4b50d90a1493b586d90891ba0ab" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index bb0d8d9..daa3e0b 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -89,6 +89,10 @@ branch = "master" name = "golang.org/x/tools" +[[override]] + branch = "master" + name = "github.com/docker/distribution" + [prune] go-tests = true unused-packages = true From c7a29e331ffa78a9088fe3337b20324e7232eadc Mon Sep 17 00:00:00 2001 From: Dale Hui Date: Tue, 24 Jul 2018 18:19:22 -0700 Subject: [PATCH 3/3] Another round of package updates couldn't hurt... --- Gopkg.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 34b9779..468ad00 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -71,8 +71,8 @@ "service/s3/s3iface", "service/sts" ] - revision = "bc3f534c19ffdf835e524e11f0f825b3eaf541c3" - version = "v1.14.31" + revision = "468b9714c11f10b22e533253b35eb9c28f4be691" + version = "v1.14.32" [[projects]] branch = "master" @@ -363,7 +363,7 @@ branch = "master" name = "golang.org/x/crypto" packages = ["ssh/terminal"] - revision = "a2144134853fc9a27a7b1e3eb4f19f1a76df13c9" + revision = "c126467f60eb25f8f27e5a981f32a87e3965053f" [[projects]] branch = "master" @@ -380,7 +380,7 @@ "proxy", "trace" ] - revision = "a680a1efc54dd51c040b3b5ce4939ea3cf2ea0d1" + revision = "3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd" [[projects]] branch = "master" @@ -392,7 +392,7 @@ "jws", "jwt" ] - revision = "ef147856a6ddbb60760db74283d2424e98c87bff" + revision = "3d292e4d0cdc3a0113e6d207bb137145ef1de42f" [[projects]] branch = "master" @@ -401,7 +401,7 @@ "unix", "windows" ] - revision = "ac767d655b305d4e9612f5f6e33120b9176c4ad4" + revision = "e072cadbbdc8dd3d3ffa82b8b4b9304c261d9311" [[projects]] name = "golang.org/x/text" @@ -431,7 +431,7 @@ "godoc/vfs", "godoc/vfs/mapfs" ] - revision = "99195f4d4ffa6331a9bc856c72697a15d9842950" + revision = "526516e9c4bf5a3f76fe506dec01ca51d04cbe50" [[projects]] branch = "master" @@ -449,7 +449,7 @@ "transport/grpc", "transport/http" ] - revision = "efcb5f25ac56eae06c8b5672456c0b7767522685" + revision = "2c45710c7f3fb0ab63506810a1ba84325ab90ab8" [[projects]] name = "google.golang.org/appengine" @@ -484,7 +484,7 @@ "googleapis/spanner/admin/database/v1", "googleapis/spanner/v1" ] - revision = "fedd2861243fd1a8152376292b921b394c7bef7e" + revision = "02b4e95473316948020af0b7a4f0f22c73929b0e" [[projects]] name = "google.golang.org/grpc"