openziti-rest-kitchen -> openziti (#158)

This commit is contained in:
Michael Quigley 2023-01-13 15:01:34 -05:00
parent a930e44a43
commit f5ab73bcb0
No known key found for this signature in database
GPG Key ID: 9B60314A9DD20A62
151 changed files with 299 additions and 299 deletions

View File

@ -27,7 +27,7 @@ jobs:
CI: "" CI: ""
- name: go install - name: go install
run: go install -ldflags "-X github.com/openziti-test-kitchen/zrok/build.Version=${{ github.ref }} -X github.com/openziti-test-kitchen/zrok/build.Hash=${{ github.sha }}" ./... run: go install -ldflags "-X github.com/openziti/zrok/build.Version=${{ github.ref }} -X github.com/openziti/zrok/build.Hash=${{ github.sha }}" ./...
- name: test - name: test
run: go test -v ./... run: go test -v ./...

View File

@ -2,7 +2,7 @@ builds:
- id: zrok-amd64 - id: zrok-amd64
main: ./cmd/zrok main: ./cmd/zrok
binary: zrok binary: zrok
ldflags: "-s -w -X github.com/openziti-test-kitchen/zrok/build.Version={{.Tag}} -X github.com/openziti-test-kitchen/zrok/build.Hash={{.ShortCommit}}" ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}"
env: env:
- CGO_ENABLED=1 - CGO_ENABLED=1
goos: goos:
@ -15,7 +15,7 @@ builds:
- id: zrok-arm64 - id: zrok-arm64
main: ./cmd/zrok main: ./cmd/zrok
binary: zrok binary: zrok
ldflags: "-s -w -X github.com/openziti-test-kitchen/zrok/build.Version={{.Tag}} -X github.com/openziti-test-kitchen/zrok/build.Hash={{.ShortCommit}}" ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}"
env: env:
- CGO_ENABLED=1 - CGO_ENABLED=1
goos: goos:

View File

@ -1,7 +1,7 @@
builds: builds:
- main: ./cmd/zrok - main: ./cmd/zrok
binary: zrok binary: zrok
ldflags: "-s -w -X github.com/openziti-test-kitchen/zrok/build.Version={{.Tag}} -X github.com/openziti-test-kitchen/zrok/build.Hash={{.ShortCommit}}" ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}"
env: env:
- CGO_ENABLED=1 - CGO_ENABLED=1
goos: goos:

View File

@ -1,7 +1,7 @@
builds: builds:
- main: ./cmd/zrok - main: ./cmd/zrok
binary: zrok binary: zrok
ldflags: "-s -w -X github.com/openziti-test-kitchen/zrok/build.Version={{.Tag}} -X github.com/openziti-test-kitchen/zrok/build.Hash={{.ShortCommit}}" ldflags: "-s -w -X github.com/openziti/zrok/build.Version={{.Tag}} -X github.com/openziti/zrok/build.Hash={{.ShortCommit}}"
env: env:
- CGO_ENABLED=1 - CGO_ENABLED=1
- CC=/usr/bin/x86_64-w64-mingw32-gcc - CC=/usr/bin/x86_64-w64-mingw32-gcc

View File

@ -4,13 +4,13 @@ import (
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/endpoints" "github.com/openziti/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/endpoints/privateFrontend" "github.com/openziti/zrok/endpoints/privateFrontend"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok" "github.com/openziti/zrok/rest_client_zrok"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/share" "github.com/openziti/zrok/rest_client_zrok/share"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"net/url" "net/url"

View File

@ -3,8 +3,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/michaelquigley/cf" "github.com/michaelquigley/cf"
"github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend" "github.com/openziti/zrok/endpoints/publicFrontend"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -5,7 +5,7 @@ import (
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/muesli/reflow/wordwrap" "github.com/muesli/reflow/wordwrap"
"github.com/openziti-test-kitchen/zrok/endpoints" "github.com/openziti/zrok/endpoints"
"strings" "strings"
"time" "time"
) )

View File

