Fix broken hashicorp dependencies (#36)

Signed-off-by: Sotirios Mantziaris <[email protected]>

.circleci/config.yml

@@ -16,7 +16,7 @@ jobs:
           command: |
             wget https://releases.hashicorp.com/consul/1.4.3/consul_1.4.3_linux_amd64.zip
             unzip "consul_1.4.3_linux_amd64.zip"
-            ./consul agent -server -bootstrap-expect 1 -data-dir /tmp/consul -dev -bind=$(hostname -I | awk '{print $1}' | xargs) -http-port 8501 -log-level=err &
+            ./consul agent -server -bootstrap-expect 1 -data-dir /tmp/consul -dev -bind=$(hostname -I | awk '{print $1}' | xargs) -http-port 8500 -log-level=err &
             curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.15.0
       
       - run:

Makefile

@@ -30,12 +30,9 @@ ci: fmtcheck lint
 	export CODECOV_TOKEN="34285c03-89af-4ff3-af0b-c846a6f43244"
 	curl -s https://codecov.io/bash | bash -s
 
-local-k8s-portfwd:
-	@sh -c "'$(CURDIR)/scripts/k8s_port_forward_local.sh'"
-
 # disallow any parallelism (-j) for Make. This is necessary since some
 # commands during the build process create temporary files that collide
 # under parallel conditions.
 .NOTPARALLEL:
 
-.PHONY: default test testint cover fmt fmtcheck lint deeplint ci local-k8s-portfwd
+.PHONY: default test testint cover fmt fmtcheck lint deeplint ci

docker-compose.yml

@@ -0,0 +1,19 @@
+version: '2'
+
+networks:
+  consul-network:
+    driver: bridge
+
+services:
+  consul:
+    container_name: harvester_consul_dev
+    image: bitnami/consul:1.4.3
+    networks:
+      - consul-network
+    ports:
+      - '8300:8300'
+      - '8301:8301'
+      - '8301:8301/udp'
+      - '8500:8500'
+      - '8600:8600'
+      - '8600:8600/udp'

go.mod

@@ -1,93 +1,8 @@
 module github.com/beatlabs/harvester
 
-go 1.12
-
-replace git.apache.org/thrift.git => github.com/apache/thrift v0.12.0
+go 1.13
 
 require (
-	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
-	github.com/Microsoft/go-winio v0.4.12 // indirect
-	github.com/NYTimes/gziphandler v1.1.1 // indirect
-	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
-	github.com/SAP/go-hdb v0.14.1 // indirect
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61 // indirect
-	github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
-	github.com/armon/go-radix v1.0.0 // indirect
-	github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
-	github.com/boltdb/bolt v1.3.1 // indirect
-	github.com/cenkalti/backoff v2.1.1+incompatible // indirect
-	github.com/chrismalek/oktasdk-go v0.0.0-20181212195951-3430665dfaa0 // indirect
-	github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc // indirect
-	github.com/coredns/coredns v1.5.0 // indirect
-	github.com/dancannon/gorethink v4.0.0+incompatible // indirect
-	github.com/denisenkom/go-mssqldb v0.0.0-20190515213511-eb9f6a1743f3 // indirect
-	github.com/dnaeon/go-vcr v1.0.1 // indirect
-	github.com/docker/go-connections v0.4.0 // indirect
-	github.com/duosecurity/duo_api_golang v0.0.0-20190308151101-6c680f768e74 // indirect
-	github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect
-	github.com/envoyproxy/go-control-plane v0.8.0 // indirect
-	github.com/fullsailor/pkcs7 v0.0.0-20190404230743-d7302db945fa // indirect
-	github.com/garyburd/redigo v1.6.0 // indirect
-	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/go-sql-driver/mysql v1.4.1 // indirect
-	github.com/go-stomp/stomp v2.0.3+incompatible // indirect
-	github.com/gocql/gocql v0.0.0-20190523124812-0680bfb96414 // indirect
-	github.com/gogo/googleapis v1.2.0 // indirect
-	github.com/google/go-github v17.0.0+incompatible // indirect
-	github.com/google/gofuzz v1.0.0 // indirect
-	github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
-	github.com/hashicorp/consul v1.4.4
-	github.com/hashicorp/go-discover v0.0.0-20190522154730-8aba54d36e17 // indirect
-	github.com/hashicorp/go-memdb v1.0.3 // indirect
-	github.com/hashicorp/go-version v1.2.0 // indirect
-	github.com/hashicorp/hil v0.0.0-20190212132231-97b3a9cdfa93 // indirect
-	github.com/hashicorp/memberlist v0.1.4 // indirect
-	github.com/hashicorp/net-rpc-msgpackrpc v0.0.0-20151116020338-a14192a58a69 // indirect
-	github.com/hashicorp/nomad/api v0.0.0-20190531195913-9349f48e9cc1 // indirect
-	github.com/hashicorp/raft v1.1.0 // indirect
-	github.com/hashicorp/raft-boltdb v0.0.0-20171010151810-6e5ba93211ea // indirect
-	github.com/hashicorp/serf v0.8.3 // indirect
-	github.com/hashicorp/vault v1.1.2 // indirect
-	github.com/hashicorp/vault-plugin-auth-alicloud v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-azure v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-centrify v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-jwt v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-auth-kubernetes v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-ad v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-alicloud v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-azure v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-gcp v0.5.2 // indirect
-	github.com/hashicorp/vault-plugin-secrets-gcpkms v0.5.1 // indirect
-	github.com/hashicorp/vault-plugin-secrets-kv v0.5.1 // indirect
-	github.com/influxdata/influxdb v1.7.6 // indirect
-	github.com/jefferai/jsonx v1.0.0 // indirect
-	github.com/keybase/go-crypto v0.0.0-20190416182011-b785b22cc757 // indirect
-	github.com/lib/pq v1.1.1 // indirect
-	github.com/mattbaird/elastigo v0.0.0-20170123220020-2fe47fd29e4b // indirect
-	github.com/michaelklishin/rabbit-hole v1.5.0 // indirect
-	github.com/miekg/dns v1.1.13 // indirect
-	github.com/mitchellh/hashstructure v1.0.0 // indirect
-	github.com/mitchellh/reflectwalk v1.0.1 // indirect
-	github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
-	github.com/opencontainers/image-spec v1.0.1 // indirect
-	github.com/opencontainers/runc v0.1.1 // indirect
-	github.com/ory-am/common v0.4.0 // indirect
-	github.com/ory/dockertest v3.3.4+incompatible // indirect
-	github.com/pborman/uuid v1.2.0 // indirect
-	github.com/pquerna/otp v1.2.0 // indirect
-	github.com/prometheus/client_golang v0.9.3 // indirect
-	github.com/samuel/go-zookeeper v0.0.0-20180130194729-c4fab1ac1bec // indirect
-	github.com/shirou/gopsutil v2.18.12+incompatible // indirect
-	github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4 // indirect
-	github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94 // indirect
-	github.com/stretchr/testify v1.3.0
-	golang.org/x/crypto v0.0.0-20190530122614-20be4c3c3ed5 // indirect
-	golang.org/x/net v0.0.0-20190603091049-60506f45cf65 // indirect
-	google.golang.org/grpc v1.21.0 // indirect
-	gopkg.in/gorethink/gorethink.v4 v4.1.0 // indirect
-	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
-	gopkg.in/ory-am/dockertest.v2 v2.2.3 // indirect
-	gotest.tools v2.2.0+incompatible // indirect
-	layeh.com/radius v0.0.0-20190322222518-890bc1058917 // indirect
+	github.com/hashicorp/consul/api v1.2.0
+	github.com/stretchr/testify v1.4.0
 )