arm64 support; update all deps (#4)

.gitignore

@@ -10,4 +10,4 @@
 !*.yml
 !Makefile
 !*.md
-mod/
+dist/

Makefile

@@ -7,31 +7,34 @@ PROJ   := kubectl-ssm_secret
 DOCKER_USERNAME ?= Monkey
 DOCKER_PASSWORD ?= Magic
 PKG_DIR := pkg
+VERSION		:= $(shell git describe --tags --match "v[0-9]*" --exact HEAD 2>/dev/null || echo snapshot)
 
 #LDFLAGS := -ldflags "-X main.commit=`git rev-parse HEAD`"
-LDFLAGS := -ldflags '-extldflags "-static"'
+LDFLAGS := -ldflags "-s -w -X github.com/pr8kerl/kubectl-ssm-secret/pkg/cmd.version=$(VERSION)"
 
 all: deps fmt test $(PROJ) 
 
 deps:
 	@echo "--- collecting ingredients :bento:"
-	go mod download
+	go mod tidy -v
 
 fmt:
-	$(foreach dir, $(wildcard $(PKG_DIR)/*), go fmt $(dir)/*.go;)
-	go fmt *.go
-	$(foreach dir, $(wildcard $(PKG_DIR)/*), go vet $(dir)/*.go;)
-	go vet *.go
+	go fmt ./...
+	go vet ./...
 
 test: deps 
 	@echo "--- Is this thing working? :hammer_and_wrench:"
 	GOOS=linux go test -cover -v ./pkg/...
 
 $(PROJ): deps
 	@echo "--- make it so :cooking:"
-	go build $(LDFLAGS) -o $@ -v .
+	go build $(LDFLAGS) -o $@ -v ./cmd/$(PROJ)
 	touch $@ && chmod 755 $@
 
+build: deps 
+	@echo "--- goreleaser build :cooking:"
+	goreleaser build --single-target
+
 release: deps 
 	@echo "--- package it up! :box:"
 	goreleaser --skip-validate --skip-publish --rm-dist
@@ -43,4 +46,4 @@ publish: deps
 	sha256sum dist/kubectl-ssm-secret*.gz
 
 clean:
-	rm -rf $(PROJ) $(PROJ)-windows-amd64.exe $(PROJ)-linux-amd64 $(PROJ)-darwin-amd64 dist
+	rm -rf $(PROJ) $(PROJ)-* dist

README.md

@@ -76,7 +76,7 @@ Requires docker and docker-compose installed locally.
 ```
 % git clone git@github.com:pr8kerl/kubectl-ssm-secret.git
 % cd kubectl-ssm-secret
-% GOOS=darwin docker-compose run --rm make
+% GOOS=darwin GOARCH=arm64 docker-compose run --rm make
 ```
 
 ## Use

docker-compose.yml

@@ -2,21 +2,19 @@
 version: '3.4'
 
 x-base: &base
-  image: pr8kerl/gobuilder:1.14
+  image: pr8kerl/gobuilder:1.18
   volumes:
     - "$HOME/.kube:/root/.kube"
     - "~/.aws:/root/.aws"
-    - ./mod:/go/pkg/mod
-    - .:/go/src/github.com/pr8kerl/kubectl-ssm-secret
-  working_dir: /go/src/github.com/pr8kerl/kubectl-ssm-secret
+    - /tmp:/tmp
+    - .:/usr/local/go/src/github.com/pr8kerl/kubectl-ssm-secret
+  working_dir: /usr/local/go/src/github.com/pr8kerl/kubectl-ssm-secret
   environment:
     - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:-ap-southeast-2}
     - AWS_PROFILE=${AWS_PROFILE:-default}
-    - GO111MODULE=on
-    - GOPROXY=https://goproxy.io
-    - CGO_ENABLED=0
     - GOOS=${GOOS:-linux}
-    - GOARCH=amd64
+    - GOARCH=${GOARCH:-amd64}
+    - GOMODCACHE=/tmp/mod
     - GITHUB_TOKEN
     - TRAVIS_TAG
 

go.mod

@@ -1,22 +1,57 @@
 module github.com/pr8kerl/kubectl-ssm-secret
 
-go 1.12
+go 1.18
 
 require (
-	github.com/aws/aws-sdk-go v1.20.1
-	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/protobuf v1.3.1 // indirect
-	github.com/googleapis/gnostic v0.2.0 // indirect
-	github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc // indirect
-	github.com/imdario/mergo v0.3.7 // indirect
-	github.com/spf13/cobra v0.0.4
-	github.com/spf13/pflag v1.0.3
-	github.com/stretchr/testify v1.2.2
-	golang.org/x/net v0.0.0-20190607181551-461777fb6f67 // indirect
-	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
-	k8s.io/api v0.0.0-20190602205700-9b8cae951d65
-	k8s.io/apimachinery v0.0.0-20190607205628-5fbcd19f360b
-	k8s.io/cli-runtime v0.0.0-20190531135611-d60f41fb4dc3
-	k8s.io/client-go v0.0.0-20190531132438-d58e65e5f4b1
+	github.com/aws/aws-sdk-go v1.44.47
+	github.com/spf13/cobra v1.5.0
+	github.com/spf13/pflag v1.0.5
+	github.com/stretchr/testify v1.8.0
+	k8s.io/api v0.24.2
+	k8s.io/apimachinery v0.24.2
+	k8s.io/client-go v0.24.2
+)
+
+require (
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/emicklei/go-restful v2.9.5+incompatible // indirect
+	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
+	github.com/go-logr/logr v1.2.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
+	github.com/google/gofuzz v1.1.0 // indirect
+	github.com/imdario/mergo v0.3.5 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
+	google.golang.org/appengine v1.6.7 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/klog/v2 v2.60.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
+	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
+	sigs.k8s.io/yaml v1.2.0 // indirect
 )