From 03b58ebcd34ce995e8fd865abe811e08fd275ed2 Mon Sep 17 00:00:00 2001 From: Paul Lorenz Date: Fri, 4 Aug 2023 13:07:37 -0400 Subject: [PATCH] Move jwtsigner package to controller --- controller/env/appenv.go | 2 +- {internal => controller}/jwtsigner/jwt.go | 0 controller/model/env.go | 2 +- controller/model/testing.go | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename {internal => controller}/jwtsigner/jwt.go (100%) diff --git a/controller/env/appenv.go b/controller/env/appenv.go index 70d7edcb3..9850105a1 100644 --- a/controller/env/appenv.go +++ b/controller/env/appenv.go @@ -42,12 +42,12 @@ import ( edgeConfig "github.com/openziti/edge/controller/config" "github.com/openziti/edge/controller/events" "github.com/openziti/edge/controller/internal/permissions" + "github.com/openziti/edge/controller/jwtsigner" "github.com/openziti/edge/controller/model" "github.com/openziti/edge/controller/oidc_auth" "github.com/openziti/edge/controller/persistence" "github.com/openziti/edge/controller/response" "github.com/openziti/edge/internal/cert" - "github.com/openziti/edge/internal/jwtsigner" "github.com/openziti/fabric/controller/api" "github.com/openziti/fabric/controller/models" "github.com/openziti/fabric/controller/network" diff --git a/internal/jwtsigner/jwt.go b/controller/jwtsigner/jwt.go similarity index 100% rename from internal/jwtsigner/jwt.go rename to controller/jwtsigner/jwt.go diff --git a/controller/model/env.go b/controller/model/env.go index edcfa296a..39d858288 100644 --- a/controller/model/env.go +++ b/controller/model/env.go @@ -21,9 +21,9 @@ import ( "crypto/x509" "github.com/golang-jwt/jwt/v5" "github.com/openziti/edge/controller/config" + "github.com/openziti/edge/controller/jwtsigner" "github.com/openziti/edge/controller/persistence" "github.com/openziti/edge/internal/cert" - "github.com/openziti/edge/internal/jwtsigner" "github.com/openziti/fabric/controller/network" "github.com/openziti/identity" "github.com/openziti/metrics" diff --git a/controller/model/testing.go b/controller/model/testing.go index 9cc8071e7..9be9bede1 100644 --- a/controller/model/testing.go +++ b/controller/model/testing.go @@ -23,9 +23,9 @@ import ( "github.com/google/uuid" "github.com/openziti/edge/common/eid" "github.com/openziti/edge/controller/config" + "github.com/openziti/edge/controller/jwtsigner" "github.com/openziti/edge/controller/persistence" "github.com/openziti/edge/internal/cert" - "github.com/openziti/edge/internal/jwtsigner" "github.com/openziti/fabric/controller/change" "github.com/openziti/fabric/controller/network" "github.com/openziti/identity"