From c6ac127ff86289cf5c210345b1e2c638a371ecd6 Mon Sep 17 00:00:00 2001 From: tariqibrahim Date: Sun, 25 Nov 2018 12:50:27 -0800 Subject: [PATCH] replace glide with dep --- cmd/yfuzz-cli/Gopkg.lock | 163 +++++++++++ cmd/yfuzz-cli/Gopkg.toml | 20 ++ cmd/yfuzz-cli/README.md | 2 +- cmd/yfuzz-cli/glide.lock | 55 ---- cmd/yfuzz-cli/glide.yaml | 11 - scripts/go.mk | 16 +- services/yfuzz-server/Gopkg.lock | 479 +++++++++++++++++++++++++++++++ services/yfuzz-server/Gopkg.toml | 66 +++++ services/yfuzz-server/README.md | 2 +- services/yfuzz-server/glide.lock | 267 ----------------- services/yfuzz-server/glide.yaml | 29 -- 11 files changed, 742 insertions(+), 368 deletions(-) create mode 100644 cmd/yfuzz-cli/Gopkg.lock create mode 100644 cmd/yfuzz-cli/Gopkg.toml delete mode 100644 cmd/yfuzz-cli/glide.lock delete mode 100644 cmd/yfuzz-cli/glide.yaml create mode 100644 services/yfuzz-server/Gopkg.lock create mode 100644 services/yfuzz-server/Gopkg.toml delete mode 100644 services/yfuzz-server/glide.lock delete mode 100644 services/yfuzz-server/glide.yaml diff --git a/cmd/yfuzz-cli/Gopkg.lock b/cmd/yfuzz-cli/Gopkg.lock new file mode 100644 index 0000000..15f189a --- /dev/null +++ b/cmd/yfuzz-cli/Gopkg.lock @@ -0,0 +1,163 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + digest = "1:865079840386857c809b72ce300be7580cb50d3d3129ce11bf9aa6ca2bc1934a" + name = "github.com/fatih/color" + packages = ["."] + pruneopts = "UT" + revision = "5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4" + version = "v1.7.0" + +[[projects]] + digest = "1:abeb38ade3f32a92943e5be54f55ed6d6e3b6602761d74b4aab4c9dd45c18abd" + name = "github.com/fsnotify/fsnotify" + packages = ["."] + pruneopts = "UT" + revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" + version = "v1.4.7" + +[[projects]] + digest = "1:a361611b8c8c75a1091f00027767f7779b29cb37c456a71b8f2604c88057ab40" + name = "github.com/hashicorp/hcl" + packages = [ + ".", + "hcl/ast", + "hcl/parser", + "hcl/printer", + "hcl/scanner", + "hcl/strconv", + "hcl/token", + "json/parser", + "json/scanner", + "json/token", + ] + pruneopts = "UT" + revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168" + +[[projects]] + digest = "1:be27056f2e0c89520e3aec44749709a7a350179e051d7cfafdd1c2039f43c48b" + name = "github.com/magiconair/properties" + packages = ["."] + pruneopts = "UT" + revision = "2c9e9502788518c97fe44e8955cd069417ee89df" + +[[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]] + digest = "1:2514da1e59c0a936d8c1e0fbf5592267a3c5893eb4555ce767bb54d149e9cf6e" + name = "github.com/mitchellh/mapstructure" + packages = ["."] + pruneopts = "UT" + revision = "00c29f56e2386353d58c599509e8dc3801b0d716" + +[[projects]] + digest = "1:e9ef6eae041ec7deb39e8a30da178c66ed0b7dff5026ccd3e71a387bebc70946" + name = "github.com/pelletier/go-toml" + packages = ["."] + pruneopts = "UT" + revision = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12" + +[[projects]] + digest = "1:fe0b7f0c9a5e5511001fe085b0a156b29266012cd984a63e4059a30e84bba03a" + name = "github.com/spf13/afero" + packages = [ + ".", + "mem", + ] + pruneopts = "UT" + revision = "63644898a8da0bc22138abf860edaf5277b6102e" + version = "v1.1.0" + +[[projects]] + digest = "1:516e71bed754268937f57d4ecb190e01958452336fa73dbac880894164e91c1f" + name = "github.com/spf13/cast" + packages = ["."] + pruneopts = "UT" + revision = "8965335b8c7107321228e3e3702cab9832751bac" + version = "v1.2.0" + +[[projects]] + digest = "1:080e5f630945ad754f4b920e60b4d3095ba0237ebf88dc462eb28002932e3805" + name = "github.com/spf13/jwalterweatherman" + packages = ["."] + pruneopts = "UT" + revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394" + +[[projects]] + digest = "1:9424f440bba8f7508b69414634aef3b2b3a877e522d8a4624692412805407bb7" + name = "github.com/spf13/pflag" + packages = ["."] + pruneopts = "UT" + revision = "583c0c0531f06d5278b7d917446061adc344b5cd" + version = "v1.0.1" + +[[projects]] + digest = "1:59e7dceb53b4a1e57eb1eb0bf9951ff0c25912df7660004a789b62b4e8cdca3b" + name = "github.com/spf13/viper" + packages = ["."] + pruneopts = "UT" + revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736" + version = "v1.0.2" + +[[projects]] + digest = "1:1435c3b63fada2c5837e52169490cbf1649b58e0146c26019d5609efdbf874ce" + name = "golang.org/x/sys" + packages = ["unix"] + pruneopts = "UT" + revision = "95c6576299259db960f6c5b9b69ea52422860fce" + +[[projects]] + digest = "1:5ba57432643e349dcc6df13bb875ffc42814fa5f02464c8a5e948e754ba88610" + name = "golang.org/x/text" + packages = [ + "internal/gen", + "internal/triegen", + "internal/ucd", + "transform", + "unicode/cldr", + "unicode/norm", + ] + pruneopts = "UT" + revision = "b19bf474d317b857955b12035d2c5acb57ce8b01" + +[[projects]] + digest = "1:b24d38b282bacf9791408a080f606370efa3d364e4b5fd9ba0f7b87786d3b679" + name = "gopkg.in/urfave/cli.v1" + packages = ["."] + pruneopts = "UT" + revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1" + version = "v1.20.0" + +[[projects]] + digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" + name = "gopkg.in/yaml.v2" + packages = ["."] + pruneopts = "UT" + revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" + version = "v2.2.1" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + input-imports = [ + "github.com/fatih/color", + "github.com/spf13/viper", + "gopkg.in/urfave/cli.v1", + ] + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/cmd/yfuzz-cli/Gopkg.toml b/cmd/yfuzz-cli/Gopkg.toml new file mode 100644 index 0000000..108712a --- /dev/null +++ b/cmd/yfuzz-cli/Gopkg.toml @@ -0,0 +1,20 @@ +ignored = [ + "github.com/yahoo/yfuzz/pkg/schema", + "github.com/yahoo/yfuzz/pkg/version", +] + +[[constraint]] + name = "github.com/fatih/color" + version = "1.7.0" + +[[constraint]] + name = "github.com/spf13/viper" + version = "1.0.2" + +[[constraint]] + name = "gopkg.in/urfave/cli.v1" + version = "1.20.0" + +[prune] + go-tests = true + unused-packages = true diff --git a/cmd/yfuzz-cli/README.md b/cmd/yfuzz-cli/README.md index 60921bb..f5b81b3 100644 --- a/cmd/yfuzz-cli/README.md +++ b/cmd/yfuzz-cli/README.md @@ -16,7 +16,7 @@ A simple command-line utility for [yFuzz](https://github.com/yahoo/yfuzz). - [Settings](#settings) ## Prerequisites: -To build the CLI, you will need [Go](https://golang.org/), [Glide](https://glide.sh/), and [Make](https://www.gnu.org/software/make/). +To build the CLI, you will need [Go](https://golang.org/), [Dep](https://golang.github.io/dep/), and [Make](https://www.gnu.org/software/make/). ## Install diff --git a/cmd/yfuzz-cli/glide.lock b/cmd/yfuzz-cli/glide.lock deleted file mode 100644 index fa0554a..0000000 --- a/cmd/yfuzz-cli/glide.lock +++ /dev/null @@ -1,55 +0,0 @@ -hash: 54f8ae3f61b0724834ddbe7a64f849289e76347491b00f0e68813ddebc16ea4c -updated: 2018-07-05T16:56:43.250344-07:00 -imports: -- name: github.com/fatih/color - version: 5b77d2a35fb0ede96d138fc9a99f5c9b6aef11b4 -- name: github.com/fsnotify/fsnotify - version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9 -- name: github.com/hashicorp/hcl - version: ef8a98b0bbce4a65b5aa4c368430a80ddc533168 - subpackages: - - hcl/ast - - hcl/parser - - hcl/printer - - hcl/scanner - - hcl/strconv - - hcl/token - - json/parser - - json/scanner - - json/token -- name: github.com/magiconair/properties - version: 2c9e9502788518c97fe44e8955cd069417ee89df -- name: github.com/mattn/go-colorable - version: 5411d3eea5978e6cdc258b30de592b60df6aba96 -- name: github.com/mattn/go-isatty - version: 57fdcb988a5c543893cc61bce354a6e24ab70022 -- name: github.com/mitchellh/mapstructure - version: 00c29f56e2386353d58c599509e8dc3801b0d716 -- name: github.com/pelletier/go-toml - version: 66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12 -- name: github.com/spf13/afero - version: 63644898a8da0bc22138abf860edaf5277b6102e - subpackages: - - mem -- name: github.com/spf13/cast - version: 8965335b8c7107321228e3e3702cab9832751bac -- name: github.com/spf13/jwalterweatherman - version: 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394 -- name: github.com/spf13/pflag - version: 583c0c0531f06d5278b7d917446061adc344b5cd -- name: github.com/spf13/viper - version: b5e8006cbee93ec955a89ab31e0e3ce3204f3736 -- name: golang.org/x/sys - version: 95c6576299259db960f6c5b9b69ea52422860fce - subpackages: - - unix -- name: golang.org/x/text - version: b19bf474d317b857955b12035d2c5acb57ce8b01 - subpackages: - - transform - - unicode/norm -- name: gopkg.in/urfave/cli.v1 - version: cfb38830724cc34fedffe9a2a29fb54fa9169cd1 -- name: gopkg.in/yaml.v2 - version: 5420a8b6744d3b0345ab293f6fcba19c978f1183 -testImports: [] diff --git a/cmd/yfuzz-cli/glide.yaml b/cmd/yfuzz-cli/glide.yaml deleted file mode 100644 index e5ef6dd..0000000 --- a/cmd/yfuzz-cli/glide.yaml +++ /dev/null @@ -1,11 +0,0 @@ -package: github.com/yahoo/yfuzz/cmd/yfuzz-cli -ignore: -- github.com/yahoo/yfuzz/pkg/schema -- github.com/yahoo/yfuzz/pkg/version -import: -- package: github.com/fatih/color - version: ^1.7.0 -- package: gopkg.in/urfave/cli.v1 - version: ^1.20.0 -- package: github.com/spf13/viper - version: ^1.0.2 diff --git a/scripts/go.mk b/scripts/go.mk index f8421c9..f16be9b 100644 --- a/scripts/go.mk +++ b/scripts/go.mk @@ -9,6 +9,7 @@ TARGET ?= $(shell basename `pwd`) YFUZZ_BUILD_VERSION ?= $(shell git describe --tags --abbrev=0)_local +HAS_DEP := $(shell command -v dep;) # Run go build or go install with the appropriate flags define _build @@ -16,7 +17,7 @@ define _build -X github.com/yahoo/yfuzz/pkg/version.Timestamp=$(shell date +'%Y/%m/%d_%H:%M:%S')" endef -all: deps lint test build +all: deps dep-check lint test build clean: @echo Cleaning binaries, vendor for ${TARGET}. @@ -26,15 +27,22 @@ clean: deps: @echo Installing dependencies for ${TARGET}. +ifndef HAS_DEP + curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh +endif ifeq (${verbose},true) - glide install + dep ensure -v else - glide -q install + dep ensure endif ifndef TRAVIS go get -u github.com/golangci/golangci-lint/cmd/golangci-lint endif +dep-check: + @echo Running dep check to verify consistency across Gopkg.toml, Gopkg.lock, and vendor. + dep check + lint: ifdef TRAVIS @echo Skipping lint in Travis, linting is done by https://golangci.com/ @@ -59,4 +67,4 @@ install: @echo Installing ${TARGET} ${YFUZZ_BUILD_VERSION} $(call _build,install) -.PHONY: clean deps lint test build install +.PHONY: clean deps dep-check lint test build install diff --git a/services/yfuzz-server/Gopkg.lock b/services/yfuzz-server/Gopkg.lock new file mode 100644 index 0000000..a9ed2af --- /dev/null +++ b/services/yfuzz-server/Gopkg.lock @@ -0,0 +1,479 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + digest = "1:0a3b4cf1fcec85cf47337f6d176144fad4204d5119dd8135a89a167d2b459cea" + name = "github.com/ardielle/ardielle-go" + packages = ["rdl"] + pruneopts = "UT" + revision = "eceec2d93a832e111f4e0f7dd58adcf95a616038" + version = "v1.5.0" + +[[projects]] + digest = "1:abeb38ade3f32a92943e5be54f55ed6d6e3b6602761d74b4aab4c9dd45c18abd" + name = "github.com/fsnotify/fsnotify" + packages = ["."] + pruneopts = "UT" + revision = "c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9" + version = "v1.4.7" + +[[projects]] + digest = "1:c45cef8e0074ea2f8176a051df38553ba997a3616f1ec2d35222b1cf9864881e" + name = "github.com/ghodss/yaml" + packages = ["."] + pruneopts = "UT" + revision = "73d445a93680fa1a78ae23a5839bad48f32ba1ee" + +[[projects]] + digest = "1:f83d740263b44fdeef3e1bce6147b5d7283fcad1a693d39639be33993ecf3db1" + name = "github.com/gogo/protobuf" + packages = [ + "proto", + "sortkeys", + ] + pruneopts = "UT" + revision = "c0656edd0d9eab7c66d1eb0c568f9039345796f7" + +[[projects]] + digest = "1:2edd2416f89b4e841df0e4a78802ce14d2bc7ad79eba1a45986e39f0f8cb7d87" + name = "github.com/golang/glog" + packages = ["."] + pruneopts = "UT" + revision = "44145f04b68cf362d9c4df2182967c2275eaefed" + +[[projects]] + digest = "1:8f2df6167daef6f4d56d07f99bbcf4733117db0dedfd959995b9a679c52561f1" + name = "github.com/golang/protobuf" + packages = [ + "proto", + "ptypes", + "ptypes/any", + "ptypes/duration", + "ptypes/timestamp", + ] + pruneopts = "UT" + revision = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9" + +[[projects]] + digest = "1:41bfd4219241b7f7d6e6fdb13fc712576f1337e68e6b895136283b76928fdd66" + name = "github.com/google/gofuzz" + packages = ["."] + pruneopts = "UT" + revision = "44d81051d367757e1c7c6a5a86423ece9afcf63c" + +[[projects]] + digest = "1:75eb87381d25cc75212f52358df9c3a2719584eaa9685cd510ce28699122f39d" + name = "github.com/googleapis/gnostic" + packages = [ + "OpenAPIv2", + "compiler", + "extensions", + ] + pruneopts = "UT" + revision = "0c5108395e2debce0d731cf0287ddf7242066aba" + +[[projects]] + digest = "1:c79fb010be38a59d657c48c6ba1d003a8aa651fa56b579d959d74573b7dff8e1" + name = "github.com/gorilla/context" + packages = ["."] + pruneopts = "UT" + revision = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42" + version = "v1.1.1" + +[[projects]] + digest = "1:185a43b59a1f4e7ad4e7ccafb8a1538193d897a2a75be16dda093ec42ad231cf" + name = "github.com/gorilla/handlers" + packages = ["."] + pruneopts = "UT" + revision = "90663712d74cb411cbef281bc1e08c19d1a76145" + version = "v1.3.0" + +[[projects]] + digest = "1:e73f5b0152105f18bc131fba127d9949305c8693f8a762588a82a48f61756f5f" + name = "github.com/gorilla/mux" + packages = ["."] + pruneopts = "UT" + revision = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf" + version = "v1.6.2" + +[[projects]] + digest = "1:a361611b8c8c75a1091f00027767f7779b29cb37c456a71b8f2604c88057ab40" + name = "github.com/hashicorp/hcl" + packages = [ + ".", + "hcl/ast", + "hcl/parser", + "hcl/printer", + "hcl/scanner", + "hcl/strconv", + "hcl/token", + "json/parser", + "json/scanner", + "json/token", + ] + pruneopts = "UT" + revision = "ef8a98b0bbce4a65b5aa4c368430a80ddc533168" + +[[projects]] + branch = "master" + digest = "1:0778dc7fce1b4669a8bfa7ae506ec1f595b6ab0f8989c1c0d22a8ca1144e9972" + name = "github.com/howeyc/gopass" + packages = ["."] + pruneopts = "UT" + revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8" + +[[projects]] + digest = "1:06ec9147400aabb0d6960dd8557638603b5f320cd4cb8a3eceaae407e782849a" + name = "github.com/imdario/mergo" + packages = ["."] + pruneopts = "UT" + revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc" + +[[projects]] + digest = "1:8f9110ae8a250da0af248c7d6f78d6244ac86e0afebf16ddd4e6849650bbf2a1" + name = "github.com/json-iterator/go" + packages = ["."] + pruneopts = "UT" + revision = "13f86432b882000a51c6e610c620974462691a97" + +[[projects]] + digest = "1:be27056f2e0c89520e3aec44749709a7a350179e051d7cfafdd1c2039f43c48b" + name = "github.com/magiconair/properties" + packages = ["."] + pruneopts = "UT" + revision = "2c9e9502788518c97fe44e8955cd069417ee89df" + +[[projects]] + digest = "1:2514da1e59c0a936d8c1e0fbf5592267a3c5893eb4555ce767bb54d149e9cf6e" + name = "github.com/mitchellh/mapstructure" + packages = ["."] + pruneopts = "UT" + revision = "00c29f56e2386353d58c599509e8dc3801b0d716" + +[[projects]] + digest = "1:e9ef6eae041ec7deb39e8a30da178c66ed0b7dff5026ccd3e71a387bebc70946" + name = "github.com/pelletier/go-toml" + packages = ["."] + pruneopts = "UT" + revision = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12" + +[[projects]] + digest = "1:fe0b7f0c9a5e5511001fe085b0a156b29266012cd984a63e4059a30e84bba03a" + name = "github.com/spf13/afero" + packages = [ + ".", + "mem", + ] + pruneopts = "UT" + revision = "63644898a8da0bc22138abf860edaf5277b6102e" + version = "v1.1.0" + +[[projects]] + digest = "1:516e71bed754268937f57d4ecb190e01958452336fa73dbac880894164e91c1f" + name = "github.com/spf13/cast" + packages = ["."] + pruneopts = "UT" + revision = "8965335b8c7107321228e3e3702cab9832751bac" + version = "v1.2.0" + +[[projects]] + digest = "1:080e5f630945ad754f4b920e60b4d3095ba0237ebf88dc462eb28002932e3805" + name = "github.com/spf13/jwalterweatherman" + packages = ["."] + pruneopts = "UT" + revision = "7c0cea34c8ece3fbeb2b27ab9b59511d360fb394" + +[[projects]] + digest = "1:9424f440bba8f7508b69414634aef3b2b3a877e522d8a4624692412805407bb7" + name = "github.com/spf13/pflag" + packages = ["."] + pruneopts = "UT" + revision = "583c0c0531f06d5278b7d917446061adc344b5cd" + version = "v1.0.1" + +[[projects]] + digest = "1:59e7dceb53b4a1e57eb1eb0bf9951ff0c25912df7660004a789b62b4e8cdca3b" + name = "github.com/spf13/viper" + packages = ["."] + pruneopts = "UT" + revision = "b5e8006cbee93ec955a89ab31e0e3ce3204f3736" + version = "v1.0.2" + +[[projects]] + digest = "1:84f85c1324b582ce73bc0b2368edeafa751216d584d8899cc101adad203b3711" + name = "github.com/yahoo/athenz" + packages = ["clients/go/zms"] + pruneopts = "UT" + revision = "74403f71bc295cd5433b4941fe58d87a37e30a7f" + version = "v1.7.51" + +[[projects]] + digest = "1:1be838a8c2c81512938aee459e8eaa6b815cc9c16f2f46f07fdf7ac683a7891c" + name = "github.com/yahoo/yfuzz" + packages = ["pkg/types"] + pruneopts = "UT" + revision = "acb08588204e74654ceb79a338856180dda9c4aa" + version = "v0.0.9" + +[[projects]] + digest = "1:624a05c7c6ed502bf77364cd3d54631383dafc169982fddd8ee77b53c3d9cccf" + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] + pruneopts = "UT" + revision = "81e90905daefcd6fd217b62423c0908922eadb30" + +[[projects]] + digest = "1:7f8cf4434657e2b21067f70930402b43144b6ff94022171be5cfcb5924c7f27c" + name = "golang.org/x/net" + packages = [ + "context", + "http2", + "http2/hpack", + "idna", + "lex/httplex", + ] + pruneopts = "UT" + revision = "1c05540f6879653db88113bc4a2b70aec4bd491f" + +[[projects]] + digest = "1:e1a85d3648114c446b2874647bf30f646a8594e7e4e45db87fe962aba60e51f5" + name = "golang.org/x/sys" + packages = [ + "unix", + "windows", + ] + pruneopts = "UT" + revision = "95c6576299259db960f6c5b9b69ea52422860fce" + +[[projects]] + digest = "1:97337ef8cb438f9e3a99ea91a300e916ed9a96fbf3ad50f9a020d30ea9f8692f" + name = "golang.org/x/text" + packages = [ + "internal/gen", + "internal/triegen", + "internal/ucd", + "secure/bidirule", + "transform", + "unicode/bidi", + "unicode/cldr", + "unicode/norm", + "unicode/rangetable", + ] + pruneopts = "UT" + revision = "b19bf474d317b857955b12035d2c5acb57ce8b01" + +[[projects]] + digest = "1:d37b0ef2944431fe9e8ef35c6fffc8990d9e2ca300588df94a6890f3649ae365" + name = "golang.org/x/time" + packages = ["rate"] + pruneopts = "UT" + revision = "f51c12702a4d776e4c1fa9b0fabab841babae631" + +[[projects]] + digest = "1:ef72505cf098abdd34efeea032103377bec06abb61d8a06f002d5d296a4b1185" + name = "gopkg.in/inf.v0" + packages = ["."] + pruneopts = "UT" + revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" + version = "v0.9.0" + +[[projects]] + digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" + name = "gopkg.in/yaml.v2" + packages = ["."] + pruneopts = "UT" + revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" + version = "v2.2.1" + +[[projects]] + digest = "1:cae8f1d1d786aa486a7ed236a8c1f099b3b44697ec6bbb5951d7e9bdb53a5125" + name = "k8s.io/api" + packages = [ + "admissionregistration/v1alpha1", + "admissionregistration/v1beta1", + "apps/v1", + "apps/v1beta1", + "apps/v1beta2", + "authentication/v1", + "authentication/v1beta1", + "authorization/v1", + "authorization/v1beta1", + "autoscaling/v1", + "autoscaling/v2beta1", + "batch/v1", + "batch/v1beta1", + "batch/v2alpha1", + "certificates/v1beta1", + "core/v1", + "events/v1beta1", + "extensions/v1beta1", + "networking/v1", + "policy/v1beta1", + "rbac/v1", + "rbac/v1alpha1", + "rbac/v1beta1", + "scheduling/v1alpha1", + "settings/v1alpha1", + "storage/v1", + "storage/v1alpha1", + "storage/v1beta1", + ] + pruneopts = "UT" + revision = "73d903622b7391f3312dcbac6483fed484e185f8" + version = "kubernetes-1.10.0" + +[[projects]] + digest = "1:5306fa4e911383bc8540148123e6a81aea1786dbf592ac051fd572fdd8a173b1" + name = "k8s.io/apimachinery" + packages = [ + "pkg/api/errors", + "pkg/api/meta", + "pkg/api/resource", + "pkg/apis/meta/v1", + "pkg/apis/meta/v1/unstructured", + "pkg/apis/meta/v1beta1", + "pkg/conversion", + "pkg/conversion/queryparams", + "pkg/fields", + "pkg/labels", + "pkg/runtime", + "pkg/runtime/schema", + "pkg/runtime/serializer", + "pkg/runtime/serializer/json", + "pkg/runtime/serializer/protobuf", + "pkg/runtime/serializer/recognizer", + "pkg/runtime/serializer/streaming", + "pkg/runtime/serializer/versioning", + "pkg/selection", + "pkg/types", + "pkg/util/clock", + "pkg/util/errors", + "pkg/util/framer", + "pkg/util/intstr", + "pkg/util/json", + "pkg/util/net", + "pkg/util/runtime", + "pkg/util/sets", + "pkg/util/validation", + "pkg/util/validation/field", + "pkg/util/wait", + "pkg/util/yaml", + "pkg/version", + "pkg/watch", + "third_party/forked/golang/reflect", + ] + pruneopts = "UT" + revision = "302974c03f7e50f16561ba237db776ab93594ef6" + version = "kubernetes-1.10.0" + +[[projects]] + digest = "1:490b16761d2ded2729bf4e262eedc2d0df8b57d6f7d4f60a2893bb24be108331" + name = "k8s.io/client-go" + packages = [ + "discovery", + "discovery/fake", + "kubernetes", + "kubernetes/fake", + "kubernetes/scheme", + "kubernetes/typed/admissionregistration/v1alpha1", + "kubernetes/typed/admissionregistration/v1alpha1/fake", + "kubernetes/typed/admissionregistration/v1beta1", + "kubernetes/typed/admissionregistration/v1beta1/fake", + "kubernetes/typed/apps/v1", + "kubernetes/typed/apps/v1/fake", + "kubernetes/typed/apps/v1beta1", + "kubernetes/typed/apps/v1beta1/fake", + "kubernetes/typed/apps/v1beta2", + "kubernetes/typed/apps/v1beta2/fake", + "kubernetes/typed/authentication/v1", + "kubernetes/typed/authentication/v1/fake", + "kubernetes/typed/authentication/v1beta1", + "kubernetes/typed/authentication/v1beta1/fake", + "kubernetes/typed/authorization/v1", + "kubernetes/typed/authorization/v1/fake", + "kubernetes/typed/authorization/v1beta1", + "kubernetes/typed/authorization/v1beta1/fake", + "kubernetes/typed/autoscaling/v1", + "kubernetes/typed/autoscaling/v1/fake", + "kubernetes/typed/autoscaling/v2beta1", + "kubernetes/typed/autoscaling/v2beta1/fake", + "kubernetes/typed/batch/v1", + "kubernetes/typed/batch/v1/fake", + "kubernetes/typed/batch/v1beta1", + "kubernetes/typed/batch/v1beta1/fake", + "kubernetes/typed/batch/v2alpha1", + "kubernetes/typed/batch/v2alpha1/fake", + "kubernetes/typed/certificates/v1beta1", + "kubernetes/typed/certificates/v1beta1/fake", + "kubernetes/typed/core/v1", + "kubernetes/typed/core/v1/fake", + "kubernetes/typed/events/v1beta1", + "kubernetes/typed/events/v1beta1/fake", + "kubernetes/typed/extensions/v1beta1", + "kubernetes/typed/extensions/v1beta1/fake", + "kubernetes/typed/networking/v1", + "kubernetes/typed/networking/v1/fake", + "kubernetes/typed/policy/v1beta1", + "kubernetes/typed/policy/v1beta1/fake", + "kubernetes/typed/rbac/v1", + "kubernetes/typed/rbac/v1/fake", + "kubernetes/typed/rbac/v1alpha1", + "kubernetes/typed/rbac/v1alpha1/fake", + "kubernetes/typed/rbac/v1beta1", + "kubernetes/typed/rbac/v1beta1/fake", + "kubernetes/typed/scheduling/v1alpha1", + "kubernetes/typed/scheduling/v1alpha1/fake", + "kubernetes/typed/settings/v1alpha1", + "kubernetes/typed/settings/v1alpha1/fake", + "kubernetes/typed/storage/v1", + "kubernetes/typed/storage/v1/fake", + "kubernetes/typed/storage/v1alpha1", + "kubernetes/typed/storage/v1alpha1/fake", + "kubernetes/typed/storage/v1beta1", + "kubernetes/typed/storage/v1beta1/fake", + "pkg/apis/clientauthentication", + "pkg/apis/clientauthentication/v1alpha1", + "pkg/version", + "plugin/pkg/client/auth/exec", + "rest", + "rest/watch", + "testing", + "tools/auth", + "tools/clientcmd", + "tools/clientcmd/api", + "tools/clientcmd/api/latest", + "tools/clientcmd/api/v1", + "tools/metrics", + "tools/reference", + "transport", + "util/cert", + "util/flowcontrol", + "util/homedir", + "util/integer", + ] + pruneopts = "UT" + revision = "23781f4d6632d88e869066eaebb743857aa1ef9b" + version = "v7.0.0" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + input-imports = [ + "github.com/gorilla/handlers", + "github.com/gorilla/mux", + "github.com/spf13/jwalterweatherman", + "github.com/spf13/viper", + "github.com/yahoo/athenz/clients/go/zms", + "github.com/yahoo/yfuzz/pkg/types", + "k8s.io/api/batch/v1", + "k8s.io/api/core/v1", + "k8s.io/apimachinery/pkg/apis/meta/v1", + "k8s.io/apimachinery/pkg/runtime", + "k8s.io/client-go/kubernetes", + "k8s.io/client-go/kubernetes/fake", + "k8s.io/client-go/kubernetes/scheme", + "k8s.io/client-go/rest", + "k8s.io/client-go/tools/clientcmd", + ] + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/services/yfuzz-server/Gopkg.toml b/services/yfuzz-server/Gopkg.toml new file mode 100644 index 0000000..648691e --- /dev/null +++ b/services/yfuzz-server/Gopkg.toml @@ -0,0 +1,66 @@ +# 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 + +ignored = [ + "github.com/yahoo/yfuzz/pkg/schema", + "github.com/yahoo/yfuzz/pkg/version", +] + +[[constraint]] + name = "github.com/gorilla/handlers" + version = "1.3.0" + +[[constraint]] + name = "github.com/gorilla/mux" + version = "1.6.1" + +[[constraint]] + name = "github.com/spf13/viper" + version = "1.0.2" + +[[constraint]] + name = "github.com/yahoo/athenz" + version = "1.7.45" + +[[constraint]] + name = "github.com/yahoo/yfuzz" + version = "0.0.9" + +[[constraint]] + name = "k8s.io/api" + version = "kubernetes-1.10.0" + +[[constraint]] + name = "k8s.io/apimachinery" + version = "kubernetes-1.10.0" + +[[constraint]] + name = "k8s.io/client-go" + version = "7.0.0" + +[prune] + go-tests = true + unused-packages = true diff --git a/services/yfuzz-server/README.md b/services/yfuzz-server/README.md index 90ae672..2120168 100644 --- a/services/yfuzz-server/README.md +++ b/services/yfuzz-server/README.md @@ -39,7 +39,7 @@ API endpoints are documented with godoc. yFuzz is currently accessible through the use of the [yFuzz CLI](../../cmd/yfuzz-cli). ## Build -To build the server, you will need [Go](https://golang.org/), [Glide](https://glide.sh/), and [Make](https://www.gnu.org/software/make/). +To build the server, you will need [Go](https://golang.org/), [Dep](https://golang.github.io/dep/), and [Make](https://www.gnu.org/software/make/). There are two ways to build the yFuzz server: on your system, and as a docker image. diff --git a/services/yfuzz-server/glide.lock b/services/yfuzz-server/glide.lock deleted file mode 100644 index d2f0dc7..0000000 --- a/services/yfuzz-server/glide.lock +++ /dev/null @@ -1,267 +0,0 @@ -hash: 72fef5229500f569f805bd2e87a481a32ca4b81ca496a13dbe5c86daa643f001 -updated: 2018-07-06T16:47:13.139393-07:00 -imports: -- name: github.com/ardielle/ardielle-go - version: eceec2d93a832e111f4e0f7dd58adcf95a616038 - subpackages: - - rdl -- name: github.com/fsnotify/fsnotify - version: c2828203cd70a50dcccfb2761f8b1f8ceef9a8e9 -- name: github.com/ghodss/yaml - version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee -- name: github.com/gogo/protobuf - version: c0656edd0d9eab7c66d1eb0c568f9039345796f7 - subpackages: - - proto - - sortkeys -- name: github.com/golang/glog - version: 44145f04b68cf362d9c4df2182967c2275eaefed -- name: github.com/golang/protobuf - version: 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9 - subpackages: - - proto - - ptypes - - ptypes/any - - ptypes/duration - - ptypes/timestamp -- name: github.com/google/gofuzz - version: 44d81051d367757e1c7c6a5a86423ece9afcf63c -- name: github.com/googleapis/gnostic - version: 0c5108395e2debce0d731cf0287ddf7242066aba - subpackages: - - OpenAPIv2 - - compiler - - extensions -- name: github.com/gorilla/context - version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 -- name: github.com/gorilla/handlers - version: 90663712d74cb411cbef281bc1e08c19d1a76145 -- name: github.com/gorilla/mux - version: e3702bed27f0d39777b0b37b664b6280e8ef8fbf -- name: github.com/hashicorp/hcl - version: ef8a98b0bbce4a65b5aa4c368430a80ddc533168 - subpackages: - - hcl/ast - - hcl/parser - - hcl/printer - - hcl/scanner - - hcl/strconv - - hcl/token - - json/parser - - json/scanner - - json/token -- name: github.com/howeyc/gopass - version: bf9dde6d0d2c004a008c27aaee91170c786f6db8 -- name: github.com/imdario/mergo - version: 6633656539c1639d9d78127b7d47c622b5d7b6dc -- name: github.com/json-iterator/go - version: 13f86432b882000a51c6e610c620974462691a97 -- name: github.com/magiconair/properties - version: 2c9e9502788518c97fe44e8955cd069417ee89df -- name: github.com/mitchellh/mapstructure - version: 00c29f56e2386353d58c599509e8dc3801b0d716 -- name: github.com/pelletier/go-toml - version: 66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12 -- name: github.com/spf13/afero - version: 63644898a8da0bc22138abf860edaf5277b6102e - subpackages: - - mem -- name: github.com/spf13/cast - version: 8965335b8c7107321228e3e3702cab9832751bac -- name: github.com/spf13/jwalterweatherman - version: 7c0cea34c8ece3fbeb2b27ab9b59511d360fb394 -- name: github.com/spf13/pflag - version: 583c0c0531f06d5278b7d917446061adc344b5cd -- name: github.com/spf13/viper - version: b5e8006cbee93ec955a89ab31e0e3ce3204f3736 -- name: github.com/yahoo/athenz - version: 74403f71bc295cd5433b4941fe58d87a37e30a7f - subpackages: - - clients/go/zms -- name: golang.org/x/crypto - version: 81e90905daefcd6fd217b62423c0908922eadb30 - subpackages: - - ssh/terminal -- name: golang.org/x/net - version: 1c05540f6879653db88113bc4a2b70aec4bd491f - subpackages: - - context - - http2 - - http2/hpack - - idna - - lex/httplex -- name: golang.org/x/sys - version: 95c6576299259db960f6c5b9b69ea52422860fce - subpackages: - - unix - - windows -- name: golang.org/x/text - version: b19bf474d317b857955b12035d2c5acb57ce8b01 - subpackages: - - secure/bidirule - - transform - - unicode/bidi - - unicode/norm -- name: golang.org/x/time - version: f51c12702a4d776e4c1fa9b0fabab841babae631 - subpackages: - - rate -- name: gopkg.in/inf.v0 - version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 -- name: gopkg.in/yaml.v2 - version: 5420a8b6744d3b0345ab293f6fcba19c978f1183 -- name: k8s.io/api - version: 73d903622b7391f3312dcbac6483fed484e185f8 - subpackages: - - admissionregistration/v1alpha1 - - admissionregistration/v1beta1 - - apps/v1 - - apps/v1beta1 - - apps/v1beta2 - - authentication/v1 - - authentication/v1beta1 - - authorization/v1 - - authorization/v1beta1 - - autoscaling/v1 - - autoscaling/v2beta1 - - batch/v1 - - batch/v1beta1 - - batch/v2alpha1 - - certificates/v1beta1 - - core/v1 - - events/v1beta1 - - extensions/v1beta1 - - networking/v1 - - policy/v1beta1 - - rbac/v1 - - rbac/v1alpha1 - - rbac/v1beta1 - - scheduling/v1alpha1 - - settings/v1alpha1 - - storage/v1 - - storage/v1alpha1 - - storage/v1beta1 -- name: k8s.io/apimachinery - version: 302974c03f7e50f16561ba237db776ab93594ef6 - subpackages: - - pkg/api/errors - - pkg/api/meta - - pkg/api/resource - - pkg/apis - - pkg/apis/meta/v1 - - pkg/apis/meta/v1/unstructured - - pkg/apis/meta/v1beta1 - - pkg/conversion - - pkg/conversion/queryparams - - pkg/fields - - pkg/labels - - pkg/runtime - - pkg/runtime/schema - - pkg/runtime/serializer - - pkg/runtime/serializer/json - - pkg/runtime/serializer/protobuf - - pkg/runtime/serializer/recognizer - - pkg/runtime/serializer/streaming - - pkg/runtime/serializer/versioning - - pkg/selection - - pkg/types - - pkg/util/clock - - pkg/util/errors - - pkg/util/framer - - pkg/util/intstr - - pkg/util/json - - pkg/util/net - - pkg/util/runtime - - pkg/util/sets - - pkg/util/validation - - pkg/util/validation/field - - pkg/util/wait - - pkg/util/yaml - - pkg/version - - pkg/watch - - third_party/forked/golang/reflect -- name: k8s.io/client-go - version: 23781f4d6632d88e869066eaebb743857aa1ef9b - subpackages: - - discovery - - discovery/fake - - kubernetes - - kubernetes/fake - - kubernetes/scheme - - kubernetes/typed/admissionregistration/v1alpha1 - - kubernetes/typed/admissionregistration/v1alpha1/fake - - kubernetes/typed/admissionregistration/v1beta1 - - kubernetes/typed/admissionregistration/v1beta1/fake - - kubernetes/typed/apps/v1 - - kubernetes/typed/apps/v1/fake - - kubernetes/typed/apps/v1beta1 - - kubernetes/typed/apps/v1beta1/fake - - kubernetes/typed/apps/v1beta2 - - kubernetes/typed/apps/v1beta2/fake - - kubernetes/typed/authentication/v1 - - kubernetes/typed/authentication/v1/fake - - kubernetes/typed/authentication/v1beta1 - - kubernetes/typed/authentication/v1beta1/fake - - kubernetes/typed/authorization/v1 - - kubernetes/typed/authorization/v1/fake - - kubernetes/typed/authorization/v1beta1 - - kubernetes/typed/authorization/v1beta1/fake - - kubernetes/typed/autoscaling/v1 - - kubernetes/typed/autoscaling/v1/fake - - kubernetes/typed/autoscaling/v2beta1 - - kubernetes/typed/autoscaling/v2beta1/fake - - kubernetes/typed/batch/v1 - - kubernetes/typed/batch/v1/fake - - kubernetes/typed/batch/v1beta1 - - kubernetes/typed/batch/v1beta1/fake - - kubernetes/typed/batch/v2alpha1 - - kubernetes/typed/batch/v2alpha1/fake - - kubernetes/typed/certificates/v1beta1 - - kubernetes/typed/certificates/v1beta1/fake - - kubernetes/typed/core/v1 - - kubernetes/typed/core/v1/fake - - kubernetes/typed/events/v1beta1 - - kubernetes/typed/events/v1beta1/fake - - kubernetes/typed/extensions/v1beta1 - - kubernetes/typed/extensions/v1beta1/fake - - kubernetes/typed/networking/v1 - - kubernetes/typed/networking/v1/fake - - kubernetes/typed/policy/v1beta1 - - kubernetes/typed/policy/v1beta1/fake - - kubernetes/typed/rbac/v1 - - kubernetes/typed/rbac/v1/fake - - kubernetes/typed/rbac/v1alpha1 - - kubernetes/typed/rbac/v1alpha1/fake - - kubernetes/typed/rbac/v1beta1 - - kubernetes/typed/rbac/v1beta1/fake - - kubernetes/typed/scheduling/v1alpha1 - - kubernetes/typed/scheduling/v1alpha1/fake - - kubernetes/typed/settings/v1alpha1 - - kubernetes/typed/settings/v1alpha1/fake - - kubernetes/typed/storage/v1 - - kubernetes/typed/storage/v1/fake - - kubernetes/typed/storage/v1alpha1 - - kubernetes/typed/storage/v1alpha1/fake - - kubernetes/typed/storage/v1beta1 - - kubernetes/typed/storage/v1beta1/fake - - pkg/apis/clientauthentication - - pkg/apis/clientauthentication/v1alpha1 - - pkg/version - - plugin/pkg/client/auth/exec - - rest - - rest/watch - - testing - - tools - - tools/auth - - tools/clientcmd - - tools/clientcmd/api - - tools/clientcmd/api/latest - - tools/clientcmd/api/v1 - - tools/metrics - - tools/reference - - transport - - util/cert - - util/flowcontrol - - util/homedir - - util/integer -testImports: [] diff --git a/services/yfuzz-server/glide.yaml b/services/yfuzz-server/glide.yaml deleted file mode 100644 index c385d98..0000000 --- a/services/yfuzz-server/glide.yaml +++ /dev/null @@ -1,29 +0,0 @@ -package: github.com/yahoo/yfuzz/services/yfuzz-server -ignore: -- github.com/yahoo/yfuzz/pkg/schema -- github.com/yahoo/yfuzz/pkg/version -import: -- package: github.com/gorilla/mux - version: ^1.6.1 -- package: github.com/spf13/viper - version: ^1.0.2 -- package: github.com/spf13/jwalterweatherman -- package: github.com/gorilla/handlers - version: ^1.3.0 -- package: github.com/yahoo/athenz - version: ^1.7.45 - subpackages: - - clients/go/zms -- package: k8s.io/apimachinery - subpackages: - - pkg/apis -- package: k8s.io/api - subpackages: - - batch/v1 - - core/v1 -- package: k8s.io/client-go - version: ^7.0.0 - subpackages: - - kubernetes - - rest - - tools