Skip to content
This repository has been archived by the owner on Feb 13, 2021. It is now read-only.

Commit

Permalink
replace glide with dep
Browse files Browse the repository at this point in the history
  • Loading branch information
tariqibrahim committed Nov 25, 2018
1 parent acb0858 commit 773e846
Show file tree
Hide file tree
Showing 1,846 changed files with 771,311 additions and 6 deletions.
618 changes: 618 additions & 0 deletions Gopkg.lock

Large diffs are not rendered by default.

70 changes: 70 additions & 0 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# 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]]
name = "github.com/fatih/color"
version = "1.7.0"

[[constraint]]
name = "github.com/gorilla/handlers"
version = "1.4.0"

[[constraint]]
name = "github.com/gorilla/mux"
version = "1.6.2"

[[constraint]]
name = "github.com/spf13/jwalterweatherman"
version = "1.0.0"

[[constraint]]
name = "github.com/spf13/viper"
version = "1.2.1"

[[constraint]]
name = "github.com/yahoo/athenz"
version = "1.8.9"

[[constraint]]
name = "gopkg.in/urfave/cli.v1"
version = "1.20.0"

[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.12.0"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.12.0"

[[constraint]]
name = "k8s.io/client-go"
version = "9.0.0"

[prune]
go-tests = true
unused-packages = true
2 changes: 1 addition & 1 deletion cmd/yfuzz-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 12 additions & 4 deletions scripts/go.mk
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@

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
go $(1) -ldflags "-s -w -X github.com/yahoo/yfuzz/pkg/version.Version=${YFUZZ_BUILD_VERSION} \
-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}.
Expand All @@ -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/
Expand All @@ -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
2 changes: 1 addition & 1 deletion services/yfuzz-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
168 changes: 168 additions & 0 deletions vendor/github.com/ardielle/ardielle-go/LICENSE

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions vendor/github.com/ardielle/ardielle-go/rdl/array.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 32 additions & 0 deletions vendor/github.com/ardielle/ardielle-go/rdl/auth.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 773e846

Please sign in to comment.