aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Aldridge <aldridge.mac@gmail.com>2021-01-10 00:03:17 -0800
committerraul-te <46945030+raul-te@users.noreply.github.com>2021-01-11 12:09:01 -0800
commit54548c1e857ef55bd37cf0b4bfd66f560bb41997 (patch)
tree101cf28f854b43c1ad6ab6a42f00c99f876ba880
parentb709a777f56511e233cd4652e73ec46c7641652b (diff)
Use Go Modules
Go has made it clear that the official way to manage modules is to use the built in modules system, and `dep` is painfully slow. This commit replaces the `dep` control files with the files needed for go modules and has synced the vendor directory.
-rw-r--r--Gopkg.lock66
-rw-r--r--Gopkg.toml50
-rw-r--r--README.md5
-rw-r--r--go.mod15
-rw-r--r--go.sum20
-rw-r--r--vendor/github.com/go-kit/kit/log/term/LICENSE21
-rw-r--r--vendor/modules.txt28
7 files changed, 63 insertions, 142 deletions
diff --git a/Gopkg.lock b/Gopkg.lock
deleted file mode 100644
index 3f2c757..0000000
--- a/Gopkg.lock
+++ /dev/null
@@ -1,66 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
- name = "github.com/go-kit/kit"
- packages = [
- "log",
- "log/level"
- ]
- revision = "ca4112baa34cb55091301bdc13b1420a122b1b9e"
- version = "v0.7.0"
-
-[[projects]]
- name = "github.com/go-logfmt/logfmt"
- packages = ["."]
- revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5"
- version = "v0.3.0"
-
-[[projects]]
- name = "github.com/go-stack/stack"
- packages = ["."]
- revision = "259ab82a6cad3992b4e21ff5cac294ccb06474bc"
- version = "v1.7.0"
-
-[[projects]]
- name = "github.com/gorilla/context"
- packages = ["."]
- revision = "1ea25387ff6f684839d82767c1733ff4d4d15d0a"
- version = "v1.1"
-
-[[projects]]
- name = "github.com/gorilla/mux"
- packages = ["."]
- revision = "53c1911da2b537f792e7cafcb446b05ffe33b996"
- version = "v1.6.1"
-
-[[projects]]
- branch = "master"
- name = "github.com/justinas/alice"
- packages = ["."]
- revision = "03f45bd4b7dad4734bc4620e46a35789349abb20"
-
-[[projects]]
- branch = "master"
- name = "github.com/kr/logfmt"
- packages = ["."]
- revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0"
-
-[[projects]]
- name = "github.com/namsral/flag"
- packages = ["."]
- revision = "71ceffbeb0ba60fccc853971bb3ed4d7d90bfd04"
- version = "v1.7.4-pre"
-
-[[projects]]
- name = "gopkg.in/yaml.v2"
- packages = ["."]
- revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
- version = "v2.2.1"
-
-[solve-meta]
- analyzer-name = "dep"
- analyzer-version = 1
- inputs-digest = "4dbb51d63f4995423447d6189c3a2b9bd4b8d11647b6b1e16a9dbcfd5b66639d"
- solver-name = "gps-cdcl"
- solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
deleted file mode 100644
index bf1b484..0000000
--- a/Gopkg.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-# name = "github.com/user/project"
-# version = "1.0.0"
-#
-# [[constraint]]
-# name = "github.com/user/project2"
-# branch = "dev"
-# source = "github.com/myfork/project2"
-#
-# [[override]]
-# name = "github.com/x/y"
-# version = "2.4.0"
-#
-# [prune]
-# non-go = false
-# go-tests = true
-# unused-packages = true
-
-
-[[constraint]]
- name = "github.com/go-kit/kit"
- version = "0.7.0"
-
-[[constraint]]
- name = "github.com/gorilla/mux"
- version = "1.6.1"
-
-[[constraint]]
- branch = "master"
- name = "github.com/justinas/alice"
-
-[[constraint]]
- name = "github.com/namsral/flag"
- version = "1.7.4-pre"
-
-[[constraint]]
- name = "gopkg.in/yaml.v2"
- version = "2.2.1"
-
-[prune]
- go-tests = true
- unused-packages = true
diff --git a/README.md b/README.md
index a76ef52..f03c83f 100644
--- a/README.md
+++ b/README.md
@@ -230,8 +230,3 @@ guidelines:
a bug or, even better, contribute with a pull request.
* We have a bunch of integration tests that can be run by executing `make test`.
Ensure that all test pass before submitting your pull request.
-* We are using [dep](https://golang.github.io/dep/) for managing the
- dependencies of this project. If your contribution adds a new dependency (not
- recommended, but sometimes there isn't other way), please update dep files and
- vendor directory
- [accordingly](https://golang.github.io/dep/docs/daily-dep.html#adding-a-new-dependency).
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..c004d53
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,15 @@
+module github.com/thousandeyes/shoelaces
+
+go 1.15
+
+require (
+ github.com/go-kit/kit v0.7.0
+ github.com/go-logfmt/logfmt v0.3.0 // indirect
+ github.com/go-stack/stack v1.7.0 // indirect
+ github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f // indirect
+ github.com/gorilla/mux v1.6.1
+ github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da
+ github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
+ github.com/namsral/flag v1.7.4-pre
+ gopkg.in/yaml.v2 v2.2.1
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..276d6a2
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,20 @@
+github.com/go-kit/kit v0.7.0 h1:ApufNmWF1H6/wUbAG81hZOHmqwd0zRf8mNfLjYj/064=
+github.com/go-kit/kit v0.7.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-logfmt/logfmt v0.3.0 h1:8HUsc87TaSWLKwrnumgC8/YconD2fJQsRJAsWaPg2ic=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-stack/stack v1.7.0 h1:S04+lLfST9FvL8dl4R31wVUC/paZp/WQZbLmUgWboGw=
+github.com/go-stack/stack v1.7.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f h1:9oNbS1z4rVpbnkHBdPZU4jo9bSmrLpII768arSyMFgk=
+github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
+github.com/gorilla/mux v1.6.1 h1:KOwqsTYZdeuMacU7CxjMNYEKeBvLbxW+psodrbcEa3A=
+github.com/gorilla/mux v1.6.1/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs=
+github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da h1:5y58+OCjoHCYB8182mpf/dEsq0vwTKPOo4zGfH0xW9A=
+github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da/go.mod h1:oLH0CmIaxCGXD67VKGR5AacGXZSMznlmeqM8RzPrcY8=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 h1:T+h1c/A9Gawja4Y9mFVWj2vyii2bbUNDw3kt9VxK2EY=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/namsral/flag v1.7.4-pre h1:b2ScHhoCUkbsq0d2C15Mv+VU8bl8hAXV8arnWiOHNZs=
+github.com/namsral/flag v1.7.4-pre/go.mod h1:OXldTctbM6SWH1K899kPZcf65KxJiD7MsceFUpB5yDo=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/vendor/github.com/go-kit/kit/log/term/LICENSE b/vendor/github.com/go-kit/kit/log/term/LICENSE
deleted file mode 100644
index f090cb4..0000000
--- a/vendor/github.com/go-kit/kit/log/term/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Simon Eskildsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
diff --git a/vendor/modules.txt b/vendor/modules.txt
new file mode 100644
index 0000000..5951318
--- /dev/null
+++ b/vendor/modules.txt
@@ -0,0 +1,28 @@
+# github.com/go-kit/kit v0.7.0
+## explicit
+github.com/go-kit/kit/log
+github.com/go-kit/kit/log/level
+# github.com/go-logfmt/logfmt v0.3.0
+## explicit
+github.com/go-logfmt/logfmt
+# github.com/go-stack/stack v1.7.0
+## explicit
+github.com/go-stack/stack
+# github.com/gorilla/context v0.0.0-20160226214623-1ea25387ff6f
+## explicit
+github.com/gorilla/context
+# github.com/gorilla/mux v1.6.1
+## explicit
+github.com/gorilla/mux
+# github.com/justinas/alice v0.0.0-20171023064455-03f45bd4b7da
+## explicit
+github.com/justinas/alice
+# github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515
+## explicit
+github.com/kr/logfmt
+# github.com/namsral/flag v1.7.4-pre
+## explicit
+github.com/namsral/flag
+# gopkg.in/yaml.v2 v2.2.1
+## explicit
+gopkg.in/yaml.v2
nihil fit ex nihilo