Skip to content

Commit d2a19aa

Browse files
authored
update errors package (#13)
1 parent 3df64a4 commit d2a19aa

3 files changed

Lines changed: 106 additions & 37 deletions

File tree

go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
github.com/pkg/errors v0.9.1
88
github.com/rs/zerolog v1.33.0
99
github.com/stretchr/testify v1.9.0
10-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf
10+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988
1111
google.golang.org/grpc v1.65.0
1212
)
1313

@@ -18,10 +18,10 @@ require (
1818
github.com/mattn/go-isatty v0.0.20 // indirect
1919
github.com/pmezard/go-difflib v1.0.0 // indirect
2020
github.com/rogpeppe/go-internal v1.12.0 // indirect
21-
golang.org/x/net v0.27.0 // indirect
22-
golang.org/x/sys v0.22.0 // indirect
23-
golang.org/x/text v0.16.0 // indirect
24-
google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a // indirect
21+
golang.org/x/net v0.28.0 // indirect
22+
golang.org/x/sys v0.24.0 // indirect
23+
golang.org/x/text v0.17.0 // indirect
24+
google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 // indirect
2525
google.golang.org/protobuf v1.34.2 // indirect
2626
gopkg.in/yaml.v3 v3.0.1 // indirect
2727
)

go.sum

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,19 +28,19 @@ github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
2828
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
2929
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
3030
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
31-
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
32-
golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
31+
golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
32+
golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
3333
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3434
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3535
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
36-
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
37-
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
38-
golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
39-
golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
40-
google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a h1:YIa/rzVqMEokBkPtydCkx1VLmv3An1Uw7w1P1m6EhOY=
41-
google.golang.org/genproto/googleapis/api v0.0.0-20240723171418-e6d459c13d2a/go.mod h1:AHT0dDg3SoMOgZGnZk29b5xTbPHMoEC8qthmBLJCpys=
42-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q=
43-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
36+
golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
37+
golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
38+
golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
39+
golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
40+
google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988 h1:+/tmTy5zAieooKIXfzDm9KiA3Bv6JBwriRN9LY+yayk=
41+
google.golang.org/genproto/googleapis/api v0.0.0-20240812133136-8ffd90a71988/go.mod h1:4+X6GvPs+25wZKbQq9qyAXrwIRExv7w0Ea6MgZLZiDM=
42+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988 h1:V71AcdLZr2p8dC9dbOIMCpqi4EmRl8wUwnJzXXLmbmc=
43+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240812133136-8ffd90a71988/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
4444
google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
4545
google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
4646
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=

makefile

Lines changed: 91 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,60 @@
1-
SHELL := $(shell which bash)
1+
SHELL := $(shell which bash)
22

