Use go mod in step certificates.

5 years ago · ac536a42cf
parent 0a96062b76
commit ac536a42cf
3 changed files with 5 additions and 485 deletions
--- a/Gopkg.lock
+++ b/Gopkg.lock
@ -1,413 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  digest = "1:6716c9fe6333591128e72848f246fc01dc72240e1e64185d8b4e124e7280b35d"
-  name = "github.com/AndreasBriese/bbloom"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "e2d15f34fcf99d5dbb871c820ec73f710fca9815"
-
-[[projects]]
-  branch = "master"
-  digest = "1:454adc7f974228ff789428b6dc098638c57a64aa0718f0bd61e53d3cd39d7a75"
-  name = "github.com/chzyer/readline"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "2972be24d48e78746da79ba8e24e8b488c9880de"
-
-[[projects]]
-  digest = "1:21ac9938fb1098b3a7b0dd909fb30878d33231177fac11a2821114eb9c1088ff"
-  name = "github.com/dgraph-io/badger"
-  packages = [
-    ".",
-    "options",
-    "protos",
-    "skl",
-    "table",
-    "y",
-  ]
-  pruneopts = "UT"
-  revision = "391b6d3b93e6014fe8c2971fcc0c1266e47dbbd9"
-  version = "v1.5.3"
-
-[[projects]]
-  branch = "master"
-  digest = "1:6e8109ce247a59ab1eeb5330166c12735f6590de99c9647b6162d11518d32c9a"
-  name = "github.com/dgryski/go-farm"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "6a90982ecee230ff6cba02d5bd386acc030be9d3"
-
-[[projects]]
-  branch = "master"
-  digest = "1:81fda4d18a16651bf92245ce5d6178cdd99f918db30ae9794732655f0686e895"
-  name = "github.com/go-chi/chi"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "0ebf7795c516423a110473652e9ba3a59a504863"
-
-[[projects]]
-  digest = "1:ec6f9bf5e274c833c911923c9193867f3f18788c461f76f05f62bb1510e0ae65"
-  name = "github.com/go-sql-driver/mysql"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "72cd26f257d44c1114970e19afddcd812016007e"
-  version = "v1.4.1"
-
-[[projects]]
-  digest = "1:97df918963298c287643883209a2c3f642e6593379f97ab400c2a2e219ab647d"
-  name = "github.com/golang/protobuf"
-  packages = ["proto"]
-  pruneopts = "UT"
-  revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5"
-  version = "v1.2.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:e51f40f0c19b39c1825eadd07d5c0a98a2ad5942b166d9fc4f54750ce9a04810"
-  name = "github.com/juju/ansiterm"
-  packages = [
-    ".",
-    "tabwriter",
-  ]
-  pruneopts = "UT"
-  revision = "720a0952cc2ac777afc295d9861263e2a4cf96a1"
-
-[[projects]]
-  digest = "1:0a69a1c0db3591fcefb47f115b224592c8dfa4368b7ba9fae509d5e16cdc95c8"
-  name = "github.com/konsorten/go-windows-terminal-sequences"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "5c8c8bd35d3832f5d134ae1e1e375b69a4d25242"
-  version = "v1.0.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:bb08c7bb1c7224636b1a00639f079ed4391eb822945f26db74b8d8ee3f14d991"
-  name = "github.com/lunixbochs/vtclean"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "2d01aacdc34a083dca635ba869909f5fc0cd4f41"
-
-[[projects]]
-  digest = "1:2d2bc0f23cca6b59cec3fbece9abc102bdb19f548dd58d7667e57699074a2c76"
-  name = "github.com/manifoldco/promptui"
-  packages = [
-    ".",
-    "list",
-    "screenbuf",
-  ]
-  pruneopts = "UT"
-  revision = "157c96fb638a14d268b305cf2012582431fcc410"
-  version = "v0.3.1"
-
-[[projects]]
-  digest = "1:c658e84ad3916da105a761660dcaeb01e63416c8ec7bc62256a9b411a05fcd67"
-  name = "github.com/mattn/go-colorable"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"
-  version = "v0.0.9"
-
-[[projects]]
-  digest = "1:0981502f9816113c9c8c4ac301583841855c8cf4da8c72f696b3ebedf6d0e4e5"
-  name = "github.com/mattn/go-isatty"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"
-  version = "v0.0.4"
-
-[[projects]]
-  branch = "master"
-  digest = "1:ae08d850ba158ea3ba4a7bb90f8372608172d8920644e5a6693b940a1f4e5d01"
-  name = "github.com/mmcloughlin/avo"
-  packages = [
-    "attr",
-    "build",
-    "buildtags",
-    "gotypes",
-    "internal/prnt",
-    "internal/stack",
-    "ir",
-    "operand",
-    "pass",
-    "printer",
-    "reg",
-    "src",
-    "x86",
-  ]
-  pruneopts = "UT"
-  revision = "2e7d06bc7ada2979f17ccf8ebf486dba23b84fc7"
-
-[[projects]]
-  digest = "1:266d082179f3a29a4bdcf1dcc49d4a304f5c7107e65bd22d1fecacf45f1ac348"
-  name = "github.com/newrelic/go-agent"
-  packages = [
-    ".",
-    "internal",
-    "internal/cat",
-    "internal/jsonx",
-    "internal/logger",
-    "internal/sysinfo",
-    "internal/utilization",
-  ]
-  pruneopts = "UT"
-  revision = "f5bce3387232559bcbe6a5f8227c4bf508dac1ba"
-  version = "v1.11.0"
-
-[[projects]]
-  digest = "1:cf31692c14422fa27c83a05292eb5cbe0fb2775972e8f1f8446a71549bd8980b"
-  name = "github.com/pkg/errors"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "ba968bfe8b2f7e042a574c888954fccecfa385b4"
-  version = "v0.8.1"
-
-[[projects]]
-  digest = "1:2e76a73cb51f42d63a2a1a85b3dc5731fd4faf6821b434bd0ef2c099186031d6"
-  name = "github.com/rs/xid"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "15d26544def341f036c5f8dca987a4cbe575032c"
-  version = "v1.2.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:8baa3b16f20963c54e296627ea1dabfd79d1b486f81baf8759e99d73bddf2687"
-  name = "github.com/samfoo/ansi"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "b6bd2ded7189ce35bc02233b554eb56a5146af73"
-
-[[projects]]
-  branch = "master"
-  digest = "1:def689e73e9252f6f7fe66834a76751a41b767e03daab299e607e7226c58a855"
-  name = "github.com/shurcooL/sanitized_anchor_name"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "86672fcb3f950f35f2e675df2240550f2a50762f"
-
-[[projects]]
-  digest = "1:3f53e9e4dfbb664cd62940c9c4b65a2171c66acd0b7621a1a6b8e78513525a52"
-  name = "github.com/sirupsen/logrus"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "ad15b42461921f1fb3529b058c6786c6a45d5162"
-  version = "v1.1.1"
-
-[[projects]]
-  branch = "master"
-  digest = "1:4d1f0640875aefefdb2151f297c144518a71f5729c4b9f9423f09df501f699c5"
-  name = "github.com/smallstep/assert"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "de77670473b5492f5d0bce155b5c01534c2d13f7"
-
-[[projects]]
-  branch = "master"
-  digest = "1:c00351f77dbdabc4281321b8b326517c0787e0c971412dba0295740eec3f9f7d"
-  name = "github.com/smallstep/cli"
-  packages = [
-    "command",
-    "command/version",
-    "config",
-    "crypto/keys",
-    "crypto/pemutil",
-    "crypto/randutil",
-    "crypto/tlsutil",
-    "crypto/x509util",
-    "errs",
-    "jose",
-    "pkg/blackfriday",
-    "pkg/x509",
-    "token",
-    "token/provision",
-    "ui",
-    "usage",
-    "utils",
-  ]
-  pruneopts = "UT"
-  revision = "775cfe98ef761b7a0b4c830b5bdd8e6c4d77efa2"
-
-[[projects]]
-  branch = "master"
-  digest = "1:b232e9d74b340b03395b935562aac1ca13ea2704f37372863a210ffd0b89efca"
-  name = "github.com/smallstep/nosql"
-  packages = [
-    ".",
-    "badger",
-    "bolt",
-    "database",
-    "mysql",
-  ]
-  pruneopts = "UT"
-  revision = "4b26d8029e613d7ad3e77c9718f9e8e37ab48ddb"
-
-[[projects]]
-  branch = "master"
-  digest = "1:6743b69de0d73e91004e4e201cf4965b59a0fa5caf6f0ffbe0cb9ee8807738a7"
-  name = "github.com/urfave/cli"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "b67dcf995b6a7b7f14fad5fcb7cc5441b05e814b"
-
-[[projects]]
-  digest = "1:5f7414cf41466d4b4dd7ec52b2cd3e481e08cfd11e7e24fef730c0e483e88bb1"
-  name = "go.etcd.io/bbolt"
-  packages = ["."]
-  pruneopts = "UT"
-  revision = "63597a96ec0ad9e6d43c3fc81e809909e0237461"
-  version = "v1.3.2"
-
-[[projects]]
-  branch = "master"
-  digest = "1:afc49fe39c8c591fc2c8ddc73adc4c69e67125dde6c58e24c91b3b0cf78602be"
-  name = "golang.org/x/crypto"
-  packages = [
-    "cryptobyte",
-    "cryptobyte/asn1",
-    "curve25519",
-    "ed25519",
-    "ed25519/internal/edwards25519",
-    "internal/chacha20",
-    "internal/subtle",
-    "ocsp",
-    "pbkdf2",
-    "poly1305",
-    "ssh",
-    "ssh/terminal",
-  ]
-  pruneopts = "UT"
-  revision = "4d3f4d9ffa16a13f451c3b2999e9c49e9750bf06"
-
-[[projects]]
-  branch = "master"
-  digest = "1:2f7468b0b3fd7d926072f0dcbb6ec81e337278b4e5de639d017e54f785f0b475"
-  name = "golang.org/x/net"
-  packages = [
-    "context",
-    "html",
-    "html/atom",
-    "http/httpguts",
-    "http2",
-    "http2/hpack",
-    "idna",
-    "internal/timeseries",
-    "trace",
-  ]
-  pruneopts = "UT"
-  revision = "c44066c5c816ec500d459a2a324a753f78531ae0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:417d27a82efb8473554234a282be33d23b0d6adc121e636b55950f913ac071d6"
-  name = "golang.org/x/sys"
-  packages = [
-    "unix",
-    "windows",
-  ]
-  pruneopts = "UT"
-  revision = "9b800f95dbbc54abff0acf7ee32d88ba4e328c89"
-
-[[projects]]
-  digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18"
-  name = "golang.org/x/text"
-  packages = [
-    "collate",
-    "collate/build",
-    "internal/colltab",
-    "internal/gen",
-    "internal/tag",
-    "internal/triegen",
-    "internal/ucd",
-    "language",
-    "secure/bidirule",
-    "transform",
-    "unicode/bidi",
-    "unicode/cldr",
-    "unicode/norm",
-    "unicode/rangetable",
-  ]
-  pruneopts = "UT"
-  revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0"
-  version = "v0.3.0"
-
-[[projects]]
-  branch = "master"
-  digest = "1:6b4a1c844969280f4d3e36ef4b0762e3522e701c015f688b68ef91c2ea6b5ac7"
-  name = "golang.org/x/tools"
-  packages = [
-    "go/ast/astutil",
-    "go/gcexportdata",
-    "go/internal/cgo",
-    "go/internal/gcimporter",
-    "go/packages",
-    "go/types/typeutil",
-    "internal/fastwalk",
-    "internal/gopathwalk",
-    "internal/semver",
-  ]
-  pruneopts = "UT"
-  revision = "3a10b9bf0a52df7e992a8c3eb712a86d3c896c75"
-
-[[projects]]
-  digest = "1:c25289f43ac4a68d88b02245742347c94f1e108c534dda442188015ff80669b3"
-  name = "google.golang.org/appengine"
-  packages = ["cloudsql"]
-  pruneopts = "UT"
-  revision = "54a98f90d1c46b7731eb8fb305d2a321c30ef610"
-  version = "v1.5.0"
-
-[[projects]]
-  digest = "1:9593bab40e981b1f90b7e07faeab0d09b75fe338880d08880f986a9d3283c53f"
-  name = "gopkg.in/square/go-jose.v2"
-  packages = [
-    ".",
-    "cipher",
-    "json",
-    "jwt",
-  ]
-  pruneopts = "UT"
-  revision = "730df5f748271903322feb182be83b43ebbbe27d"
-  version = "v2.3.1"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  input-imports = [
-    "github.com/go-chi/chi",
-    "github.com/newrelic/go-agent",
-    "github.com/pkg/errors",
-    "github.com/rs/xid",
-    "github.com/sirupsen/logrus",
-    "github.com/smallstep/assert",
-    "github.com/smallstep/cli/command",
-    "github.com/smallstep/cli/command/version",
-    "github.com/smallstep/cli/config",
-    "github.com/smallstep/cli/crypto/keys",
-    "github.com/smallstep/cli/crypto/pemutil",
-    "github.com/smallstep/cli/crypto/randutil",
-    "github.com/smallstep/cli/crypto/tlsutil",
-    "github.com/smallstep/cli/crypto/x509util",
-    "github.com/smallstep/cli/errs",
-    "github.com/smallstep/cli/jose",
-    "github.com/smallstep/cli/pkg/x509",
-    "github.com/smallstep/cli/token",
-    "github.com/smallstep/cli/token/provision",
-    "github.com/smallstep/cli/ui",
-    "github.com/smallstep/cli/usage",
-    "github.com/smallstep/cli/utils",
-    "github.com/smallstep/nosql",
-    "github.com/smallstep/nosql/database",
-    "github.com/urfave/cli",
-    "golang.org/x/crypto/ed25519",
-    "golang.org/x/crypto/ocsp",
-    "golang.org/x/crypto/ssh",
-    "golang.org/x/net/http2",
-    "gopkg.in/square/go-jose.v2",
-    "gopkg.in/square/go-jose.v2/jwt",
-  ]
-  solver-name = "gps-cdcl"
-  solver-version = 1
--- a/Gopkg.toml
+++ b/Gopkg.toml
@ -1,53 +0,0 @@
-# Gopkg.toml example
-#
-# Refer to https://golang.github.io/dep/docs/Gopkg.toml.html
-# 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]]
-  branch = "master"
-  name = "github.com/go-chi/chi"
-
-[[override]]
-  branch = "master"
-  name = "github.com/smallstep/cli"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/smallstep/nosql"
-
-[[constraint]]
-  name = "github.com/newrelic/go-agent"
-  version = "1.11.0"
-
-[[constraint]]
-  name = "github.com/sirupsen/logrus"
-  version = "1.0.6"
-
-[[constraint]]
-  name = "gopkg.in/square/go-jose.v2"
-  version = "2.3.1"
-
-[prune]
-  go-tests = true
-  unused-packages = true
--- a/24
+++ b/24
@ -17,21 +17,9 @@ all: build test lint
 #########################################

 bootstra%:
