Add envtpl and k8split (#14)

cashapp · Nov 13, 2023 · 11ebec2 · 11ebec2
1 parent 4455c35
commit 11ebec2
Show file tree

Hide file tree

Showing 3 changed files with 82 additions and 14 deletions.
diff --git a/go-tools/Makefile b/go-tools/Makefile
@@ -4,10 +4,12 @@ export GOARCH ?= $(shell go env GOARCH)
 
 SUFFIX = $(GOOS)-$(GOARCH)
 
-UNVERSIONED_TOOLS = golang.org/x/exp/cmd/apidiff \
- github.com/robertkrimen/godocdown/godocdown \
- golang.org/x/vuln/cmd/govulncheck \
- github.com/kisielk/godepgraph
+UNVERSIONED_TOOLS = golang.org/x/exp/cmd/apidiff@latest \
+ github.com/robertkrimen/godocdown/godocdown@latest \
+ golang.org/x/vuln/cmd/govulncheck@latest \
+ github.com/kisielk/godepgraph@latest \
+ github.com/subfuzion/envtpl/cmd/envtpl@master \
+ github.com/brendanjryan/k8split@latest
 TOOLS = golang.org/x/tools:cmd/stringer \
  golang.org/x/tools:cmd/goimports \
  github.com/mailru/easyjson:easyjson \
@@ -25,11 +27,12 @@ all: sync
 
 sync:
  test -r go.mod || go mod init install
- go get $$(for tool in $(UNVERSIONED_TOOLS); do echo $$tool@latest; done) $$(for tool in $(TOOLS); do echo $$(echo $$tool | tr : /); done)
+ go get $$(for tool in $(UNVERSIONED_TOOLS); do echo $$tool; done) $$(for tool in $(TOOLS); do echo $$(echo $$tool | tr : /); done)
 
 build:
  mkdir -p unversioned
  for tool in $(UNVERSIONED_TOOLS); do \
+ tool=$${tool%@*}; \
  go get $$tool; \
  go build -o unversioned/$$(basename $$tool)-$(SUFFIX) $$tool; \
  bzip2 -9 unversioned/$$(basename $$tool)-$(SUFFIX); \

diff --git a/go-tools/go.mod b/go-tools/go.mod
@@ -7,14 +7,18 @@ require (
  github.com/AlecAivazis/survey/v2 v2.3.6 // indirect
  github.com/BurntSushi/toml v1.0.0 // indirect
  github.com/Masterminds/goutils v1.1.1 // indirect
+ github.com/Masterminds/semver v1.4.2 // indirect
  github.com/Masterminds/semver/v3 v3.1.1 // indirect
+ github.com/Masterminds/sprig v2.17.1+incompatible // indirect
  github.com/Masterminds/sprig/v3 v3.2.2 // indirect
  github.com/Microsoft/go-winio v0.5.2 // indirect
  github.com/ProtonMail/go-crypto v0.0.0-20221026131551-cf6655e29de4 // indirect
  github.com/PuerkitoBio/goquery v1.8.0 // indirect
  github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
  github.com/acomagu/bufpipe v1.0.3 // indirect
  github.com/andybalholm/cascadia v1.3.1 // indirect
+ github.com/aokoli/goutils v1.1.0 // indirect
+ github.com/brendanjryan/k8split v0.0.0-20201231030408-7469c28221ff // indirect
  github.com/bufbuild/connect-go v1.10.0 // indirect
  github.com/buildpacks/scafall v0.0.1 // indirect
  github.com/cloudflare/circl v1.1.0 // indirect
@@ -61,20 +65,22 @@ require (
  github.com/spf13/cobra v1.4.0 // indirect
  github.com/spf13/pflag v1.0.5 // indirect
  github.com/src-d/gcfg v1.4.0 // indirect
+ github.com/subfuzion/envtpl v1.0.1-0.20230111192551-7140fa02fb9d // indirect
  github.com/xanzy/ssh-agent v0.3.3 // indirect
- golang.org/x/crypto v0.14.0 // indirect
- golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
- golang.org/x/mod v0.13.0 // indirect
- golang.org/x/net v0.16.0 // indirect
- golang.org/x/sync v0.4.0 // indirect
- golang.org/x/sys v0.13.0 // indirect
- golang.org/x/term v0.13.0 // indirect
- golang.org/x/text v0.13.0 // indirect
- golang.org/x/tools v0.14.0 // indirect
+ golang.org/x/crypto v0.15.0 // indirect
+ golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
+ golang.org/x/mod v0.14.0 // indirect
+ golang.org/x/net v0.18.0 // indirect
+ golang.org/x/sync v0.5.0 // indirect
+ golang.org/x/sys v0.14.0 // indirect
+ golang.org/x/term v0.14.0 // indirect
+ golang.org/x/text v0.14.0 // indirect
+ golang.org/x/tools v0.15.0 // indirect
  golang.org/x/vuln v1.0.1 // indirect
  google.golang.org/protobuf v1.31.0 // indirect
  gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
  gopkg.in/src-d/go-git.v4 v4.13.1 // indirect
  gopkg.in/warnings.v0 v0.1.2 // indirect
  gopkg.in/yaml.v2 v2.4.0 // indirect
+ gopkg.in/yaml.v3 v3.0.0 // indirect
 )