From a8e6c2845fb2aed236437f5a30c6356aa876b288 Mon Sep 17 00:00:00 2001 From: Mahmood Ali Date: Fri, 27 Sep 2019 09:01:36 -0400 Subject: [PATCH] Fix hashicorp/go-msgpack import Golang 1.13 is pickier with importpaths and aliasing and fails compilation currently. Here, for go-msgpack dependency, we use upstream ugorji/go with a single change https://github.com/ugorji/go/commit/23165f7bc3c2dda1891434ebb9da1511a7bafc1c . For consistency and to ease noticing descripency, I made ugorji/go and hashicorp/go-msgpack reference the same sha. This is a dependency management update and has no functional change to product. --- .../github.com/hashicorp/go-msgpack/codec/0_importpath.go | 7 ------- vendor/github.com/ugorji/go/codec/0_importpath.go | 7 ------- vendor/vendor.json | 4 ++-- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 vendor/github.com/hashicorp/go-msgpack/codec/0_importpath.go delete mode 100644 vendor/github.com/ugorji/go/codec/0_importpath.go diff --git a/vendor/github.com/hashicorp/go-msgpack/codec/0_importpath.go b/vendor/github.com/hashicorp/go-msgpack/codec/0_importpath.go deleted file mode 100644 index adbe862c2..000000000 --- a/vendor/github.com/hashicorp/go-msgpack/codec/0_importpath.go +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012-2018 Ugorji Nwoke. All rights reserved. -// Use of this source code is governed by a MIT license found in the LICENSE file. - -package codec // import "github.com/ugorji/go/codec" - -// This establishes that this package must be imported as github.com/ugorji/go/codec. -// It makes forking easier, and plays well with pre-module releases of go. diff --git a/vendor/github.com/ugorji/go/codec/0_importpath.go b/vendor/github.com/ugorji/go/codec/0_importpath.go deleted file mode 100644 index adbe862c2..000000000 --- a/vendor/github.com/ugorji/go/codec/0_importpath.go +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2012-2018 Ugorji Nwoke. All rights reserved. -// Use of this source code is governed by a MIT license found in the LICENSE file. - -package codec // import "github.com/ugorji/go/codec" - -// This establishes that this package must be imported as github.com/ugorji/go/codec. -// It makes forking easier, and plays well with pre-module releases of go. diff --git a/vendor/vendor.json b/vendor/vendor.json index a4f7bf327..74c00bebe 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -212,7 +212,7 @@ {"path":"github.com/hashicorp/go-hclog","checksumSHA1":"dOP7kCX3dACHc9mU79826N411QA=","revision":"ff2cf002a8dd750586d91dddd4470c341f981fe1","revisionTime":"2018-07-09T16:53:50Z"}, {"path":"github.com/hashicorp/go-immutable-radix","checksumSHA1":"Cas2nprG6pWzf05A2F/OlnjUu2Y=","revision":"8aac2701530899b64bdea735a1de8da899815220","revisionTime":"2017-07-25T22:12:15Z"}, {"path":"github.com/hashicorp/go-memdb","checksumSHA1":"FMAvwDar2bQyYAW4XMFhAt0J5xA=","revision":"20ff6434c1cc49b80963d45bf5c6aa89c78d8d57","revisionTime":"2017-08-31T20:15:40Z"}, - {"path":"github.com/hashicorp/go-msgpack/codec","checksumSHA1":"LrGV93iKiRWNSxItKr6Os6zC1T8=","origin":"github.com/ugorji/go/codec","revision":"08f7b401aef15f3d544472dd46bf6788cdfe55bf","revisionTime":"2019-05-07T20:14:01Z"}, + {"path":"github.com/hashicorp/go-msgpack/codec","checksumSHA1":"CKGYNUDKre3Z2g4hHNVfp5nTcfA=","revision":"23165f7bc3c2dda1891434ebb9da1511a7bafc1c","revisionTime":"2019-09-27T12:33:13Z","version":"upstream-08f7b40","versionExact":"upstream-08f7b40"}, {"path":"github.com/hashicorp/go-multierror","checksumSHA1":"lrSl49G23l6NhfilxPM0XFs5rZo=","revision":"d30f09973e19c1dfcd120b2d9c4f168e68d6b5d5"}, {"path":"github.com/hashicorp/go-plugin","checksumSHA1":"IFwYSAmxxM+fV0w9LwdWKqFOCgg=","revision":"f444068e8f5a19853177f7aa0aea7e7d95b5b528","revisionTime":"2018-12-12T15:08:38Z"}, {"path":"github.com/hashicorp/go-plugin/internal/proto","checksumSHA1":"Ikbb1FngsPR79bHhr2UmKk4CblI=","revision":"f444068e8f5a19853177f7aa0aea7e7d95b5b528","revisionTime":"2018-12-12T15:08:38Z"}, @@ -387,7 +387,7 @@ {"path":"github.com/testify/require","revision":"v1.4.0","version":"v1.4.0"}, {"path":"github.com/tonnerre/golang-text","checksumSHA1":"t24KnvC9jRxiANVhpw2pqFpmEu8=","revision":"048ed3d792f7104850acbc8cfc01e5a6070f4c04","revisionTime":"2013-09-25T19:58:46Z"}, {"path":"github.com/tv42/httpunix","checksumSHA1":"2xcr/mhxBFlDjpxe/Mc2Wb4RGR8=","revision":"b75d8614f926c077e48d85f1f8f7885b758c6225","revisionTime":"2015-04-27T01:28:21Z"}, - {"path":"github.com/ugorji/go/codec","checksumSHA1":"RBRh7hUVcoELofg7TinPuBUG/po=","revision":"08f7b401aef15f3d544472dd46bf6788cdfe55bf","revisionTime":"2019-05-07T20:14:01Z"}, + {"path":"github.com/ugorji/go/codec","checksumSHA1":"BaMPvSu4aGZBucY5nV5jEUu3XWs=","origin":"github.com/hashicorp/go-msgpack/codec","revision":"23165f7bc3c2dda1891434ebb9da1511a7bafc1c","revisionTime":"2019-09-27T12:33:13Z","version":"upstream-08f7b40","versionExact":"upstream-08f7b40"}, {"path":"github.com/ulikunitz/xz","checksumSHA1":"qgMa75aMGbkFY0jIqqqgVnCUoNA=","revision":"0c6b41e72360850ca4f98dc341fd999726ea007f","revisionTime":"2017-06-05T21:53:11Z"}, {"path":"github.com/ulikunitz/xz/internal/hash","checksumSHA1":"vjnTkzNrMs5Xj6so/fq0mQ6dT1c=","revision":"0c6b41e72360850ca4f98dc341fd999726ea007f","revisionTime":"2017-06-05T21:53:11Z"}, {"path":"github.com/ulikunitz/xz/internal/xlog","checksumSHA1":"m0pm57ASBK/CTdmC0ppRHO17mBs=","revision":"0c6b41e72360850ca4f98dc341fd999726ea007f","revisionTime":"2017-06-05T21:53:11Z"},