diff --git a/controller/handler_edge_ctrl/create_circuit.go b/controller/handler_edge_ctrl/create_circuit.go index 05cbe341e..912e1a9ae 100644 --- a/controller/handler_edge_ctrl/create_circuit.go +++ b/controller/handler_edge_ctrl/create_circuit.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/create_terminator.go b/controller/handler_edge_ctrl/create_terminator.go index dfaca5cb0..934fe3a36 100644 --- a/controller/handler_edge_ctrl/create_terminator.go +++ b/controller/handler_edge_ctrl/create_terminator.go @@ -18,7 +18,7 @@ package handler_edge_ctrl import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/create_tunnel_api_session.go b/controller/handler_edge_ctrl/create_tunnel_api_session.go index de1617e5d..21a2260b1 100644 --- a/controller/handler_edge_ctrl/create_tunnel_api_session.go +++ b/controller/handler_edge_ctrl/create_tunnel_api_session.go @@ -1,7 +1,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/pb/edge_ctrl_pb" diff --git a/controller/handler_edge_ctrl/create_tunnel_circuit.go b/controller/handler_edge_ctrl/create_tunnel_circuit.go index 084911d94..e2fe907ff 100644 --- a/controller/handler_edge_ctrl/create_tunnel_circuit.go +++ b/controller/handler_edge_ctrl/create_tunnel_circuit.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/create_tunnel_terminator.go b/controller/handler_edge_ctrl/create_tunnel_terminator.go index b6497b34c..e744c4099 100644 --- a/controller/handler_edge_ctrl/create_tunnel_terminator.go +++ b/controller/handler_edge_ctrl/create_tunnel_terminator.go @@ -18,7 +18,7 @@ package handler_edge_ctrl import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/extend_enrollment.go b/controller/handler_edge_ctrl/extend_enrollment.go index 633397ecb..cfe5184b3 100644 --- a/controller/handler_edge_ctrl/extend_enrollment.go +++ b/controller/handler_edge_ctrl/extend_enrollment.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/extend_enrollment_verify.go b/controller/handler_edge_ctrl/extend_enrollment_verify.go index c7f4b5800..757aae2d8 100644 --- a/controller/handler_edge_ctrl/extend_enrollment_verify.go +++ b/controller/handler_edge_ctrl/extend_enrollment_verify.go @@ -18,7 +18,7 @@ package handler_edge_ctrl import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/pb/edge_ctrl_pb" diff --git a/controller/handler_edge_ctrl/health_event.go b/controller/handler_edge_ctrl/health_event.go index 61ac56dce..44473f7cc 100644 --- a/controller/handler_edge_ctrl/health_event.go +++ b/controller/handler_edge_ctrl/health_event.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/heartbeat.go b/controller/handler_edge_ctrl/heartbeat.go index d0894c167..7a3506865 100644 --- a/controller/handler_edge_ctrl/heartbeat.go +++ b/controller/handler_edge_ctrl/heartbeat.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/pb/edge_ctrl_pb" diff --git a/controller/handler_edge_ctrl/hello.go b/controller/handler_edge_ctrl/hello.go index f1b3b064c..6f03a45cc 100644 --- a/controller/handler_edge_ctrl/hello.go +++ b/controller/handler_edge_ctrl/hello.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/list_tunnel_services.go b/controller/handler_edge_ctrl/list_tunnel_services.go index 3053d05f0..12ca56f57 100644 --- a/controller/handler_edge_ctrl/list_tunnel_services.go +++ b/controller/handler_edge_ctrl/list_tunnel_services.go @@ -2,7 +2,7 @@ package handler_edge_ctrl import ( "encoding/json" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" "github.com/openziti/edge/pb/edge_ctrl_pb" diff --git a/controller/handler_edge_ctrl/remove_terminator.go b/controller/handler_edge_ctrl/remove_terminator.go index a1dbef9df..b497ec444 100644 --- a/controller/handler_edge_ctrl/remove_terminator.go +++ b/controller/handler_edge_ctrl/remove_terminator.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/resync.go b/controller/handler_edge_ctrl/resync.go index 9e7870f1f..012eb557b 100644 --- a/controller/handler_edge_ctrl/resync.go +++ b/controller/handler_edge_ctrl/resync.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/update_terminator.go b/controller/handler_edge_ctrl/update_terminator.go index 37d4c38c5..cb593865e 100644 --- a/controller/handler_edge_ctrl/update_terminator.go +++ b/controller/handler_edge_ctrl/update_terminator.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/update_tunnel_terminator.go b/controller/handler_edge_ctrl/update_tunnel_terminator.go index aec21c39c..2559e12d9 100644 --- a/controller/handler_edge_ctrl/update_tunnel_terminator.go +++ b/controller/handler_edge_ctrl/update_tunnel_terminator.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/handler_edge_ctrl/validate_sessions.go b/controller/handler_edge_ctrl/validate_sessions.go index 2b958f687..1ed7d7f5c 100644 --- a/controller/handler_edge_ctrl/validate_sessions.go +++ b/controller/handler_edge_ctrl/validate_sessions.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/controller/sync_strats/sync_instant.go b/controller/sync_strats/sync_instant.go index 8721f6d25..d8fd709c2 100644 --- a/controller/sync_strats/sync_instant.go +++ b/controller/sync_strats/sync_instant.go @@ -19,7 +19,7 @@ package sync_strats import ( "encoding/json" "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/lucsky/cuid" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" diff --git a/pb/edge_ctrl_pb/decoder.go b/pb/edge_ctrl_pb/decoder.go index c0443a6e5..4e4f0829c 100644 --- a/pb/edge_ctrl_pb/decoder.go +++ b/pb/edge_ctrl_pb/decoder.go @@ -18,7 +18,7 @@ package edge_ctrl_pb import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "strings" diff --git a/router/fabric/heartbeat.go b/router/fabric/heartbeat.go index 8de3cf940..15eb8733e 100644 --- a/router/fabric/heartbeat.go +++ b/router/fabric/heartbeat.go @@ -17,7 +17,7 @@ package fabric import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/router/fabric/manager.go b/router/fabric/manager.go index 20fa47d2f..73c667219 100644 --- a/router/fabric/manager.go +++ b/router/fabric/manager.go @@ -19,7 +19,7 @@ package fabric import ( "bufio" "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/kataras/go-events" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" diff --git a/router/handler_edge_ctrl/apiSessionRemoved.go b/router/handler_edge_ctrl/apiSessionRemoved.go index 718b5db2b..c2230c517 100644 --- a/router/handler_edge_ctrl/apiSessionRemoved.go +++ b/router/handler_edge_ctrl/apiSessionRemoved.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/router/handler_edge_ctrl/apiSessionUpdated.go b/router/handler_edge_ctrl/apiSessionUpdated.go index f46a27486..70954634a 100644 --- a/router/handler_edge_ctrl/apiSessionUpdated.go +++ b/router/handler_edge_ctrl/apiSessionUpdated.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/router/handler_edge_ctrl/extendEnrollmentCerts.go b/router/handler_edge_ctrl/extendEnrollmentCerts.go index 45f4be672..a0b349089 100644 --- a/router/handler_edge_ctrl/extendEnrollmentCerts.go +++ b/router/handler_edge_ctrl/extendEnrollmentCerts.go @@ -19,7 +19,7 @@ package handler_edge_ctrl import ( "crypto/sha1" "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/channel/protobufs" diff --git a/router/handler_edge_ctrl/hello.go b/router/handler_edge_ctrl/hello.go index e3cb52556..d76dca259 100644 --- a/router/handler_edge_ctrl/hello.go +++ b/router/handler_edge_ctrl/hello.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/channel/protobufs" diff --git a/router/handler_edge_ctrl/serviceList.go b/router/handler_edge_ctrl/serviceList.go index 054859a89..cf4f50594 100644 --- a/router/handler_edge_ctrl/serviceList.go +++ b/router/handler_edge_ctrl/serviceList.go @@ -2,7 +2,7 @@ package handler_edge_ctrl import ( "encoding/json" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/openziti/channel" "github.com/openziti/edge/pb/edge_ctrl_pb" "github.com/openziti/sdk-golang/ziti/edge" diff --git a/router/handler_edge_ctrl/sessionRemoved.go b/router/handler_edge_ctrl/sessionRemoved.go index 844d87535..ab22fccde 100644 --- a/router/handler_edge_ctrl/sessionRemoved.go +++ b/router/handler_edge_ctrl/sessionRemoved.go @@ -17,7 +17,7 @@ package handler_edge_ctrl import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env" diff --git a/router/xgress_edge/certchecker.go b/router/xgress_edge/certchecker.go index bcf284851..c360aeb21 100644 --- a/router/xgress_edge/certchecker.go +++ b/router/xgress_edge/certchecker.go @@ -19,7 +19,7 @@ package xgress_edge import ( "crypto/x509" "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/michaelquigley/pfxlog" "github.com/openziti/channel" "github.com/openziti/edge/controller/env"