echo: minor cleanup, dependecy upgradesecho/v0.16.0

5 files changed, 17 insertions, 22 deletions

diff --git a/echo/echo_default.go b/echo/echo_default.go
index b5602e6..681761a 100644
--- a/echo/echo_default.go
+++ b/echo/echo_default.go
@@ -10,7 +10,7 @@ import (
         "os"
         "sync"
 
-        "code.crute.us/mcrute/golib/clients/netbox"
+        "code.crute.us/mcrute/golib/clients/netbox/v4"
         "code.crute.us/mcrute/golib/crypto/acme/autocert"
         glmw "code.crute.us/mcrute/golib/echo/middleware"
         "code.crute.us/mcrute/golib/echo/prometheus"
diff --git a/echo/go.mod b/echo/go.mod
index 578e9fc..c19104a 100644
--- a/echo/go.mod
+++ b/echo/go.mod
@@ -3,10 +3,10 @@ module code.crute.us/mcrute/golib/echo
 go 1.18
 
 require (
-        code.crute.us/mcrute/golib v0.6.1
-        code.crute.us/mcrute/golib/clients/netbox v0.1.0
-        code.crute.us/mcrute/golib/secrets v0.1.0
-        code.crute.us/mcrute/golib/vault v0.2.4
+        code.crute.us/mcrute/golib v0.8.1
+        code.crute.us/mcrute/golib/clients/netbox/v4 v4.1.0
+        code.crute.us/mcrute/golib/secrets v0.4.0
+        code.crute.us/mcrute/golib/vault v0.2.6
         github.com/elnormous/contenttype v1.0.3
         github.com/labstack/echo/v4 v4.6.1
         github.com/labstack/gommon v0.3.1
@@ -82,5 +82,6 @@ require (
         google.golang.org/genproto v0.0.0-20200825200019-8632dd797987 // indirect
         google.golang.org/grpc v1.41.0 // indirect
         google.golang.org/protobuf v1.28.0 // indirect
+        gopkg.in/yaml.v2 v2.4.0 // indirect
         gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/echo/go.sum b/echo/go.sum
index a2d908f..48cbde5 100644
--- a/echo/go.sum
+++ b/echo/go.sum
@@ -30,14 +30,14 @@ cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0Zeo
 cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-code.crute.us/mcrute/golib v0.6.1 h1:Ldrc5Fgs6vufiFpIfwb+YpC5gID9RacHxWRPUvyeTzQ=
-code.crute.us/mcrute/golib v0.6.1/go.mod h1:nB/ZeOhlFWUwGj5jTPJxYVyqDLdO3U9ZvBiH+Kll87s=
-code.crute.us/mcrute/golib/clients/netbox v0.1.0 h1:7ae676WtINm2oSLoUw1ERIZ2ndLD5gi7cvv2iZZd1XI=
-code.crute.us/mcrute/golib/clients/netbox v0.1.0/go.mod h1:csRsnmAwenAz8Pbo7CcQTWzn6uaXadELIdB81JxsacY=
-code.crute.us/mcrute/golib/secrets v0.1.0 h1:22W0rLhE5jvIQlsUDQt1soGBEoBn4rl4a883f1yBybI=
-code.crute.us/mcrute/golib/secrets v0.1.0/go.mod h1:O1ypm8JirXI4SekwNCHwQbfsieDQJxeRNwZYoot6fvw=
-code.crute.us/mcrute/golib/vault v0.2.4 h1:lNc1hq26e/UAGBqxQlZiFffOXZSNEcEkKUzU3oRJ8Eg=
-code.crute.us/mcrute/golib/vault v0.2.4/go.mod h1:23C5g8O0zaeFfo7v6sCO0RKgnHIiHM9ku+ASOWHJD9k=
+code.crute.us/mcrute/golib v0.8.1 h1:UPJwxrB4Dd5g5NOK58RguT6x8QmUi5f8VAuv3PABbSg=
+code.crute.us/mcrute/golib v0.8.1/go.mod h1:nB/ZeOhlFWUwGj5jTPJxYVyqDLdO3U9ZvBiH+Kll87s=
+code.crute.us/mcrute/golib/clients/netbox/v4 v4.1.0 h1:bkUWDU9w3uJZzYU9B+uj8xcZXdck1E5ayw81Gy8uzRg=
+code.crute.us/mcrute/golib/clients/netbox/v4 v4.1.0/go.mod h1:ychzZiBotzfch2J6UboVDshDCOqOLxkMKx9CtS8PHKw=
+code.crute.us/mcrute/golib/secrets v0.4.0 h1:tZzQEOnJshDGuzvvr0n0BMWZbu3ZMB5QRqIDa4PwE3U=
+code.crute.us/mcrute/golib/secrets v0.4.0/go.mod h1:c40ezKg/NXe5NE3PaCRIUJC6D6XCoPSu9+duZSdKsNY=
+code.crute.us/mcrute/golib/vault v0.2.6 h1:X+TlEGFPj6pj3OqmrJprv+wJYdo8QTR2IpP3EfVniHU=
+code.crute.us/mcrute/golib/vault v0.2.6/go.mod h1:QBgcKiG94tPHAcxeRyNHrfiLGSKtojlRDLGRX5I6LgE=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
@@ -684,6 +684,7 @@ gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/echo/middleware/ip_filter.go b/echo/middleware/ip_filter.go
index 034542e..3ea6188 100644
--- a/echo/middleware/ip_filter.go
+++ b/echo/middleware/ip_filter.go
@@ -7,7 +7,7 @@ import (
         "sync"
         "time"
 
-        "code.crute.us/mcrute/golib/clients/netbox"
+        "code.crute.us/mcrute/golib/clients/netbox/v4"
         "github.com/labstack/echo/v4"
         "github.com/prometheus/client_golang/prometheus"
         "github.com/prometheus/client_golang/prometheus/promauto"
diff --git a/echo/tplfuncs/embed_csp.go b/echo/tplfuncs/embed_csp.go
index 44930c4..840714a 100644
--- a/echo/tplfuncs/embed_csp.go
+++ b/echo/tplfuncs/embed_csp.go
@@ -3,7 +3,6 @@ package tplfuncs
 import (
         "fmt"
         "html/template"
-        "io"
         "io/fs"
         "path"
 
@@ -25,13 +24,7 @@ func (t *TemplateEmbeder) Embed(filename string) ([]byte, error) {
                 return nil, fmt.Errorf("EmbedWithCSP: has not been setup with template store")
         }
 
-        fd, err := t.templateStore.Open(filename)
-        if err != nil {
-                return nil, err
-        }
-        defer fd.Close()
-
-        fc, err := io.ReadAll(fd)
+        fc, err := fs.ReadFile(t.templateStore, filename)
         if err != nil {
                 return nil, err
         }