From 5935e19d28cef213c592386f4ff8a6f84c3a5cfb Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Sat, 21 May 2022 22:59:49 -0700 Subject: echo: move netbox to standalone --- echo/echo_default.go | 2 +- echo/go.mod | 5 +++-- echo/go.sum | 6 ++++-- echo/middleware/ip_filter.go | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/echo/echo_default.go b/echo/echo_default.go index e518556..6977eed 100644 --- a/echo/echo_default.go +++ b/echo/echo_default.go @@ -10,9 +10,9 @@ import ( "os" "sync" + "code.crute.us/mcrute/golib/clients/netbox" glautocert "code.crute.us/mcrute/golib/crypto/acme/autocert" glmw "code.crute.us/mcrute/golib/echo/middleware" - "code.crute.us/mcrute/golib/echo/netbox" "code.crute.us/mcrute/golib/echo/prometheus" "code.crute.us/mcrute/golib/service" glservice "code.crute.us/mcrute/golib/service" diff --git a/echo/go.mod b/echo/go.mod index 5045f97..2fe2e2b 100644 --- a/echo/go.mod +++ b/echo/go.mod @@ -5,8 +5,9 @@ go 1.17 replace code.crute.us/mcrute/golib => ../ require ( - code.crute.us/mcrute/golib v0.3.5 - code.crute.us/mcrute/golib/vault v0.2.3 + code.crute.us/mcrute/golib v0.3.6 + code.crute.us/mcrute/golib/clients/netbox v0.1.0 + code.crute.us/mcrute/golib/vault v0.2.4 github.com/elnormous/contenttype v1.0.0 github.com/labstack/echo/v4 v4.6.1 github.com/labstack/gommon v0.3.1 diff --git a/echo/go.sum b/echo/go.sum index a9ff842..f17007f 100644 --- a/echo/go.sum +++ b/echo/go.sum @@ -30,8 +30,10 @@ 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/vault v0.2.3 h1:rIEW+JnCbixLWbupHdWy0FFW2DVNMpHoJ+8Qbd0W9fU= -code.crute.us/mcrute/golib/vault v0.2.3/go.mod h1:23C5g8O0zaeFfo7v6sCO0RKgnHIiHM9ku+ASOWHJD9k= +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/vault v0.2.4 h1:lNc1hq26e/UAGBqxQlZiFffOXZSNEcEkKUzU3oRJ8Eg= +code.crute.us/mcrute/golib/vault v0.2.4/go.mod h1:23C5g8O0zaeFfo7v6sCO0RKgnHIiHM9ku+ASOWHJD9k= 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= diff --git a/echo/middleware/ip_filter.go b/echo/middleware/ip_filter.go index 2d79925..fe601d2 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/echo/netbox" + "code.crute.us/mcrute/golib/clients/netbox" "github.com/labstack/echo/v4" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promauto" -- cgit v1.2.3