Skip to content

Commit

Permalink
uses github.com/openziti/edge-api
Browse files Browse the repository at this point in the history 
- removes old api specific scripts, generated files, etc
  • Loading branch information
@andrewpmartinez
andrewpmartinez committed Jan 24, 2023
1 parent 2205d92 commit 69c31fc
Show file tree
Hide file tree
Showing 1,863 changed files with 156 additions and 346,916 deletions.
8 changes: 4 additions & 4 deletions controller/env/appenv.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@ import (
"github.com/lucsky/cuid"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/channel/v2"
clientServer "github.com/openziti/edge-api/go/rest_client_api_server"
clientOperations "github.com/openziti/edge-api/go/rest_client_api_server/operations"
managementServer "github.com/openziti/edge-api/go/rest_management_api_server"
managementOperations "github.com/openziti/edge-api/go/rest_management_api_server/operations"
edgeConfig "github.com/openziti/edge/controller/config"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/model"
Expand All @@ -39,10 +43,6 @@ import (
"github.com/openziti/edge/events"
"github.com/openziti/edge/internal/cert"
"github.com/openziti/edge/internal/jwtsigner"
clientServer "github.com/openziti/edge/rest_client_api_server"
clientOperations "github.com/openziti/edge/rest_client_api_server/operations"
managementServer "github.com/openziti/edge/rest_management_api_server"
managementOperations "github.com/openziti/edge/rest_management_api_server/operations"
"github.com/openziti/fabric/controller/api"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xctrl"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/api_session_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"fmt"
"github.com/go-openapi/strfmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/stringz"
"net/http"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/api_session_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ package routes

import (
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/api_session"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/api_session"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/auth_policy_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package routes
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/stringz"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/auth_policy_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ package routes

import (
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/auth_policy"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/auth_policy"
"github.com/openziti/fabric/controller/fields"
)

Expand Down
6 changes: 3 additions & 3 deletions controller/internal/routes/authenticate_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import (
"github.com/google/uuid"
"github.com/michaelquigley/pfxlog"
"github.com/mitchellh/mapstructure"
clientApiAuthentication "github.com/openziti/edge-api/go/rest_client_api_server/operations/authentication"
managementApiAuthentication "github.com/openziti/edge-api/go/rest_management_api_server/operations/authentication"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
clientApiAuthentication "github.com/openziti/edge/rest_client_api_server/operations/authentication"
managementApiAuthentication "github.com/openziti/edge/rest_management_api_server/operations/authentication"
"github.com/openziti/edge/rest_model"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/metrics"
"github.com/openziti/sdk-golang/ziti/constants"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/authenticator_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package routes
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/foundation/v2/stringz"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/authenticator_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ package routes

import (
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/authenticator"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/authenticator"
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/foundation/v2/errorz"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions controller/internal/routes/base_entity_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package routes

import (
"github.com/go-openapi/strfmt"
"github.com/openziti/edge/rest_model"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/fabric/controller/models"
"path"
)
Expand All @@ -36,7 +36,7 @@ func BaseEntityToRestModel(entity models.Entity, linkFactory LinksFactory) rest_
CreatedAt: &createdAt,
UpdatedAt: &updatedAt,
Links: linkFactory.Links(entity),
Tags: &tags,
Tags: &tags,
}

if ret.Tags.SubTags == nil {
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/base_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package routes
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
edgeApiError "github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/api"
"github.com/openziti/fabric/controller/apierror"
"github.com/openziti/fabric/controller/fields"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/ca_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
"github.com/go-openapi/strfmt"
"github.com/google/uuid"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/stringz"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/ca_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"github.com/go-openapi/runtime/middleware"
"github.com/golang-jwt/jwt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/certificate_authority"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/certificate_authority"
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/storage/boltz"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/config_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package routes
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/foundation/v2/stringz"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/config_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package routes
import (
"github.com/go-openapi/errors"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/config"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/config"
"github.com/openziti/fabric/controller/fields"
)

Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/config_type_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package routes
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/stringz"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/config_type_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package routes
import (
"github.com/go-openapi/errors"
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/config"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/config"
"github.com/openziti/fabric/controller/fields"
)

Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/current_api_session_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"fmt"
"github.com/go-openapi/strfmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"time"
)
Expand Down
6 changes: 3 additions & 3 deletions controller/internal/routes/current_api_session_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ package routes
import (
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/strfmt"
clientCurrentApiSession "github.com/openziti/edge-api/go/rest_client_api_server/operations/current_api_session"
managementCurrentApiSession "github.com/openziti/edge-api/go/rest_management_api_server/operations/current_api_session"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
clientCurrentApiSession "github.com/openziti/edge/rest_client_api_server/operations/current_api_session"
managementCurrentApiSession "github.com/openziti/edge/rest_management_api_server/operations/current_api_session"
"github.com/openziti/edge/rest_model"
"github.com/openziti/foundation/v2/stringz"
"net/http"
"time"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/current_identity_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package routes
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"path"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/current_identity_authenticator_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package routes

import (
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"path"
)
Expand Down
6 changes: 3 additions & 3 deletions controller/internal/routes/current_identity_authenticator_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ import (
"crypto/x509"
"github.com/go-openapi/runtime/middleware"
"github.com/michaelquigley/pfxlog"
clientCurrentApiSession "github.com/openziti/edge-api/go/rest_client_api_server/operations/current_api_session"
managementCurrentApiSession "github.com/openziti/edge-api/go/rest_management_api_server/operations/current_api_session"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
clientCurrentApiSession "github.com/openziti/edge/rest_client_api_server/operations/current_api_session"
managementCurrentApiSession "github.com/openziti/edge/rest_management_api_server/operations/current_api_session"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/errorz"
Expand Down
6 changes: 3 additions & 3 deletions controller/internal/routes/current_identity_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ package routes
import (
"github.com/go-openapi/runtime/middleware"
"github.com/michaelquigley/pfxlog"
clientCurrentIdentity "github.com/openziti/edge-api/go/rest_client_api_server/operations/current_identity"
managementCurrentIdentity "github.com/openziti/edge-api/go/rest_management_api_server/operations/current_identity"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/persistence"
"github.com/openziti/edge/controller/response"
clientCurrentIdentity "github.com/openziti/edge/rest_client_api_server/operations/current_identity"
managementCurrentIdentity "github.com/openziti/edge/rest_management_api_server/operations/current_identity"
"github.com/openziti/edge/rest_model"
"github.com/openziti/foundation/v2/errorz"
"github.com/openziti/storage/boltz"
"github.com/pkg/errors"
Expand Down
4 changes: 2 additions & 2 deletions controller/internal/routes/database_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import (
"github.com/go-openapi/runtime/middleware"
"github.com/go-openapi/strfmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/database"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/database"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/network"
"net/http"
"sync"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/edge_router_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

"github.com/go-openapi/strfmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/stringz"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/edge_router_policy_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ package routes
import (
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/stringz"
)
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/edge_router_policy_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ package routes

import (
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/edge_router_policy"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/edge_router_policy"
"github.com/openziti/fabric/controller/fields"
)

Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/edge_router_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ package routes

import (
"github.com/go-openapi/runtime/middleware"
"github.com/openziti/edge-api/go/rest_management_api_server/operations/edge_router"
"github.com/openziti/edge/controller/apierror"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/internal/permissions"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_management_api_server/operations/edge_router"
"github.com/openziti/fabric/controller/fields"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/storage/ast"
Expand Down
6 changes: 3 additions & 3 deletions controller/internal/routes/enroll_router.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ import (
"github.com/go-openapi/runtime"
"github.com/go-openapi/runtime/middleware"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_client_api_server/operations/enroll"
"github.com/openziti/edge-api/go/rest_client_api_server/operations/well_known"
"github.com/openziti/edge-api/go/rest_model"
"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/edge/rest_client_api_server/operations/enroll"
"github.com/openziti/edge/rest_client_api_server/operations/well_known"
"github.com/openziti/edge/rest_model"
"github.com/openziti/foundation/v2/errorz"
"net/http"
"strings"
Expand Down
2 changes: 1 addition & 1 deletion controller/internal/routes/enrollment_api_model.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"fmt"
"github.com/go-openapi/strfmt"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/edge-api/go/rest_model"
"github.com/openziti/edge/controller/env"
"github.com/openziti/edge/controller/model"
"github.com/openziti/edge/controller/response"
"github.com/openziti/edge/rest_model"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/v2/stringz"
)
Expand Down
Loading

0 comments on commit 69c31fc

Please sign in to comment.