Skip to content
This repository has been archived by the owner on Dec 14, 2023. It is now read-only.

Commit

Permalink
Move internal/certs to common. Remove some incidental files that were…
Browse files Browse the repository at this point in the history 
…n't used.
  • Loading branch information
@plorenz
plorenz committed Aug 7, 2023
1 parent 147b305 commit b061fe9
Show file tree
Hide file tree
Showing 27 changed files with 23 additions and 436 deletions.
0 internal/cert/cert.go → common/cert/cert.go
View file
File renamed without changes.
0 internal/cert/fingerprint.go → common/cert/fingerprint.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion controller/env/appenv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import (
managementServer "github.com/openziti/edge-api/rest_management_api_server"
managementOperations "github.com/openziti/edge-api/rest_management_api_server/operations"
"github.com/openziti/edge-api/rest_model"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/eid"
edgeConfig "github.com/openziti/edge/controller/config"
"github.com/openziti/edge/controller/events"
Expand All @@ -47,7 +48,6 @@ import (
"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/fabric/controller/api"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/fabric/controller/network"
Expand Down
2 changes: 1 addition & 1 deletion controller/handler_edge_ctrl/extend_enrollment.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package handler_edge_ctrl
import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/pb/edge_ctrl_pb"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/models"
"google.golang.org/protobuf/proto"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/enroll_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ import (
client_well_known "github.com/openziti/edge-api/rest_client_api_server/operations/well_known"
management_well_known "github.com/openziti/edge-api/rest_management_api_server/operations/well_known"
"github.com/openziti/edge-api/rest_model"
cert2 "github.com/openziti/edge/common/cert"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/controller/response"
cert2 "github.com/openziti/edge/internal/cert"
"github.com/openziti/foundation/v2/errorz"
"net/http"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/api_session_certificate_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package model
import (
"crypto/x509"
"fmt"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/models"
"go.etcd.io/bbolt"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/authenticator_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (
"fmt"
"github.com/google/uuid"
"github.com/michaelquigley/pfxlog"
edgeCert "github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/eid"
"github.com/openziti/edge/common/pb/edge_cmd_pb"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
edgeCert "github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/command"
"github.com/openziti/fabric/controller/fields"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/authenticator_mod_cert.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"encoding/base64"
"encoding/pem"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/errorz"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/ca_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package model
import (
"crypto/x509"
"fmt"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/eid"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/storage/boltz"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/edge_router_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ package model
import (
"encoding/json"
"fmt"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/eid"
"github.com/openziti/edge/common/pb/edge_cmd_pb"
"github.com/openziti/fabric/controller/change"
Expand All @@ -32,7 +33,6 @@ import (
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/storage/boltz"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/enrollment_manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"crypto/x509"
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/pb/edge_cmd_pb"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/command"
"github.com/openziti/fabric/controller/fields"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/enrollment_mod_ca.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"encoding/pem"
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/eid"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/models"
"github.com/sirupsen/logrus"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/model/enrollment_mod_erott.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package model
import (
"fmt"
"github.com/openziti/edge-api/rest_model"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/foundation/v2/errorz"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/enrollment_mod_ott.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package model
import (
"encoding/pem"
"github.com/openziti/edge-api/rest_model"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/eid"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/models"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/model/enrollment_mod_ottca.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package model
import (
"crypto/x509"
"encoding/pem"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
fabricApiError "github.com/openziti/fabric/controller/apierror"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/models"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/enrollment_mod_trott.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package model
import (
"fmt"
"github.com/openziti/edge-api/rest_model"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"time"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/model/enrollment_mod_updb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package model
import (
"encoding/base64"
"errors"
"github.com/openziti/edge/common/cert"
"github.com/openziti/edge/common/eid"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/fabric/controller/change"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/errorz"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/env.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"crypto/tls"
"crypto/x509"
"github.com/golang-jwt/jwt/v5"
"github.com/openziti/edge/common/cert"
"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/fabric/controller/network"
"github.com/openziti/identity"
"github.com/openziti/metrics"
Expand Down
2 changes: 1 addition & 1 deletion controller/model/testing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"crypto/x509"
"github.com/golang-jwt/jwt/v5"
"github.com/google/uuid"
"github.com/openziti/edge/common/cert"
"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/fabric/controller/change"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/identity"
Expand Down
5 changes: 0 additions & 5 deletions http-client.private.env.json
View file

This file was deleted.

Loading

0 comments on commit b061fe9

Please sign in to comment.