-	$Q which dep || go get github.com/golang/dep/cmd/dep
-	$Q dep ensure
 	$Q GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.18.0

-
-vendor: Gopkg.lock
-	$Q dep ensure
-
-define VENDOR_BIN_TMPL
-vendor/bin/$(notdir $(1)): vendor
-	$Q go build -o $$@ ./vendor/$(1)
-VENDOR_BINS += vendor/bin/$(notdir $(1))
-endef
-
-.PHONY: bootstra% vendor
+.PHONY: bootstra%

 #################################################
 # Determine the type of `push` and `version`
@ -67,14 +55,14 @@ GOFLAGS := CGO_ENABLED=0
 build: $(PREFIX)bin/$(BINNAME)
 	@echo "Build Complete!"

-$(PREFIX)bin/$(BINNAME): vendor $(call rwildcard,*.go)
+$(PREFIX)bin/$(BINNAME): $(call rwildcard,*.go)
 	$Q mkdir -p $(@D)
 	$Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o $(PREFIX)bin/$(BINNAME) $(LDFLAGS) $(PKG)

-# Target for building without calling dep ensure
+# Target to force a build of step-ca without running tests
 simple:
-	$Q mkdir -p bin/
-	$Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o bin/$(BINNAME) $(LDFLAGS) $(PKG)
+	$Q mkdir -p $(PREFIX)bin
+	$Q $(GOOS_OVERRIDE) $(GOFLAGS) go build -v -o $(PREFIX)bin/$(BINNAME) $(LDFLAGS) $(PKG)
 	@echo "Build Complete!"

 .PHONY: build simple
@ -134,8 +122,6 @@ uninstall:
 #########################################

 clean:
-	@echo "You will need to run 'make bootstrap' or 'dep ensure' directly to re-download any dependencies."
-	$Q rm -rf vendor
 ifneq ($(BINNAME),"")
 	$Q rm -f bin/$(BINNAME)
 endif