From 01f13ef210d75894e201336ee54802ccfb4d12db Mon Sep 17 00:00:00 2001 From: Evgeniy Kulikov Date: Wed, 2 Dec 2020 11:52:07 +0300 Subject: [PATCH] Prepare to release - set output for flag set - change env prefix for all environments - migrate to CDN SDK release v0.1.0 Signed-off-by: Evgeniy Kulikov --- Dockerfile | 2 +- go.mod | 4 +--- go.sum | 2 ++ misc.go | 5 ++--- settings.go | 1 + 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 35365b1..ce850dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN set -x \ -v \ -mod=vendor \ -trimpath \ - -ldflags "${LDFLAGS} -X main.Build=$(date -u +%s%N) -X main.Prefix=HTTP_GW" \ + -ldflags "${LDFLAGS} -X main.Build=$(date -u +%s%N)" \ -o /go/bin/neofs-gw ./ \ && upx -3 /go/bin/neofs-gw diff --git a/go.mod b/go.mod index c85777c..5c4820b 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.13 require ( github.com/fasthttp/router v1.3.3 - github.com/nspcc-dev/cdn-neofs-sdk v0.0.0 + github.com/nspcc-dev/cdn-neofs-sdk v0.1.0 github.com/nspcc-dev/neofs-api-go v1.20.3 github.com/nspcc-dev/neofs-crypto v0.3.0 github.com/pkg/errors v0.9.1 @@ -16,5 +16,3 @@ require ( go.uber.org/zap v1.16.0 google.golang.org/grpc v1.33.2 ) - -replace github.com/nspcc-dev/cdn-neofs-sdk => ../sdk diff --git a/go.sum b/go.sum index fbf25c9..3576898 100644 --- a/go.sum +++ b/go.sum @@ -292,6 +292,8 @@ github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzE github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/nspcc-dev/cdn-neofs-sdk v0.1.0 h1:nexBQL32WeQC2mvVMiWlOqI2enKcIJlFyxejU1FeBNo= +github.com/nspcc-dev/cdn-neofs-sdk v0.1.0/go.mod h1:ujzmbHoxhuyY4SgHUDSwtfZQNHu06izC4xOkPj+YziY= github.com/nspcc-dev/dbft v0.0.0-20191205084618-dacb1a30c254/go.mod h1:w1Ln2aT+dBlPhLnuZhBV+DfPEdS2CHWWLp5JTScY3bw= github.com/nspcc-dev/dbft v0.0.0-20191209120240-0d6b7568d9ae/go.mod h1:3FjXOoHmA51EGfb5GS/HOv7VdmngNRTssSeQ729dvGY= github.com/nspcc-dev/dbft v0.0.0-20200117124306-478e5cfbf03a/go.mod h1:/YFK+XOxxg0Bfm6P92lY5eDSLYfp06XOdL8KAVgXjVk= diff --git a/misc.go b/misc.go index ea82ef6..1541334 100644 --- a/misc.go +++ b/misc.go @@ -1,9 +1,8 @@ package main +const Prefix = "HTTP_GW" + var ( Build = "now" Version = "dev" - - // TODO should be replaced with HTTP_GW - Prefix = "GW" ) diff --git a/settings.go b/settings.go index 24bf29e..5b62e6c 100644 --- a/settings.go +++ b/settings.go @@ -74,6 +74,7 @@ func settings() *viper.Viper { // flags setup: flags := pflag.NewFlagSet("commandline", pflag.ExitOnError) + flags.SetOutput(os.Stdout) flags.SortFlags = false flags.Bool("pprof", false, "enable pprof")