Skip to content

Commit 2e54af3

Browse files
c0zec0ze
committed
Migrate to go dep (#640)
* dont update deps * migrate to go dep * makefile fixes
1 parent 32278fe commit 2e54af3

File tree

9 files changed

+700
-1051
lines changed

9 files changed

+700
-1051
lines changed

‎Gopkg.lock

Lines changed: 501 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Gopkg.toml

Lines changed: 192 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,192 @@
1+
2+
## Gopkg.toml example (these lines may be deleted)
3+
4+
## "required" lists a set of packages (not projects) that must be included in
5+
## Gopkg.lock. This list is merged with the set of packages imported by the current
6+
## project. Use it when your project needs a package it doesn't explicitly import -
7+
## including "main" packages.
8+
# required = ["github.com/user/thing/cmd/thing"]
9+
10+
## "ignored" lists a set of packages (not projects) that are ignored when
11+
## dep statically analyzes source code. Ignored packages can be in this project,
12+
## or in a dependency.
13+
# ignored = ["github.com/user/project/badpkg"]
14+
15+
## Dependencies define constraints on dependent projects. They are respected by
16+
## dep whether coming from the Gopkg.toml of the current project or a dependency.
17+
# [[dependencies]]
18+
## Required: the root import path of the project being constrained.
19+
# name = "github.com/user/project"
20+
#
21+
## Recommended: the version constraint to enforce for the project.
22+
## Only one of "branch", "version" or "revision" can be specified.
23+
# version = "1.0.0"
24+
# branch = "master"
25+
# revision = "abc123"
26+
#
27+
## Optional: an alternate location (URL or import path) for the project's source.
28+
# source = "https://github.com/myfork/package.git"
29+
30+
## Overrides have the same structure as [[dependencies]], but supercede all
31+
## [[dependencies]] declarations from all projects. Only the current project's
32+
## [[overrides]] are applied.
33+
##
34+
## Overrides are a sledgehammer. Use them only as a last resort.
35+
# [[overrides]]
36+
## Required: the root import path of the project being constrained.
37+
# name = "github.com/user/project"
38+
#
39+
## Optional: specifying a version constraint override will cause all other
40+
## constraints on this project to be ignored; only the overriden constraint
41+
## need be satisfied.
42+
## Again, only one of "branch", "version" or "revision" can be specified.
43+
# version = "1.0.0"
44+
# branch = "master"
45+
# revision = "abc123"
46+
#
47+
## Optional: specifying an alternate source location as an override will
48+
## enforce that the alternate location is used for that project, regardless of
49+
## what source location any dependent projects specify.
50+
# source = "https://github.com/myfork/package.git"
51+
52+
53+
54+
[[dependencies]]
55+
name = "github.com/Sirupsen/logrus"
56+
version = "^0.11.5"
57+
58+
[[dependencies]]
59+
name = "github.com/aws/aws-sdk-go"
60+
version = "^1.8.30"
61+
62+
[[dependencies]]
63+
branch = "master"
64+
name = "github.com/boltdb/bolt"
65+
66+
[[dependencies]]
67+
name = "github.com/ccirello/supervisor"
68+
version = "^0.5.3"
69+
70+
[[dependencies]]
71+
branch = "master"
72+
name = "github.com/dghubble/go-twitter"
73+
74+
[[dependencies]]
75+
name = "github.com/dghubble/oauth1"
76+
version = "^0.4.0"
77+
78+
[[dependencies]]
79+
name = "github.com/dgrijalva/jwt-go"
80+
version = "^3.0.0"
81+
82+
[[dependencies]]
83+
name = "github.com/docker/docker"
84+
version = "^17.5.0-ce-rc3"
85+
86+
[[dependencies]]
87+
branch = "master"
88+
name = "github.com/fsouza/go-dockerclient"
89+
90+
[[dependencies]]
91+
name = "github.com/garyburd/redigo"
92+
version = "^1.1.0"
93+
94+
[[dependencies]]
95+
name = "github.com/giantswarm/semver-bump"
96+
version = "^1.1.1"
97+
98+
[[dependencies]]
99+
name = "github.com/gin-gonic/gin"
100+
version = "^1.1.4"
101+
102+
[[dependencies]]
103+
branch = "master"
104+
name = "github.com/go-openapi/errors"
105+
106+
[[dependencies]]
107+
branch = "master"
108+
name = "github.com/go-openapi/loads"
109+
110+
[[dependencies]]
111+
branch = "master"
112+
name = "github.com/go-openapi/runtime"
113+
114+
[[dependencies]]
115+
branch = "master"
116+
name = "github.com/go-openapi/spec"
117+
118+
[[dependencies]]
119+
branch = "master"
120+
name = "github.com/go-openapi/strfmt"
121+
122+
[[dependencies]]
123+
branch = "master"
124+
name = "github.com/go-openapi/swag"
125+
126+
[[dependencies]]
127+
branch = "master"
128+
name = "github.com/go-openapi/validate"
129+
130+
[[dependencies]]
131+
name = "github.com/go-sql-driver/mysql"
132+
version = "^1.3.0"
133+
134+
[[dependencies]]
135+
branch = "master"
136+
name = "github.com/golang/groupcache"
137+
138+
[[dependencies]]
139+
branch = "master"
140+
name = "github.com/google/btree"
141+
142+
[[dependencies]]
143+
branch = "master"
144+
name = "github.com/iron-io/functions_go"
145+
146+
[[dependencies]]
147+
branch = "master"
148+
name = "github.com/iron-io/iron_go3"
149+
150+
[[dependencies]]
151+
branch = "master"
152+
name = "github.com/iron-io/runner"
153+
154+
[[dependencies]]
155+
branch = "master"
156+
name = "github.com/jmoiron/jsonq"
157+
158+
[[dependencies]]
159+
branch = "master"
160+
name = "github.com/lib/pq"
161+
162+
[[dependencies]]
163+
branch = "master"
164+
name = "github.com/pkg/errors"
165+
166+
[[dependencies]]
167+
name = "github.com/satori/go.uuid"
168+
version = "^1.1.0"
169+
170+
[[dependencies]]
171+
branch = "master"
172+
name = "github.com/spf13/viper"
173+
174+
[[dependencies]]
175+
name = "github.com/urfave/cli"
176+
version = "^1.19.1"
177+
178+
[[dependencies]]
179+
branch = "master"
180+
name = "golang.org/x/crypto"
181+
182+
[[dependencies]]
183+
branch = "master"
184+
name = "golang.org/x/sys"
185+
186+
[[dependencies]]
187+
branch = "v2"
188+
name = "gopkg.in/mgo.v2"
189+
190+
[[dependencies]]
191+
branch = "v2"
192+
name = "gopkg.in/yaml.v2"

‎Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.PHONY: all test dep build
33

44
dep:
5-
dep ensure --update
5+
dep ensure
66

77
build:
88
go build -o functions
@@ -23,10 +23,6 @@ test-build-arm:
2323
run:
2424
./functions
2525

26-
docker-dep:
27-
# todo: need to create a dep tool image for this (or just ditch this)
28-
docker run --rm -it -v ${CURDIR}:/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions treeder/glide install -v
29-
3026
docker-build:
3127
docker run --rm -v ${CURDIR}:/go/src/github.com/iron-io/functions -w /go/src/github.com/iron-io/functions iron/go:dev go build -o functions-alpine
3228
docker build -t iron/functions:latest .

‎fn/Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
all: vendor build
1+
all: vendor build
22
./fn
33

4-
build:
4+
build:
55
go build -o fn
66

77
docker: vendor
88
GOOS=linux go build -o fn
99
docker build -t iron/fn .
1010
docker push iron/fn
1111

12-
vendor:
13-
dep ensure --update
12+
dep:
13+
dep ensure
1414

1515
test:
1616
go test $(go list ./... | grep -v /vendor/)
@@ -22,4 +22,4 @@ release:
2222

2323
# install locally
2424
install: build
25-
sudo mv fn /usr/local/bin/
25+
sudo mv fn /usr/local/bin/

0 commit comments

Comments
 (0)