fix issues with test, rework how to stop vaulty using ctx

Author: alovak

Dockerfile

@@ -5,7 +5,7 @@ ADD go.mod /build
 WORKDIR /build 
 RUN go mod download
 ADD . /build/
-RUN go build -o bin ./... && mv ./bin/cmd ./bin/vaulty
+RUN go build -o bin ./cmd/vaulty
 FROM alpine
 RUN adduser -S -D -H -h /vaulty appuser
 RUN mkdir /.vaulty 

Makefile

@@ -8,8 +8,7 @@ LATEST := ${NAME}:latest
 
 build:
 	rm -rf ./bin/*
-	go build ${LDFLAGS} -o bin ./...
-	mv ./bin/cmd ./bin/vaulty
+	go build ${LDFLAGS} -o bin/ ./cmd/vaulty
 
 run:
 	go run ./cmd

cmd/main.go cmd/vaulty/main.go

@@ -1,7 +1,10 @@
 package main
 
 import (
+	"context"
 	"fmt"
+	"os"
+	"os/signal"
 
 	"github.com/urfave/cli/v2"
 	"github.com/vaulty/vaulty"
@@ -61,6 +64,9 @@ var proxyCommand = &cli.Command{
 		},
 	},
 	Action: func(c *cli.Context) error {
+		ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
+		defer stop()
+
 		if err := conf.FromEnvironment(); err != nil {
 			return err
 		}
@@ -69,6 +75,6 @@ var proxyCommand = &cli.Command{
 			return fmt.Errorf("Error with generating missed values: %s", err)
 		}
 
-		return vaulty.Run(conf)
+		return vaulty.Run(ctx, conf)
 	},
 }

cmd/proxy.go cmd/vaulty/proxy.go

@@ -1,38 +1,60 @@
 module github.com/vaulty/vaulty
 
-go 1.13
+go 1.23.1
 
 require (
+	github.com/aws/aws-sdk-go v1.55.5
+	github.com/elazarl/goproxy v0.0.0-20240909085733-6741dbfc16a1
+	github.com/elazarl/goproxy/ext v0.0.0-20240909085733-6741dbfc16a1
+	github.com/go-redis/redis/v7 v7.4.1
+	github.com/gobwas/glob v0.2.3
+	github.com/kelseyhightower/envconfig v1.4.0
+	github.com/mitchellh/mapstructure v1.5.0
+	github.com/ory/dockertest/v3 v3.7.0
+	github.com/rs/xid v1.6.0
+	github.com/sirupsen/logrus v1.9.3
+	github.com/stretchr/testify v1.7.0
+	github.com/tidwall/gjson v1.18.0
+	github.com/tidwall/sjson v1.2.5
+	github.com/urfave/cli/v2 v2.27.5
+)
+
+require (
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
 	github.com/Microsoft/go-winio v0.5.0 // indirect
-	github.com/aws/aws-sdk-go v1.33.3
+	github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 // indirect
 	github.com/cenkalti/backoff/v4 v4.1.1 // indirect
 	github.com/containerd/continuity v0.2.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
+	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/cli v20.10.8+incompatible // indirect
 	github.com/docker/docker v20.10.8+incompatible // indirect
-	github.com/elazarl/goproxy v0.0.0-20200426045556-49ad98f6dac1
-	github.com/elazarl/goproxy/ext v0.0.0-20200426045556-49ad98f6dac1
-	github.com/go-redis/redis/v7 v7.4.0
-	github.com/gobwas/glob v0.2.3
-	github.com/kelseyhightower/envconfig v1.4.0
-	github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
+	github.com/docker/go-connections v0.4.0 // indirect
+	github.com/docker/go-units v0.4.0 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/go-cmp v0.6.0 // indirect
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
+	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/lib/pq v1.2.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.2
 	github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
 	github.com/onsi/ginkgo v1.12.0 // indirect
 	github.com/onsi/gomega v1.9.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.0.1 // indirect
 	github.com/opencontainers/runc v1.0.2 // indirect
-	github.com/ory/dockertest/v3 v3.7.0
-	github.com/rs/xid v1.2.1
-	github.com/sirupsen/logrus v1.8.1
-	github.com/stretchr/testify v1.5.1
-	github.com/tidwall/gjson v1.9.1
-	github.com/tidwall/sjson v1.2.2
-	github.com/urfave/cli/v2 v2.2.0
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
-	golang.org/x/net v0.0.0-20210924054057-cf34111cab4d // indirect
-	golang.org/x/sys v0.0.0-20210923061019-b8560ed6a9b7 // indirect
-	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
-	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	github.com/xeipuuv/gojsonschema v1.2.0 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/sys v0.26.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )