From 464c857d489eb19370dd6583fc8e8529875f4d3b Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Mon, 9 Sep 2019 15:09:31 +0200 Subject: [PATCH] Use a older version of thrift Since the newest one would not work with go1.13 Not sure if i understand everyhting but it seems to work on 1.12 and 1.13 (and that's what they do as well here https://github.com/hashicorp/terraform/issues/22664#issuecomment-527682256) Closes #298 Signed-off-by: Chmouel Boudjnah Signed-off-by: Vincent Demeester --- go.mod | 8 +------- go.sum | 1 + 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 375c9fcaf..02df94344 100644 --- a/go.mod +++ b/go.mod @@ -18,8 +18,6 @@ require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/evanphx/json-patch v4.1.0+incompatible // indirect github.com/fatih/color v1.7.0 - github.com/ghodss/yaml v1.0.0 // indirect - github.com/gogo/protobuf v1.2.0 // indirect github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect github.com/google/go-cmp v0.3.1 github.com/google/go-containerregistry v0.0.0-20190320210540-8d4083db9aa0 // indirect @@ -37,11 +35,8 @@ require ( github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect - github.com/onsi/ginkgo v1.7.0 // indirect - github.com/onsi/gomega v1.4.3 // indirect github.com/peterbourgon/diskv v2.0.1+incompatible // indirect github.com/pkg/errors v0.8.1 - github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829 // indirect github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect github.com/prometheus/procfs v0.0.0-20190322151404-55ae3d9d5573 // indirect github.com/spf13/cobra v0.0.5 @@ -55,7 +50,6 @@ require ( golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 // indirect google.golang.org/appengine v1.5.0 // indirect google.golang.org/grpc v1.19.1 // indirect - gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect k8s.io/api v0.0.0-20190226173710-145d52631d00 k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc k8s.io/cli-runtime v0.0.0-20190325194458-f2b4781c3ae1 @@ -71,4 +65,4 @@ replace github.com/kr/pty => github.com/creack/pty v1.1.7 replace github.com/spf13/cobra => github.com/chmouel/cobra v0.0.0-20190820110723-8f09bb39b20d -replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0 +replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999 diff --git a/go.sum b/go.sum index a0e06cbdb..1878deb86 100644 --- a/go.sum +++ b/go.sum @@ -27,6 +27,7 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= github.com/aws/aws-sdk-go v1.15.31/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=