@ -2,7 +2,7 @@ package main
import ( import (
"github.com/michaelquigley/cf" "github.com/michaelquigley/cf"
"github.com/openziti-test-kitchen/zrok/controller" "github.com/openziti/zrok/controller"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -1,9 +1,9 @@
package main package main
import ( import (
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" "github.com/openziti/zrok/rest_client_zrok/admin"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -2,8 +2,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" "github.com/openziti/zrok/rest_client_zrok/admin"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"os" "os"

View File

@ -1,9 +1,9 @@
package main package main
import ( import (
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" "github.com/openziti/zrok/rest_client_zrok/admin"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -2,7 +2,7 @@ package main
import ( import (
"github.com/michaelquigley/cf" "github.com/michaelquigley/cf"
"github.com/openziti-test-kitchen/zrok/controller" "github.com/openziti/zrok/controller"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
"github.com/jaevor/go-nanoid" "github.com/jaevor/go-nanoid"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" "github.com/openziti/zrok/rest_client_zrok/admin"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -3,8 +3,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/table"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" "github.com/openziti/zrok/rest_client_zrok/admin"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"os" "os"
"time" "time"

View File

@ -1,9 +1,9 @@
package main package main
import ( import (
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" "github.com/openziti/zrok/rest_client_zrok/admin"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -2,7 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -2,7 +2,7 @@ package main
import ( import (
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"os" "os"
) )

View File

@ -2,7 +2,7 @@ package main
import ( import (
"github.com/michaelquigley/cf" "github.com/michaelquigley/cf"
"github.com/openziti-test-kitchen/zrok/controller" "github.com/openziti/zrok/controller"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -3,10 +3,10 @@ package main
import ( import (
"fmt" "fmt"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/environment" "github.com/openziti/zrok/rest_client_zrok/environment"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -5,10 +5,10 @@ import (
"github.com/charmbracelet/bubbles/spinner" "github.com/charmbracelet/bubbles/spinner"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/environment" "github.com/openziti/zrok/rest_client_zrok/environment"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/shirou/gopsutil/v3/host" "github.com/shirou/gopsutil/v3/host"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"os" "os"

View File

@ -8,11 +8,11 @@ import (
"github.com/charmbracelet/bubbles/textinput" "github.com/charmbracelet/bubbles/textinput"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/account" "github.com/openziti/zrok/rest_client_zrok/account"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/util" "github.com/openziti/zrok/util"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -6,16 +6,16 @@ import (
"fmt" "fmt"
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/share"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui"
"github.com/openziti-test-kitchen/zrok/util"
"github.com/openziti-test-kitchen/zrok/zrokdir"
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/sdk-golang/ziti/edge" "github.com/openziti/sdk-golang/ziti/edge"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/rest_client_zrok"
"github.com/openziti/zrok/rest_client_zrok/share"
"github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti/zrok/tui"
"github.com/openziti/zrok/util"
"github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"io" "io"

View File

@ -2,10 +2,10 @@ package main
import ( import (
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/share" "github.com/openziti/zrok/rest_client_zrok/share"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -2,11 +2,11 @@ package main
import ( import (
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/model" "github.com/openziti/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/share" "github.com/openziti/zrok/rest_client_zrok/share"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"

View File

@ -5,15 +5,15 @@ import (
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/endpoints" "github.com/openziti/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend" "github.com/openziti/zrok/endpoints/proxyBackend"
"github.com/openziti-test-kitchen/zrok/endpoints/webBackend" "github.com/openziti/zrok/endpoints/webBackend"
"github.com/openziti-test-kitchen/zrok/model" "github.com/openziti/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok" "github.com/openziti/zrok/rest_client_zrok"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/share" "github.com/openziti/zrok/rest_client_zrok/share"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"

View File

@ -5,15 +5,15 @@ import (
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/endpoints" "github.com/openziti/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend" "github.com/openziti/zrok/endpoints/proxyBackend"
"github.com/openziti-test-kitchen/zrok/endpoints/webBackend" "github.com/openziti/zrok/endpoints/webBackend"
"github.com/openziti-test-kitchen/zrok/model" "github.com/openziti/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok" "github.com/openziti/zrok/rest_client_zrok"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/share" "github.com/openziti/zrok/rest_client_zrok/share"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"

View File

@ -4,14 +4,14 @@ import (
"fmt" "fmt"
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
httptransport "github.com/go-openapi/runtime/client" httptransport "github.com/go-openapi/runtime/client"
"github.com/openziti-test-kitchen/zrok/endpoints" "github.com/openziti/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend" "github.com/openziti/zrok/endpoints/proxyBackend"
"github.com/openziti-test-kitchen/zrok/endpoints/webBackend" "github.com/openziti/zrok/endpoints/webBackend"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/metadata" "github.com/openziti/zrok/rest_client_zrok/metadata"
"github.com/openziti-test-kitchen/zrok/rest_client_zrok/share" "github.com/openziti/zrok/rest_client_zrok/share"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"

View File

@ -5,7 +5,7 @@ import (
tea "github.com/charmbracelet/bubbletea" tea "github.com/charmbracelet/bubbletea"
"github.com/charmbracelet/lipgloss" "github.com/charmbracelet/lipgloss"
"github.com/muesli/reflow/wordwrap" "github.com/muesli/reflow/wordwrap"
"github.com/openziti-test-kitchen/zrok/endpoints" "github.com/openziti/zrok/endpoints"
"strings" "strings"
"time" "time"
) )

View File

@ -3,8 +3,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/table"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/openziti-test-kitchen/zrok/zrokdir" "github.com/openziti/zrok/zrokdir"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"os" "os"
) )

View File

@ -3,8 +3,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/opentracing/opentracing-go/log" "github.com/opentracing/opentracing-go/log"
"github.com/openziti-test-kitchen/zrok/cmd/zrok/endpointUi" "github.com/openziti/zrok/cmd/zrok/endpointUi"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"html/template" "html/template"

View File

@ -2,8 +2,8 @@ package main
import ( import (
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/build" "github.com/openziti/zrok/build"
"github.com/openziti-test-kitchen/zrok/tui" "github.com/openziti/zrok/tui"
"github.com/spf13/cobra" "github.com/spf13/cobra"
) )

View File

@ -2,10 +2,10 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk" "github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share" "github.com/openziti/zrok/rest_server_zrok/operations/share"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -5,10 +5,6 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/zrokdir"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/edge/rest_management_api_client/config" "github.com/openziti/edge/rest_management_api_client/config"
"github.com/openziti/edge/rest_management_api_client/edge_router_policy" "github.com/openziti/edge/rest_management_api_client/edge_router_policy"
@ -20,6 +16,10 @@ import (
rest_model_edge "github.com/openziti/edge/rest_model" rest_model_edge "github.com/openziti/edge/rest_model"
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
config2 "github.com/openziti/sdk-golang/ziti/config" config2 "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/zrok/controller/store"
"github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"time" "time"

View File

@ -2,7 +2,7 @@ package controller
import ( import (
"github.com/michaelquigley/cf" "github.com/michaelquigley/cf"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/pkg/errors" "github.com/pkg/errors"
"time" "time"
) )

View File

@ -5,11 +5,11 @@ import (
"github.com/go-openapi/loads" "github.com/go-openapi/loads"
influxdb2 "github.com/influxdata/influxdb-client-go/v2" influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok" "github.com/openziti/zrok/rest_server_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations" "github.com/openziti/zrok/rest_server_zrok/operations"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" "github.com/openziti/zrok/rest_server_zrok/operations/account"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" "github.com/openziti/zrok/rest_server_zrok/operations/metadata"
"github.com/pkg/errors" "github.com/pkg/errors"
) )

View File

@ -2,10 +2,10 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk" "github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" "github.com/openziti/zrok/rest_server_zrok/operations/admin"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -5,11 +5,11 @@ import (
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin"
"github.com/openziti/edge/rest_management_api_client/service" "github.com/openziti/edge/rest_management_api_client/service"
rest_model_edge "github.com/openziti/edge/rest_model" rest_model_edge "github.com/openziti/edge/rest_model"
"github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti/zrok/rest_server_zrok/operations/admin"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"time" "time"
) )

View File

@ -2,8 +2,8 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" "github.com/openziti/zrok/rest_server_zrok/operations/admin"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -3,10 +3,10 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/environment"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti/zrok/rest_server_zrok/operations/environment"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -5,10 +5,10 @@ import (
"encoding/json" "encoding/json"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk" "github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/environment" "github.com/openziti/zrok/rest_server_zrok/operations/environment"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -2,8 +2,8 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" "github.com/openziti/zrok/rest_server_zrok/operations/metadata"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -3,13 +3,13 @@ package controller
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/edge/rest_management_api_client/config" "github.com/openziti/edge/rest_management_api_client/config"
"github.com/openziti/edge/rest_management_api_client/service" "github.com/openziti/edge/rest_management_api_client/service"
"github.com/openziti/edge/rest_management_api_client/service_edge_router_policy" "github.com/openziti/edge/rest_management_api_client/service_edge_router_policy"
"github.com/openziti/edge/rest_management_api_client/service_policy" "github.com/openziti/edge/rest_management_api_client/service_policy"
"github.com/openziti/zrok/controller/store"
"github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"strings" "strings"

View File

@ -2,9 +2,9 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" "github.com/openziti/zrok/rest_server_zrok/operations/account"
"github.com/openziti-test-kitchen/zrok/util" "github.com/openziti/zrok/util"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -2,10 +2,10 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" "github.com/openziti/zrok/rest_server_zrok/operations/account"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" "github.com/openziti/zrok/rest_server_zrok/operations/admin"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -2,8 +2,8 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" "github.com/openziti/zrok/rest_server_zrok/operations/admin"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -2,8 +2,8 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" "github.com/openziti/zrok/rest_server_zrok/operations/account"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -7,12 +7,12 @@ import (
influxdb2 "github.com/influxdata/influxdb-client-go/v2" influxdb2 "github.com/influxdata/influxdb-client-go/v2"
"github.com/influxdata/influxdb-client-go/v2/api" "github.com/influxdata/influxdb-client-go/v2/api"
"github.com/influxdata/influxdb-client-go/v2/api/write" "github.com/influxdata/influxdb-client-go/v2/api/write"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/util"
"github.com/openziti-test-kitchen/zrok/zrokdir"
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/sdk-golang/ziti/edge" "github.com/openziti/sdk-golang/ziti/edge"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/util"
"github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/bson"

View File

@ -2,8 +2,8 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" "github.com/openziti/zrok/rest_server_zrok/operations/metadata"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -2,9 +2,9 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" "github.com/openziti/zrok/rest_server_zrok/operations/account"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -3,9 +3,9 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share" "github.com/openziti/zrok/rest_server_zrok/operations/share"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -2,9 +2,9 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" "github.com/openziti/zrok/rest_server_zrok/operations/metadata"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -1,10 +1,10 @@
package controller package controller
import ( import (
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/rest_server_zrok/operations/share"
) )
type privateResourceAllocator struct{} type privateResourceAllocator struct{}

View File

@ -1,10 +1,10 @@
package controller package controller
import ( import (
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/rest_server_zrok/operations/share"
) )
type publicResourceAllocator struct{} type publicResourceAllocator struct{}

View File

@ -3,7 +3,7 @@ package controller
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
) )
func sparkDataForShares(shrs []*store.Share) (map[string][]int64, error) { func sparkDataForShares(shrs []*store.Share) (map[string][]int64, error) {

View File

@ -3,9 +3,9 @@ package controller
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/edge/rest_management_api_client/config" "github.com/openziti/edge/rest_management_api_client/config"
"github.com/openziti/zrok/model"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"time" "time"

View File

@ -6,8 +6,8 @@ import (
"github.com/jmoiron/sqlx" "github.com/jmoiron/sqlx"
_ "github.com/lib/pq" _ "github.com/lib/pq"
_ "github.com/mattn/go-sqlite3" _ "github.com/mattn/go-sqlite3"
postgresql_schema "github.com/openziti-test-kitchen/zrok/controller/store/sql/postgresql" postgresql_schema "github.com/openziti/zrok/controller/store/sql/postgresql"
sqlite3_schema "github.com/openziti-test-kitchen/zrok/controller/store/sql/sqlite3" sqlite3_schema "github.com/openziti/zrok/controller/store/sql/sqlite3"
"github.com/pkg/errors" "github.com/pkg/errors"
migrate "github.com/rubenv/sql-migrate" migrate "github.com/rubenv/sql-migrate"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"

View File

@ -3,10 +3,10 @@ package controller
import ( import (
"fmt" "fmt"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store" "github.com/openziti/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk" "github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share" "github.com/openziti/zrok/rest_server_zrok/operations/share"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -4,12 +4,12 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/controller/store"
"github.com/openziti-test-kitchen/zrok/controller/zrokEdgeSdk"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
edge_service "github.com/openziti/edge/rest_management_api_client/service" edge_service "github.com/openziti/edge/rest_management_api_client/service"
"github.com/openziti/zrok/controller/store"
"github.com/openziti/zrok/controller/zrokEdgeSdk"
"github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti/zrok/rest_server_zrok/operations/share"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"time" "time"

View File

@ -2,8 +2,8 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" "github.com/openziti/zrok/rest_server_zrok/operations/admin"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -2,8 +2,8 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share" "github.com/openziti/zrok/rest_server_zrok/operations/share"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -6,9 +6,9 @@ import (
"encoding/hex" "encoding/hex"
errors2 "github.com/go-openapi/errors" errors2 "github.com/go-openapi/errors"
"github.com/jaevor/go-nanoid" "github.com/jaevor/go-nanoid"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/edge/rest_util" "github.com/openziti/edge/rest_util"
"github.com/openziti/zrok/rest_model_zrok"
"net/http" "net/http"
"strings" "strings"
) )

View File

@ -2,8 +2,8 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" "github.com/openziti/zrok/rest_server_zrok/operations/account"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )

View File

@ -2,7 +2,7 @@ package controller
import ( import (
"bytes" "bytes"
"github.com/openziti-test-kitchen/zrok/controller/emailUi" "github.com/openziti/zrok/controller/emailUi"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/wneessen/go-mail" "github.com/wneessen/go-mail"

View File

@ -2,9 +2,9 @@ package controller
import ( import (
"github.com/go-openapi/runtime/middleware" "github.com/go-openapi/runtime/middleware"
"github.com/openziti-test-kitchen/zrok/build" "github.com/openziti/zrok/build"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
"github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" "github.com/openziti/zrok/rest_server_zrok/operations/metadata"
) )
func versionHandler(_ metadata.VersionParams) middleware.Responder { func versionHandler(_ metadata.VersionParams) middleware.Responder {

View File

@ -3,10 +3,10 @@ package zrokEdgeSdk
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client"
"github.com/openziti/edge/rest_management_api_client/config" "github.com/openziti/edge/rest_management_api_client/config"
"github.com/openziti/edge/rest_model" "github.com/openziti/edge/rest_model"
"github.com/openziti/zrok/model"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"time" "time"
) )

View File

@ -1,8 +1,8 @@
package zrokEdgeSdk package zrokEdgeSdk
import ( import (
"github.com/openziti-test-kitchen/zrok/build"
"github.com/openziti/edge/rest_model" "github.com/openziti/edge/rest_model"
"github.com/openziti/zrok/build"
) )
func ZrokTags() *rest_model.Tags { func ZrokTags() *rest_model.Tags {

View File

@ -1,6 +1,6 @@
package privateFrontend package privateFrontend
import "github.com/openziti-test-kitchen/zrok/endpoints" import "github.com/openziti/zrok/endpoints"
type Config struct { type Config struct {
IdentityName string IdentityName string

View File

@ -3,13 +3,13 @@ package privateFrontend
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend/notFoundUi"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/util"
"github.com/openziti-test-kitchen/zrok/zrokdir"
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/zrok/endpoints"
"github.com/openziti/zrok/endpoints/publicFrontend/notFoundUi"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/util"
"github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"net" "net"

View File

@ -3,11 +3,11 @@ package proxyBackend
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/util"
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/sdk-golang/ziti/edge" "github.com/openziti/sdk-golang/ziti/edge"
"github.com/openziti/zrok/endpoints"
"github.com/openziti/zrok/util"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"net" "net"

View File

@ -3,14 +3,14 @@ package publicFrontend
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/endpoints"
"github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend/healthUi"
"github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend/notFoundUi"
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/util"
"github.com/openziti-test-kitchen/zrok/zrokdir"
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/zrok/endpoints"
"github.com/openziti/zrok/endpoints/publicFrontend/healthUi"
"github.com/openziti/zrok/endpoints/publicFrontend/notFoundUi"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/util"
"github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"net" "net"

View File

@ -1,10 +1,10 @@
package publicFrontend package publicFrontend
import ( import (
"github.com/openziti-test-kitchen/zrok/model"
"github.com/openziti-test-kitchen/zrok/zrokdir"
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/zrok/model"
"github.com/openziti/zrok/zrokdir"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"gopkg.in/mgo.v2/bson" "gopkg.in/mgo.v2/bson"

View File

@ -2,10 +2,10 @@ package webBackend
import ( import (
"fmt" "fmt"
"github.com/openziti-test-kitchen/zrok/endpoints"
"github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti"
"github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/config"
"github.com/openziti/sdk-golang/ziti/edge" "github.com/openziti/sdk-golang/ziti/edge"
"github.com/openziti/zrok/endpoints"
"github.com/pkg/errors" "github.com/pkg/errors"
"net/http" "net/http"
"time" "time"

10
go.mod
View File

@ -1,8 +1,9 @@
module github.com/openziti-test-kitchen/zrok module github.com/openziti/zrok
go 1.18 go 1.19
require ( require (
github.com/charmbracelet/bubbles v0.14.0
github.com/charmbracelet/bubbletea v0.23.1 github.com/charmbracelet/bubbletea v0.23.1
github.com/charmbracelet/lipgloss v0.6.0 github.com/charmbracelet/lipgloss v0.6.0
github.com/go-openapi/errors v0.20.2 github.com/go-openapi/errors v0.20.2
@ -22,9 +23,9 @@ require (
github.com/mattn/go-sqlite3 v1.14.14 github.com/mattn/go-sqlite3 v1.14.14
github.com/michaelquigley/cf v0.0.13 github.com/michaelquigley/cf v0.0.13
github.com/michaelquigley/pfxlog v0.6.9 github.com/michaelquigley/pfxlog v0.6.9
github.com/muesli/reflow v0.3.0
github.com/opentracing/opentracing-go v1.2.0 github.com/opentracing/opentracing-go v1.2.0
github.com/openziti/edge v0.22.39 github.com/openziti/edge v0.22.39
github.com/openziti/foundation/v2 v2.0.4
github.com/openziti/sdk-golang v0.16.125 github.com/openziti/sdk-golang v0.16.125
github.com/pkg/errors v0.9.1 github.com/pkg/errors v0.9.1
github.com/rubenv/sql-migrate v1.1.2 github.com/rubenv/sql-migrate v1.1.2
@ -43,7 +44,6 @@ require (
github.com/atotto/clipboard v0.1.4 // indirect github.com/atotto/clipboard v0.1.4 // indirect
github.com/aymanbagabas/go-osc52 v1.0.3 // indirect github.com/aymanbagabas/go-osc52 v1.0.3 // indirect
github.com/cenkalti/backoff/v4 v4.1.3 // indirect github.com/cenkalti/backoff/v4 v4.1.3 // indirect
github.com/charmbracelet/bubbles v0.14.0 // indirect
github.com/containerd/console v1.0.3 // indirect github.com/containerd/console v1.0.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect
github.com/deepmap/oapi-codegen v1.8.2 // indirect github.com/deepmap/oapi-codegen v1.8.2 // indirect
@ -74,11 +74,11 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect github.com/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // indirect
github.com/muesli/cancelreader v0.2.2 // indirect github.com/muesli/cancelreader v0.2.2 // indirect
github.com/muesli/reflow v0.3.0 // indirect
github.com/muesli/termenv v0.13.0 // indirect github.com/muesli/termenv v0.13.0 // indirect
github.com/netfoundry/secretstream v0.1.2 // indirect github.com/netfoundry/secretstream v0.1.2 // indirect
github.com/oklog/ulid v1.3.1 // indirect github.com/oklog/ulid v1.3.1 // indirect
github.com/openziti/channel/v2 v2.0.1 // indirect github.com/openziti/channel/v2 v2.0.1 // indirect
github.com/openziti/foundation/v2 v2.0.4 // indirect
github.com/openziti/identity v1.0.13 // indirect github.com/openziti/identity v1.0.13 // indirect
github.com/openziti/metrics v1.1.0 // indirect github.com/openziti/metrics v1.1.0 // indirect
github.com/openziti/transport/v2 v2.0.30 // indirect github.com/openziti/transport/v2 v2.0.30 // indirect

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewInviteParams creates a new InviteParams object, // NewInviteParams creates a new InviteParams object,

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewLoginParams creates a new LoginParams object, // NewLoginParams creates a new LoginParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// LoginReader is a Reader for the Login structure. // LoginReader is a Reader for the Login structure.

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewRegisterParams creates a new RegisterParams object, // NewRegisterParams creates a new RegisterParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// RegisterReader is a Reader for the Register structure. // RegisterReader is a Reader for the Register structure.

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewVerifyParams creates a new VerifyParams object, // NewVerifyParams creates a new VerifyParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// VerifyReader is a Reader for the Verify structure. // VerifyReader is a Reader for the Verify structure.

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewCreateFrontendParams creates a new CreateFrontendParams object, // NewCreateFrontendParams creates a new CreateFrontendParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// CreateFrontendReader is a Reader for the CreateFrontend structure. // CreateFrontendReader is a Reader for the CreateFrontend structure.

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewDeleteFrontendParams creates a new DeleteFrontendParams object, // NewDeleteFrontendParams creates a new DeleteFrontendParams object,

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewInviteTokenGenerateParams creates a new InviteTokenGenerateParams object, // NewInviteTokenGenerateParams creates a new InviteTokenGenerateParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// ListFrontendsReader is a Reader for the ListFrontends structure. // ListFrontendsReader is a Reader for the ListFrontends structure.

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewUpdateFrontendParams creates a new UpdateFrontendParams object, // NewUpdateFrontendParams creates a new UpdateFrontendParams object,

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewDisableParams creates a new DisableParams object, // NewDisableParams creates a new DisableParams object,

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewEnableParams creates a new EnableParams object, // NewEnableParams creates a new EnableParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// EnableReader is a Reader for the Enable structure. // EnableReader is a Reader for the Enable structure.

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// GetEnvironmentDetailReader is a Reader for the GetEnvironmentDetail structure. // GetEnvironmentDetailReader is a Reader for the GetEnvironmentDetail structure.

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// GetShareDetailReader is a Reader for the GetShareDetail structure. // GetShareDetailReader is a Reader for the GetShareDetail structure.

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// OverviewReader is a Reader for the Overview structure. // OverviewReader is a Reader for the Overview structure.

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// VersionReader is a Reader for the Version structure. // VersionReader is a Reader for the Version structure.

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewAccessParams creates a new AccessParams object, // NewAccessParams creates a new AccessParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// AccessReader is a Reader for the Access structure. // AccessReader is a Reader for the Access structure.

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewShareParams creates a new ShareParams object, // NewShareParams creates a new ShareParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// ShareReader is a Reader for the Share structure. // ShareReader is a Reader for the Share structure.

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewUnaccessParams creates a new UnaccessParams object, // NewUnaccessParams creates a new UnaccessParams object,

View File

@ -15,7 +15,7 @@ import (
cr "github.com/go-openapi/runtime/client" cr "github.com/go-openapi/runtime/client"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// NewUnshareParams creates a new UnshareParams object, // NewUnshareParams creates a new UnshareParams object,

View File

@ -12,7 +12,7 @@ import (
"github.com/go-openapi/runtime" "github.com/go-openapi/runtime"
"github.com/go-openapi/strfmt" "github.com/go-openapi/strfmt"
"github.com/openziti-test-kitchen/zrok/rest_model_zrok" "github.com/openziti/zrok/rest_model_zrok"
) )
// UnshareReader is a Reader for the Unshare structure. // UnshareReader is a Reader for the Unshare structure.

Some files were not shown because too many files have changed in this diff Show More