build: update github.com/moov-io/base to v0.46.0

moov-io · Aug 21, 2023 · 57af175 · 57af175
1 parent e9f4e78
commit 57af175
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/cmd/server/main.go b/cmd/server/main.go
@@ -121,7 +121,12 @@ func main() {
 	}
 
 	// Admin server (metrics and debugging)
-	adminServer := admin.NewServer(*adminAddr)
+	adminServer, err := admin.New(admin.Opts{
+		Addr: *adminAddr,
+	})
+	if err != nil {
+		errs <- logger.Fatal().LogErrorf("problem running admin server: %v", err).Err()
+	}
 	adminServer.AddVersionHandler(ach.Version) // Setup 'GET /version'
 	go func() {
 		logger.Logf("admin listening on %s", adminServer.BindAddr())

diff --git a/cmd/webui/main.go b/cmd/webui/main.go
@@ -45,7 +45,13 @@ func main() {
 	}()
 
 	// Start Admin server (with Prometheus metrics)
-	adminServer := admin.NewServer(*adminAddr)
+	adminServer, err := admin.New(admin.Opts{
+		Addr: *adminAddr,
+	})
+	if err != nil {
+		errs <- fmt.Errorf("problem running admin server: %v", err)
+		os.Exit(1)
+	}
 	adminServer.AddVersionHandler(ach.Version) // Setup 'GET /version'
 	go func() {
 		log.Printf("listening on %s", adminServer.BindAddr())
@@ -64,7 +70,7 @@ func main() {
 	// Register our assets route
 	assetsPath := strx.Or(os.Getenv("ASSETS_PATH"), filepath.Join("cmd", "webui", "assets"))
 	log.Printf("serving assets from %s", assetsPath)
-	err := addAssetsPath(router, assetsPath)
+	err = addAssetsPath(router, assetsPath)
 	if err != nil {
 		log.Print(err)
 		errs <- err

diff --git a/go.mod b/go.mod
@@ -9,7 +9,7 @@ require (
 	github.com/go-kit/log v0.2.1
 	github.com/gorilla/mux v1.8.0
 	github.com/juju/ansiterm v1.0.0
-	github.com/moov-io/base v0.45.1
+	github.com/moov-io/base v0.46.0
 	github.com/moov-io/iso4217 v0.3.0
 	github.com/prometheus/client_golang v1.16.0
 	github.com/stretchr/testify v1.8.4

diff --git a/go.sum b/go.sum
@@ -44,8 +44,8 @@ github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APP
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
-github.com/moov-io/base v0.45.1 h1:1gZuINLBAw+HS78NLcKjSd8cH8fmA2qIHZwgYP+N/WU=
-github.com/moov-io/base v0.45.1/go.mod h1:F2hLIojBgQJxRWTFLRTYuta/w+z2BBgDcd5k0BSifGA=
+github.com/moov-io/base v0.46.0 h1:4sgFjfD9EELJ+i6cGfPtezoPAAxwE3imLJ64bbHtBwM=
+github.com/moov-io/base v0.46.0/go.mod h1:AFoLPJA1uuylLp33g1nGzTnGk8zyqYH7KfBS7flc0P8=
 github.com/moov-io/iso4217 v0.3.0 h1:xAxeJEn7QIpEy971eElEGiaLNdj81UwOcCcvE6j2ZAo=
 github.com/moov-io/iso4217 v0.3.0/go.mod h1:/pF1mBInDSJtwyWkLNr8EMdIn1zIl2cyjaVi4Xhpd44=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=