3-
NO_COLOR := \033[0m
4-
OK_COLOR := \033[32;01m
5-
ERR_COLOR := \033[31;01m
6-
WARN_COLOR := \033[36;01m
7-
ATTN_COLOR := \033[33;01m
3+
NO_COLOR := \033[0m
4+
OK_COLOR := \033[32;01m
5+
ERR_COLOR := \033[31;01m
6+
WARN_COLOR := \033[36;01m
7+
ATTN_COLOR := \033[33;01m
88

9-
GOOS := $(shell go env GOOS)
10-
GOARCH := $(shell go env GOARCH)
11-
GOPRIVATE := "github.com/aserto-dev"
12-
DOCKER_BUILDKIT := 1
9+
GOOS := $(shell go env GOOS)
10+
GOARCH := $(shell go env GOARCH)
11+
GOPRIVATE := "github.com/aserto-dev"
12+
DOCKER_BUILDKIT := 1
1313

14-
SVU_VERSION := 1.12.0
15-
GOTESTSUM_VERSION := 1.11.0
16-
GOLANGCI-LINT_VERSION := 1.56.2
14+
EXT_DIR := ./.ext
15+
EXT_BIN_DIR := ${EXT_DIR}/bin
16+
EXT_TMP_DIR := ${EXT_DIR}/tmp
1717

18-
EXT_DIR := ./.ext
19-
EXT_BIN_DIR := ${EXT_DIR}/bin
20-
EXT_TMP_DIR := ${EXT_DIR}/tmp
18+
VAULT_VER := 1.8.12
19+
SVU_VER := 1.12.0
20+
GOTESTSUM_VER := 1.11.0
21+
GOLANGCI-LINT_VER := 1.56.2
22+
GORELEASER_VER := 1.24.0
23+
WIRE_VER := 0.6.0
24+
BUF_VER := 1.34.0
25+
26+
RELEASE_TAG := $$(svu)
27+
28+
.DEFAULT_GOAL := build
2129

2230
.PHONY: deps
23-
deps: info install-golangci-lint install-gotestsum
31+
deps: info install-svu install-goreleaser install-golangci-lint install-gotestsum
32+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
33+
34+
.PHONY: build
35+
build:
36+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
37+
@${EXT_BIN_DIR}/goreleaser build --clean --snapshot --single-target
38+
39+
.PHONY: dev-release
40+
dev-release:
2441
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
42+
@${EXT_BIN_DIR}/goreleaser release --clean --snapshot
43+
44+
.PHONY: release
45+
release:
46+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
47+
@${EXT_BIN_DIR}/goreleaser release --clean
48+
49+
.PHONY: snapshot
50+
snapshot:
51+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
52+
@${EXT_BIN_DIR}/goreleaser release --clean --snapshot
2553

2654
.PHONY: generate
2755
generate:
2856
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
29-
@go generate ./...
57+
@GOBIN=${PWD}/${EXT_BIN_DIR} go generate ./...
3058

3159
.PHONY: lint
3260
lint:
@@ -36,37 +64,78 @@ lint:
3664
.PHONY: test
3765
test:
3866
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
39-
@${EXT_BIN_DIR}/gotestsum --format short-verbose -- -count=1 -v ./...;
67+
@${EXT_BIN_DIR}/gotestsum --format short-verbose -- -count=1 -parallel=1 -v -coverprofile=cover.out -coverpkg=./... ./...;
68+
69+
.PHONY: write-version
70+
write-version:
71+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
72+
@git describe --tags > ./VERSION.txt
73+
4074

4175
.PHONY: info
4276
info:
4377
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
4478
@echo "GOOS: ${GOOS}"
4579
@echo "GOARCH: ${GOARCH}"
80+
@echo "EXT_DIR: ${EXT_DIR}"
4681
@echo "EXT_BIN_DIR: ${EXT_BIN_DIR}"
4782
@echo "EXT_TMP_DIR: ${EXT_TMP_DIR}"
83+
@echo "RELEASE_TAG: ${RELEASE_TAG}"
84+
85+
.PHONY: install-svu
86+
install-svu: install-svu-${GOOS}
87+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
88+
@chmod +x ${EXT_BIN_DIR}/svu
89+
@${EXT_BIN_DIR}/svu --version
90+
91+
.PHONY: install-svu-darwin
92+
install-svu-darwin: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
93+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
94+
@gh release download --repo https://github.com/caarlos0/svu --pattern "svu_*_darwin_all.tar.gz" --output "${EXT_TMP_DIR}/svu.tar.gz" --clobber
95+
@tar -xvf ${EXT_TMP_DIR}/svu.tar.gz --directory ${EXT_BIN_DIR} svu &> /dev/null
96+
97+
.PHONY: install-svu-linux
98+
install-svu-linux: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
99+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
100+
@gh release download --repo https://github.com/caarlos0/svu --pattern "svu_*_linux_${GOARCH}.tar.gz" --output "${EXT_TMP_DIR}/svu.tar.gz" --clobber
101+
@tar -xvf ${EXT_TMP_DIR}/svu.tar.gz --directory ${EXT_BIN_DIR} svu &> /dev/null
48102

49103
.PHONY: install-gotestsum
50104
install-gotestsum: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
51105
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
52-
@gh release download v${GOTESTSUM_VERSION} --repo https://github.com/gotestyourself/gotestsum --pattern "gotestsum_${GOTESTSUM_VERSION}_${GOOS}_${GOARCH}.tar.gz" --output "${EXT_TMP_DIR}/gotestsum.tar.gz" --clobber
106+
@gh release download v${GOTESTSUM_VER} --repo https://github.com/gotestyourself/gotestsum --pattern "gotestsum_${GOTESTSUM_VER}_${GOOS}_${GOARCH}.tar.gz" --output "${EXT_TMP_DIR}/gotestsum.tar.gz" --clobber
53107
@tar -xvf ${EXT_TMP_DIR}/gotestsum.tar.gz --directory ${EXT_BIN_DIR} gotestsum &> /dev/null
54108
@chmod +x ${EXT_BIN_DIR}/gotestsum
55109
@${EXT_BIN_DIR}/gotestsum --version
56110

57111
.PHONY: install-golangci-lint
58112
install-golangci-lint: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
59113
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
60-
@gh release download v${GOLANGCI-LINT_VERSION} --repo https://github.com/golangci/golangci-lint --pattern "golangci-lint-${GOLANGCI-LINT_VERSION}-${GOOS}-${GOARCH}.tar.gz" --output "${EXT_TMP_DIR}/golangci-lint.tar.gz" --clobber
114+
@gh release download v${GOLANGCI-LINT_VER} --repo https://github.com/golangci/golangci-lint --pattern "golangci-lint-${GOLANGCI-LINT_VER}-${GOOS}-${GOARCH}.tar.gz" --output "${EXT_TMP_DIR}/golangci-lint.tar.gz" --clobber
61115
@tar --strip=1 -xvf ${EXT_TMP_DIR}/golangci-lint.tar.gz --strip-components=1 --directory ${EXT_TMP_DIR} &> /dev/null
62116
@mv ${EXT_TMP_DIR}/golangci-lint ${EXT_BIN_DIR}/golangci-lint
63117
@chmod +x ${EXT_BIN_DIR}/golangci-lint
64118
@${EXT_BIN_DIR}/golangci-lint --version
65119

120+
.PHONY: install-goreleaser
121+
install-goreleaser: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
122+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
123+
@gh release download v${GORELEASER_VER} --repo https://github.com/goreleaser/goreleaser --pattern "goreleaser_$$(uname -s)_$$(uname -m).tar.gz" --output "${EXT_TMP_DIR}/goreleaser.tar.gz" --clobber
124+
@tar -xvf ${EXT_TMP_DIR}/goreleaser.tar.gz --directory ${EXT_BIN_DIR} goreleaser &> /dev/null
125+
@chmod +x ${EXT_BIN_DIR}/goreleaser
126+
@${EXT_BIN_DIR}/goreleaser --version
127+
128+
66129
.PHONY: clean
67130
clean:
68131
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
69-
@rm -rf ./.ext
132+
@rm -rf ${EXT_DIR}
133+
@rm -rf ${BIN_DIR}
134+
@rm -rf ./dist
135+
136+
${BIN_DIR}:
137+
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
138+
@mkdir -p ${BIN_DIR}
70139

71140
${EXT_BIN_DIR}:
72141
@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"

0 commit comments

Comments
 (0)