Skip to content

Commit eb62121

Browse files
RTannRTann
authored
deps: move tools to separate module (#100)
1 parent ab9c79b commit eb62121

File tree

6 files changed

+58
-43
lines changed

6 files changed

+58
-43
lines changed

‎Makefile‎

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ export GO111MODULE := on
1616
export GOBIN := $(CURDIR)/.gobin
1717
export PATH := $(GOBIN):$(PATH)
1818

19+
# Set to empty string to echo some command lines which are hidden by default.
20+
SILENT ?= @
21+
1922
TESTFLAGS := -p 4 -race
2023

2124
### STYLE
@@ -25,51 +28,51 @@ style: imports lint vet
2528

2629
.PHONY: imports
2730
imports: dev deps
28-
@echo "+ $@"
29-
@git ls-files -- '*.go' | xargs goimports -l -w
31+
$(SILENT)echo "+ $@"
32+
$(SILENT)git ls-files -- '*.go' | xargs goimports -l -w
3033

3134
.PHONY: lint
3235
lint: dev deps
33-
@echo "+ $@"
34-
@echo $(sort $(dir $(shell git ls-files -- '*.go'))) | xargs -n 1 golint
36+
$(SILENT)echo "+ $@"
37+
$(SILENT)echo $(sort $(dir $(shell git ls-files -- '*.go'))) | xargs -n 1 golint
3538

3639
.PHONY: vet
3740
vet: dev deps
38-
@echo "+ $@"
39-
@go vet ./...
41+
$(SILENT)echo "+ $@"
42+
$(SILENT)go vet ./...
4043

4144
.PHONY: dev
4245
dev:
43-
@echo "+ $@"
44-
@go install golang.org/x/tools/cmd/goimports
45-
@go install golang.org/x/lint/golint
46+
$(SILENT)echo "+ $@"
47+
$(SILENT)cd tools/ && go install golang.org/x/tools/cmd/goimports
48+
$(SILENT)cd tools/ && go install golang.org/x/lint/golint
4649

4750
deps: go.mod go.sum
48-
@echo "+ $@"
49-
@go mod tidy
50-
@$(MAKE) download-deps
51-
@touch deps
51+
$(SILENT)echo "+ $@"
52+
$(SILENT)go mod tidy
53+
$(SILENT)$(MAKE) download-deps
54+
$(SILENT)touch deps
5255

5356
.PHONY: download-deps
5457
download-deps:
55-
@echo "+ $@"
56-
@go mod download
58+
$(SILENT)echo "+ $@"
59+
$(SILENT)go mod download
5760

5861
### SOURCE GENERATION
5962

6063
.PHONY: generate-go-srcs
6164
generate-go-srcs: dev
62-
@echo "+ $@"
63-
@go generate ./...
65+
$(SILENT)echo "+ $@"
66+
$(SILENT)go generate ./...
6467

6568
### TESTS
6669

6770
.PHONY: unit-tests
6871
unit-tests: deps
69-
@echo "+ $@"
70-
@go test $(TESTFLAGS) ./...
72+
$(SILENT)echo "+ $@"
73+
$(SILENT)go test $(TESTFLAGS) ./...
7174

7275
.PHONY: integration-tests
7376
integration-tests: deps
74-
@echo "+ $@"
75-
@cd _integration-tests ; go test -count=1 -p 4 .
77+
$(SILENT)echo "+ $@"
78+
$(SILENT)cd _integration-tests ; go test -count=1 -p 4 .

‎go.mod‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ require (
66
github.com/golang/glog v1.1.0
77
github.com/pkg/errors v0.9.1
88
github.com/stretchr/testify v1.8.4
9-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
109
golang.org/x/net v0.10.0
11-
golang.org/x/tools v0.9.1
1210
google.golang.org/grpc v1.55.0
1311
nhooyr.io/websocket v1.8.7
1412
)
@@ -18,7 +16,6 @@ require (
1816
github.com/golang/protobuf v1.5.3 // indirect
1917
github.com/klauspost/compress v1.10.3 // indirect
2018
github.com/pmezard/go-difflib v1.0.0 // indirect
21-
golang.org/x/mod v0.10.0 // indirect
2219
golang.org/x/sys v0.8.0 // indirect
2320
golang.org/x/text v0.9.0 // indirect
2421
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 // indirect

‎go.sum‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -56,34 +56,16 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
5656
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
5757
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
5858
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
59-
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
60-
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
61-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
62-
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
63-
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
64-
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
65-
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
66-
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
67-
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
6859
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
6960
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
70-
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
71-
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
72-
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
73-
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7461
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
7562
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
7663
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
77-
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
7864
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
7965
golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
8066
golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
8167
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
8268
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
83-
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
84-
golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
85-
golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
86-
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8769
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
8870
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4 h1:DdoeryqhaXp1LtT/emMP1BRJPHHKFi5akj/nbx/zNTA=
8971
google.golang.org/genproto v0.0.0-20230306155012-7f2fa6fef1f4/go.mod h1:NWraEVixdDnqcqQ30jipen1STv2r/n24Wb7twVTGR4s=

‎tools/go.mod‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module golang.stackrox.io/grpc-http1/tools
2+
3+
go 1.18
4+
5+
require (
6+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
7+
golang.org/x/tools v0.9.3
8+
)
9+
10+
require (
11+
golang.org/x/mod v0.10.0 // indirect
12+
golang.org/x/sys v0.8.0 // indirect
13+
)

‎tools/go.sum‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
2+
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
3+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
4+
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
5+
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
6+
golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk=
7+
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
8+
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
9+
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
10+
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
11+
golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI=
12+
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
13+
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
14+
golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
15+
golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
16+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
17+
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
18+
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
19+
golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
20+
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

‎tool-imports/imports.go‎ renamed to ‎tools/imports.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
//go:build tools
1616
// +build tools
1717

18-
package main
18+
package tools
1919

2020
import (
2121
_ "golang.org/x/lint/golint"

0 commit comments

Comments
 (0)