diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index f81d1fa9..c5e6cc7b 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -27,7 +27,7 @@ jobs: CI: "" - 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 run: go test -v ./... \ No newline at end of file diff --git a/.goreleaser-darwin.yml b/.goreleaser-darwin.yml index d3230fe2..db3112c7 100644 --- a/.goreleaser-darwin.yml +++ b/.goreleaser-darwin.yml @@ -2,7 +2,7 @@ builds: - id: zrok-amd64 main: ./cmd/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: - CGO_ENABLED=1 goos: @@ -15,7 +15,7 @@ builds: - id: zrok-arm64 main: ./cmd/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: - CGO_ENABLED=1 goos: diff --git a/.goreleaser-linux.yml b/.goreleaser-linux.yml index 5838b2d0..2520c19f 100644 --- a/.goreleaser-linux.yml +++ b/.goreleaser-linux.yml @@ -1,7 +1,7 @@ builds: - main: ./cmd/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: - CGO_ENABLED=1 goos: diff --git a/.goreleaser-windows.yml b/.goreleaser-windows.yml index 9601d1dc..b14196bc 100644 --- a/.goreleaser-windows.yml +++ b/.goreleaser-windows.yml @@ -1,7 +1,7 @@ builds: - main: ./cmd/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: - CGO_ENABLED=1 - CC=/usr/bin/x86_64-w64-mingw32-gcc diff --git a/cmd/zrok/accessPrivate.go b/cmd/zrok/accessPrivate.go index d76e32a4..c69e5fe8 100644 --- a/cmd/zrok/accessPrivate.go +++ b/cmd/zrok/accessPrivate.go @@ -4,13 +4,13 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" - "github.com/openziti-test-kitchen/zrok/endpoints" - "github.com/openziti-test-kitchen/zrok/endpoints/privateFrontend" - "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/zrokdir" + "github.com/openziti/zrok/endpoints" + "github.com/openziti/zrok/endpoints/privateFrontend" + "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/zrokdir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "net/url" diff --git a/cmd/zrok/accessPublic.go b/cmd/zrok/accessPublic.go index 9e08f471..f3353929 100644 --- a/cmd/zrok/accessPublic.go +++ b/cmd/zrok/accessPublic.go @@ -3,8 +3,8 @@ package main import ( "fmt" "github.com/michaelquigley/cf" - "github.com/openziti-test-kitchen/zrok/endpoints/publicFrontend" - "github.com/openziti-test-kitchen/zrok/tui" + "github.com/openziti/zrok/endpoints/publicFrontend" + "github.com/openziti/zrok/tui" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/accessTui.go b/cmd/zrok/accessTui.go index fee5e292..0ce46477 100644 --- a/cmd/zrok/accessTui.go +++ b/cmd/zrok/accessTui.go @@ -5,7 +5,7 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" "github.com/muesli/reflow/wordwrap" - "github.com/openziti-test-kitchen/zrok/endpoints" + "github.com/openziti/zrok/endpoints" "strings" "time" ) diff --git a/cmd/zrok/adminBootstrap.go b/cmd/zrok/adminBootstrap.go index 189646de..878e5296 100644 --- a/cmd/zrok/adminBootstrap.go +++ b/cmd/zrok/adminBootstrap.go @@ -2,7 +2,7 @@ package main import ( "github.com/michaelquigley/cf" - "github.com/openziti-test-kitchen/zrok/controller" + "github.com/openziti/zrok/controller" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/adminCreateFrontend.go b/cmd/zrok/adminCreateFrontend.go index b4ab75b3..8c3fc98c 100644 --- a/cmd/zrok/adminCreateFrontend.go +++ b/cmd/zrok/adminCreateFrontend.go @@ -1,9 +1,9 @@ package main import ( - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/admin" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/zrokdir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/adminCreateIdentity.go b/cmd/zrok/adminCreateIdentity.go index 20421f5a..ee04feef 100644 --- a/cmd/zrok/adminCreateIdentity.go +++ b/cmd/zrok/adminCreateIdentity.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/admin" + "github.com/openziti/zrok/zrokdir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "os" diff --git a/cmd/zrok/adminDeleteFrontend.go b/cmd/zrok/adminDeleteFrontend.go index 51d41146..ef3c8fec 100644 --- a/cmd/zrok/adminDeleteFrontend.go +++ b/cmd/zrok/adminDeleteFrontend.go @@ -1,9 +1,9 @@ package main import ( - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/admin" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/zrokdir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/adminGc.go b/cmd/zrok/adminGc.go index 2733a3d9..ff597ec7 100644 --- a/cmd/zrok/adminGc.go +++ b/cmd/zrok/adminGc.go @@ -2,7 +2,7 @@ package main import ( "github.com/michaelquigley/cf" - "github.com/openziti-test-kitchen/zrok/controller" + "github.com/openziti/zrok/controller" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/adminGenerate.go b/cmd/zrok/adminGenerate.go index 918ca4c2..c8d7c996 100644 --- a/cmd/zrok/adminGenerate.go +++ b/cmd/zrok/adminGenerate.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/jaevor/go-nanoid" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/admin" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/zrokdir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/adminListFrontends.go b/cmd/zrok/adminListFrontends.go index 6167de90..8a8fbf64 100644 --- a/cmd/zrok/adminListFrontends.go +++ b/cmd/zrok/adminListFrontends.go @@ -3,8 +3,8 @@ package main import ( "fmt" "github.com/jedib0t/go-pretty/v6/table" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/admin" + "github.com/openziti/zrok/zrokdir" "github.com/spf13/cobra" "os" "time" diff --git a/cmd/zrok/adminUpdateFrontend.go b/cmd/zrok/adminUpdateFrontend.go index 3fc8949c..2605458a 100644 --- a/cmd/zrok/adminUpdateFrontend.go +++ b/cmd/zrok/adminUpdateFrontend.go @@ -1,9 +1,9 @@ package main import ( - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/admin" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/zrokdir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/configGet.go b/cmd/zrok/configGet.go index 57403215..5340cf4b 100644 --- a/cmd/zrok/configGet.go +++ b/cmd/zrok/configGet.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/zrokdir" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/configSet.go b/cmd/zrok/configSet.go index 8f7f0abd..98204137 100644 --- a/cmd/zrok/configSet.go +++ b/cmd/zrok/configSet.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/zrokdir" "github.com/spf13/cobra" "os" ) diff --git a/cmd/zrok/controller.go b/cmd/zrok/controller.go index c2b0b3b1..cf62688d 100644 --- a/cmd/zrok/controller.go +++ b/cmd/zrok/controller.go @@ -2,7 +2,7 @@ package main import ( "github.com/michaelquigley/cf" - "github.com/openziti-test-kitchen/zrok/controller" + "github.com/openziti/zrok/controller" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/disable.go b/cmd/zrok/disable.go index 6e2ea4d0..d1382e8c 100644 --- a/cmd/zrok/disable.go +++ b/cmd/zrok/disable.go @@ -3,10 +3,10 @@ package main import ( "fmt" httptransport "github.com/go-openapi/runtime/client" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/environment" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/tui" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/environment" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/tui" + "github.com/openziti/zrok/zrokdir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/enable.go b/cmd/zrok/enable.go index b536df6a..bf8406eb 100644 --- a/cmd/zrok/enable.go +++ b/cmd/zrok/enable.go @@ -5,10 +5,10 @@ import ( "github.com/charmbracelet/bubbles/spinner" tea "github.com/charmbracelet/bubbletea" httptransport "github.com/go-openapi/runtime/client" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/environment" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/tui" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/environment" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/tui" + "github.com/openziti/zrok/zrokdir" "github.com/shirou/gopsutil/v3/host" "github.com/spf13/cobra" "os" diff --git a/cmd/zrok/invite.go b/cmd/zrok/invite.go index 9c855fbf..86639216 100644 --- a/cmd/zrok/invite.go +++ b/cmd/zrok/invite.go @@ -8,11 +8,11 @@ import ( "github.com/charmbracelet/bubbles/textinput" tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/account" - "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/zrok/rest_client_zrok/account" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/tui" + "github.com/openziti/zrok/util" + "github.com/openziti/zrok/zrokdir" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/loop.go b/cmd/zrok/loop.go index 71486a99..66e2f0e9 100644 --- a/cmd/zrok/loop.go +++ b/cmd/zrok/loop.go @@ -6,16 +6,16 @@ import ( "fmt" "github.com/go-openapi/runtime" 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/config" "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/spf13/cobra" "io" diff --git a/cmd/zrok/release.go b/cmd/zrok/release.go index a86ea2a9..32b5525b 100644 --- a/cmd/zrok/release.go +++ b/cmd/zrok/release.go @@ -2,10 +2,10 @@ package main import ( httptransport "github.com/go-openapi/runtime/client" - "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/zrokdir" + "github.com/openziti/zrok/rest_client_zrok/share" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/tui" + "github.com/openziti/zrok/zrokdir" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/cmd/zrok/reserve.go b/cmd/zrok/reserve.go index 22c7f5f0..077ce6b0 100644 --- a/cmd/zrok/reserve.go +++ b/cmd/zrok/reserve.go @@ -2,11 +2,11 @@ package main import ( httptransport "github.com/go-openapi/runtime/client" - "github.com/openziti-test-kitchen/zrok/model" - "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/zrokdir" + "github.com/openziti/zrok/model" + "github.com/openziti/zrok/rest_client_zrok/share" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/tui" + "github.com/openziti/zrok/zrokdir" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/zrok/sharePrivate.go b/cmd/zrok/sharePrivate.go index 2e380449..c1a2f7a4 100644 --- a/cmd/zrok/sharePrivate.go +++ b/cmd/zrok/sharePrivate.go @@ -5,15 +5,15 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" - "github.com/openziti-test-kitchen/zrok/endpoints" - "github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend" - "github.com/openziti-test-kitchen/zrok/endpoints/webBackend" - "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/zrokdir" + "github.com/openziti/zrok/endpoints" + "github.com/openziti/zrok/endpoints/proxyBackend" + "github.com/openziti/zrok/endpoints/webBackend" + "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/zrokdir" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/zrok/sharePublic.go b/cmd/zrok/sharePublic.go index 7baf2436..5330461a 100644 --- a/cmd/zrok/sharePublic.go +++ b/cmd/zrok/sharePublic.go @@ -5,15 +5,15 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" - "github.com/openziti-test-kitchen/zrok/endpoints" - "github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend" - "github.com/openziti-test-kitchen/zrok/endpoints/webBackend" - "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/zrokdir" + "github.com/openziti/zrok/endpoints" + "github.com/openziti/zrok/endpoints/proxyBackend" + "github.com/openziti/zrok/endpoints/webBackend" + "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/zrokdir" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/zrok/shareReserved.go b/cmd/zrok/shareReserved.go index de6d9107..ff2de5d5 100644 --- a/cmd/zrok/shareReserved.go +++ b/cmd/zrok/shareReserved.go @@ -4,14 +4,14 @@ import ( "fmt" tea "github.com/charmbracelet/bubbletea" httptransport "github.com/go-openapi/runtime/client" - "github.com/openziti-test-kitchen/zrok/endpoints" - "github.com/openziti-test-kitchen/zrok/endpoints/proxyBackend" - "github.com/openziti-test-kitchen/zrok/endpoints/webBackend" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/metadata" - "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/zrokdir" + "github.com/openziti/zrok/endpoints" + "github.com/openziti/zrok/endpoints/proxyBackend" + "github.com/openziti/zrok/endpoints/webBackend" + "github.com/openziti/zrok/rest_client_zrok/metadata" + "github.com/openziti/zrok/rest_client_zrok/share" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/tui" + "github.com/openziti/zrok/zrokdir" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/spf13/cobra" diff --git a/cmd/zrok/shareTui.go b/cmd/zrok/shareTui.go index 71c39174..38a43e66 100644 --- a/cmd/zrok/shareTui.go +++ b/cmd/zrok/shareTui.go @@ -5,7 +5,7 @@ import ( tea "github.com/charmbracelet/bubbletea" "github.com/charmbracelet/lipgloss" "github.com/muesli/reflow/wordwrap" - "github.com/openziti-test-kitchen/zrok/endpoints" + "github.com/openziti/zrok/endpoints" "strings" "time" ) diff --git a/cmd/zrok/status.go b/cmd/zrok/status.go index 36e071a1..76f43fb6 100644 --- a/cmd/zrok/status.go +++ b/cmd/zrok/status.go @@ -3,8 +3,8 @@ package main import ( "fmt" "github.com/jedib0t/go-pretty/v6/table" - "github.com/openziti-test-kitchen/zrok/tui" - "github.com/openziti-test-kitchen/zrok/zrokdir" + "github.com/openziti/zrok/tui" + "github.com/openziti/zrok/zrokdir" "github.com/spf13/cobra" "os" ) diff --git a/cmd/zrok/testEndpoint.go b/cmd/zrok/testEndpoint.go index 8cf61225..5eb1b9a6 100644 --- a/cmd/zrok/testEndpoint.go +++ b/cmd/zrok/testEndpoint.go @@ -3,8 +3,8 @@ package main import ( "fmt" "github.com/opentracing/opentracing-go/log" - "github.com/openziti-test-kitchen/zrok/cmd/zrok/endpointUi" - "github.com/openziti-test-kitchen/zrok/tui" + "github.com/openziti/zrok/cmd/zrok/endpointUi" + "github.com/openziti/zrok/tui" "github.com/sirupsen/logrus" "github.com/spf13/cobra" "html/template" diff --git a/cmd/zrok/version.go b/cmd/zrok/version.go index d4755253..e1173388 100644 --- a/cmd/zrok/version.go +++ b/cmd/zrok/version.go @@ -2,8 +2,8 @@ package main import ( "fmt" - "github.com/openziti-test-kitchen/zrok/build" - "github.com/openziti-test-kitchen/zrok/tui" + "github.com/openziti/zrok/build" + "github.com/openziti/zrok/tui" "github.com/spf13/cobra" ) diff --git a/controller/access.go b/controller/access.go index 921cbfb8..60bf5e08 100644 --- a/controller/access.go +++ b/controller/access.go @@ -2,10 +2,10 @@ package controller import ( "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/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/sirupsen/logrus" ) diff --git a/controller/bootstrap.go b/controller/bootstrap.go index 81fd0026..f85dd3ca 100644 --- a/controller/bootstrap.go +++ b/controller/bootstrap.go @@ -5,10 +5,6 @@ import ( "context" "encoding/json" "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/config" "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" "github.com/openziti/sdk-golang/ziti" 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/sirupsen/logrus" "time" diff --git a/controller/config.go b/controller/config.go index 3a04077d..9c3d753f 100644 --- a/controller/config.go +++ b/controller/config.go @@ -2,7 +2,7 @@ package controller import ( "github.com/michaelquigley/cf" - "github.com/openziti-test-kitchen/zrok/controller/store" + "github.com/openziti/zrok/controller/store" "github.com/pkg/errors" "time" ) diff --git a/controller/controller.go b/controller/controller.go index e593e7ec..aad3a900 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -5,11 +5,11 @@ import ( "github.com/go-openapi/loads" influxdb2 "github.com/influxdata/influxdb-client-go/v2" - "github.com/openziti-test-kitchen/zrok/controller/store" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" + "github.com/openziti/zrok/controller/store" + "github.com/openziti/zrok/rest_server_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations" + "github.com/openziti/zrok/rest_server_zrok/operations/account" + "github.com/openziti/zrok/rest_server_zrok/operations/metadata" "github.com/pkg/errors" ) diff --git a/controller/createFrontend.go b/controller/createFrontend.go index 648a8f25..a2b73a91 100644 --- a/controller/createFrontend.go +++ b/controller/createFrontend.go @@ -2,10 +2,10 @@ package controller import ( "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/admin" + "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/admin" "github.com/sirupsen/logrus" ) diff --git a/controller/createIdentity.go b/controller/createIdentity.go index f6b0f863..af2e01cf 100644 --- a/controller/createIdentity.go +++ b/controller/createIdentity.go @@ -5,11 +5,11 @@ import ( "encoding/json" "fmt" "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" 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" "time" ) diff --git a/controller/deleteFrontend.go b/controller/deleteFrontend.go index 2e2fe8fd..13b881e6 100644 --- a/controller/deleteFrontend.go +++ b/controller/deleteFrontend.go @@ -2,8 +2,8 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/admin" "github.com/sirupsen/logrus" ) diff --git a/controller/disable.go b/controller/disable.go index 53a0c05e..4e89cf1a 100644 --- a/controller/disable.go +++ b/controller/disable.go @@ -3,10 +3,10 @@ package controller import ( "github.com/go-openapi/runtime/middleware" "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/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/sirupsen/logrus" ) diff --git a/controller/enable.go b/controller/enable.go index 702e9868..01f02bb2 100644 --- a/controller/enable.go +++ b/controller/enable.go @@ -5,10 +5,10 @@ import ( "encoding/json" "github.com/go-openapi/runtime/middleware" "github.com/jmoiron/sqlx" - "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/environment" + "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/environment" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/controller/environmentDetail.go b/controller/environmentDetail.go index 81c4a359..53a9119e 100644 --- a/controller/environmentDetail.go +++ b/controller/environmentDetail.go @@ -2,8 +2,8 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/metadata" "github.com/sirupsen/logrus" ) diff --git a/controller/gc.go b/controller/gc.go index 7c6c53a4..af4168d5 100644 --- a/controller/gc.go +++ b/controller/gc.go @@ -3,13 +3,13 @@ package controller import ( "context" "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/config" "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_policy" + "github.com/openziti/zrok/controller/store" + "github.com/openziti/zrok/controller/zrokEdgeSdk" "github.com/pkg/errors" "github.com/sirupsen/logrus" "strings" diff --git a/controller/invite.go b/controller/invite.go index 0979cb2f..dd4c9fa1 100644 --- a/controller/invite.go +++ b/controller/invite.go @@ -2,9 +2,9 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/controller/store" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" - "github.com/openziti-test-kitchen/zrok/util" + "github.com/openziti/zrok/controller/store" + "github.com/openziti/zrok/rest_server_zrok/operations/account" + "github.com/openziti/zrok/util" "github.com/sirupsen/logrus" ) diff --git a/controller/inviteTokenGenerate.go b/controller/inviteTokenGenerate.go index db1ca853..7ada23f4 100644 --- a/controller/inviteTokenGenerate.go +++ b/controller/inviteTokenGenerate.go @@ -2,10 +2,10 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/controller/store" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" + "github.com/openziti/zrok/controller/store" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/account" + "github.com/openziti/zrok/rest_server_zrok/operations/admin" "github.com/sirupsen/logrus" ) diff --git a/controller/listFrontends.go b/controller/listFrontends.go index b08b3f59..640b340d 100644 --- a/controller/listFrontends.go +++ b/controller/listFrontends.go @@ -2,8 +2,8 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/admin" "github.com/sirupsen/logrus" ) diff --git a/controller/login.go b/controller/login.go index 6e1188d8..75693cd8 100644 --- a/controller/login.go +++ b/controller/login.go @@ -2,8 +2,8 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/account" "github.com/sirupsen/logrus" ) diff --git a/controller/metrics.go b/controller/metrics.go index 767c802d..d92784c6 100644 --- a/controller/metrics.go +++ b/controller/metrics.go @@ -7,12 +7,12 @@ import ( influxdb2 "github.com/influxdata/influxdb-client-go/v2" "github.com/influxdata/influxdb-client-go/v2/api" "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/config" "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/sirupsen/logrus" "gopkg.in/mgo.v2/bson" diff --git a/controller/overview.go b/controller/overview.go index 1c6d5d72..c85e2418 100644 --- a/controller/overview.go +++ b/controller/overview.go @@ -2,8 +2,8 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/metadata" "github.com/sirupsen/logrus" ) diff --git a/controller/register.go b/controller/register.go index 1f519eac..d312489d 100644 --- a/controller/register.go +++ b/controller/register.go @@ -2,9 +2,9 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/controller/store" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" + "github.com/openziti/zrok/controller/store" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/account" "github.com/sirupsen/logrus" ) diff --git a/controller/share.go b/controller/share.go index eb9756ad..5e07619b 100644 --- a/controller/share.go +++ b/controller/share.go @@ -3,9 +3,9 @@ package controller import ( "github.com/go-openapi/runtime/middleware" "github.com/jmoiron/sqlx" - "github.com/openziti-test-kitchen/zrok/controller/store" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share" + "github.com/openziti/zrok/controller/store" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/share" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/controller/shareDetail.go b/controller/shareDetail.go index d486e0c9..74b3c3d6 100644 --- a/controller/shareDetail.go +++ b/controller/shareDetail.go @@ -2,9 +2,9 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/controller/store" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" + "github.com/openziti/zrok/controller/store" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/metadata" "github.com/sirupsen/logrus" ) diff --git a/controller/sharePrivate.go b/controller/sharePrivate.go index c5116a78..62f02278 100644 --- a/controller/sharePrivate.go +++ b/controller/sharePrivate.go @@ -1,10 +1,10 @@ package controller 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/zrok/controller/zrokEdgeSdk" + "github.com/openziti/zrok/model" + "github.com/openziti/zrok/rest_server_zrok/operations/share" ) type privateResourceAllocator struct{} diff --git a/controller/sharePublic.go b/controller/sharePublic.go index 92f2257f..efdeb450 100644 --- a/controller/sharePublic.go +++ b/controller/sharePublic.go @@ -1,10 +1,10 @@ package controller 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/zrok/controller/zrokEdgeSdk" + "github.com/openziti/zrok/model" + "github.com/openziti/zrok/rest_server_zrok/operations/share" ) type publicResourceAllocator struct{} diff --git a/controller/sparkData.go b/controller/sparkData.go index 88695ace..7610aa29 100644 --- a/controller/sparkData.go +++ b/controller/sparkData.go @@ -3,7 +3,7 @@ package controller import ( "context" "fmt" - "github.com/openziti-test-kitchen/zrok/controller/store" + "github.com/openziti/zrok/controller/store" ) func sparkDataForShares(shrs []*store.Share) (map[string][]int64, error) { diff --git a/controller/startup.go b/controller/startup.go index fdeb96d9..c33b2546 100644 --- a/controller/startup.go +++ b/controller/startup.go @@ -3,9 +3,9 @@ package controller import ( "context" "fmt" - "github.com/openziti-test-kitchen/zrok/model" "github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client/config" + "github.com/openziti/zrok/model" "github.com/pkg/errors" "github.com/sirupsen/logrus" "time" diff --git a/controller/store/store.go b/controller/store/store.go index 681b622f..de58e0a3 100644 --- a/controller/store/store.go +++ b/controller/store/store.go @@ -6,8 +6,8 @@ import ( "github.com/jmoiron/sqlx" _ "github.com/lib/pq" _ "github.com/mattn/go-sqlite3" - postgresql_schema "github.com/openziti-test-kitchen/zrok/controller/store/sql/postgresql" - sqlite3_schema "github.com/openziti-test-kitchen/zrok/controller/store/sql/sqlite3" + postgresql_schema "github.com/openziti/zrok/controller/store/sql/postgresql" + sqlite3_schema "github.com/openziti/zrok/controller/store/sql/sqlite3" "github.com/pkg/errors" migrate "github.com/rubenv/sql-migrate" "github.com/sirupsen/logrus" diff --git a/controller/unaccess.go b/controller/unaccess.go index 11b41a94..4f6f1c10 100644 --- a/controller/unaccess.go +++ b/controller/unaccess.go @@ -3,10 +3,10 @@ package controller import ( "fmt" "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/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/sirupsen/logrus" ) diff --git a/controller/unshare.go b/controller/unshare.go index 8b08261b..2fe85539 100644 --- a/controller/unshare.go +++ b/controller/unshare.go @@ -4,12 +4,12 @@ import ( "context" "fmt" "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" 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/sirupsen/logrus" "time" diff --git a/controller/updateFrontend.go b/controller/updateFrontend.go index 85d91218..c112f1a8 100644 --- a/controller/updateFrontend.go +++ b/controller/updateFrontend.go @@ -2,8 +2,8 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/admin" "github.com/sirupsen/logrus" ) diff --git a/controller/updateShare.go b/controller/updateShare.go index ebb9b925..064a6f8c 100644 --- a/controller/updateShare.go +++ b/controller/updateShare.go @@ -2,8 +2,8 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/share" "github.com/sirupsen/logrus" ) diff --git a/controller/util.go b/controller/util.go index 9d41b6fa..750defed 100644 --- a/controller/util.go +++ b/controller/util.go @@ -6,9 +6,9 @@ import ( "encoding/hex" errors2 "github.com/go-openapi/errors" "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_util" + "github.com/openziti/zrok/rest_model_zrok" "net/http" "strings" ) diff --git a/controller/verify.go b/controller/verify.go index c89ea198..ae194fc5 100644 --- a/controller/verify.go +++ b/controller/verify.go @@ -2,8 +2,8 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/account" "github.com/sirupsen/logrus" ) diff --git a/controller/verifyEmail.go b/controller/verifyEmail.go index 995f5d35..ffa19c11 100644 --- a/controller/verifyEmail.go +++ b/controller/verifyEmail.go @@ -2,7 +2,7 @@ package controller import ( "bytes" - "github.com/openziti-test-kitchen/zrok/controller/emailUi" + "github.com/openziti/zrok/controller/emailUi" "github.com/pkg/errors" "github.com/sirupsen/logrus" "github.com/wneessen/go-mail" diff --git a/controller/version.go b/controller/version.go index 38bf3a39..8a139fb9 100644 --- a/controller/version.go +++ b/controller/version.go @@ -2,9 +2,9 @@ package controller import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/build" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" + "github.com/openziti/zrok/build" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/metadata" ) func versionHandler(_ metadata.VersionParams) middleware.Responder { diff --git a/controller/zrokEdgeSdk/config.go b/controller/zrokEdgeSdk/config.go index 848139a8..a2cf88be 100644 --- a/controller/zrokEdgeSdk/config.go +++ b/controller/zrokEdgeSdk/config.go @@ -3,10 +3,10 @@ package zrokEdgeSdk import ( "context" "fmt" - "github.com/openziti-test-kitchen/zrok/model" "github.com/openziti/edge/rest_management_api_client" "github.com/openziti/edge/rest_management_api_client/config" "github.com/openziti/edge/rest_model" + "github.com/openziti/zrok/model" "github.com/sirupsen/logrus" "time" ) diff --git a/controller/zrokEdgeSdk/tags.go b/controller/zrokEdgeSdk/tags.go index fbe00e39..eb30927d 100644 --- a/controller/zrokEdgeSdk/tags.go +++ b/controller/zrokEdgeSdk/tags.go @@ -1,8 +1,8 @@ package zrokEdgeSdk import ( - "github.com/openziti-test-kitchen/zrok/build" "github.com/openziti/edge/rest_model" + "github.com/openziti/zrok/build" ) func ZrokTags() *rest_model.Tags { diff --git a/endpoints/privateFrontend/config.go b/endpoints/privateFrontend/config.go index 49c4e1d2..76a65017 100644 --- a/endpoints/privateFrontend/config.go +++ b/endpoints/privateFrontend/config.go @@ -1,6 +1,6 @@ package privateFrontend -import "github.com/openziti-test-kitchen/zrok/endpoints" +import "github.com/openziti/zrok/endpoints" type Config struct { IdentityName string diff --git a/endpoints/privateFrontend/http.go b/endpoints/privateFrontend/http.go index c80c76c2..72277127 100644 --- a/endpoints/privateFrontend/http.go +++ b/endpoints/privateFrontend/http.go @@ -3,13 +3,13 @@ package privateFrontend import ( "context" "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/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/sirupsen/logrus" "net" diff --git a/endpoints/proxyBackend/http.go b/endpoints/proxyBackend/http.go index 963e05b2..3188bcc2 100644 --- a/endpoints/proxyBackend/http.go +++ b/endpoints/proxyBackend/http.go @@ -3,11 +3,11 @@ package proxyBackend import ( "context" "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/config" "github.com/openziti/sdk-golang/ziti/edge" + "github.com/openziti/zrok/endpoints" + "github.com/openziti/zrok/util" "github.com/pkg/errors" "github.com/sirupsen/logrus" "net" diff --git a/endpoints/publicFrontend/http.go b/endpoints/publicFrontend/http.go index 44a3390e..884a734b 100644 --- a/endpoints/publicFrontend/http.go +++ b/endpoints/publicFrontend/http.go @@ -3,14 +3,14 @@ package publicFrontend import ( "context" "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/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/sirupsen/logrus" "net" diff --git a/endpoints/publicFrontend/metrics.go b/endpoints/publicFrontend/metrics.go index 53d0809c..4c6a512f 100644 --- a/endpoints/publicFrontend/metrics.go +++ b/endpoints/publicFrontend/metrics.go @@ -1,10 +1,10 @@ package publicFrontend 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/config" + "github.com/openziti/zrok/model" + "github.com/openziti/zrok/zrokdir" "github.com/pkg/errors" "github.com/sirupsen/logrus" "gopkg.in/mgo.v2/bson" diff --git a/endpoints/webBackend/web.go b/endpoints/webBackend/web.go index 06f2eff4..199af144 100644 --- a/endpoints/webBackend/web.go +++ b/endpoints/webBackend/web.go @@ -2,10 +2,10 @@ package webBackend import ( "fmt" - "github.com/openziti-test-kitchen/zrok/endpoints" "github.com/openziti/sdk-golang/ziti" "github.com/openziti/sdk-golang/ziti/config" "github.com/openziti/sdk-golang/ziti/edge" + "github.com/openziti/zrok/endpoints" "github.com/pkg/errors" "net/http" "time" diff --git a/go.mod b/go.mod index c98cb934..c964f2ae 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,9 @@ -module github.com/openziti-test-kitchen/zrok +module github.com/openziti/zrok -go 1.18 +go 1.19 require ( + github.com/charmbracelet/bubbles v0.14.0 github.com/charmbracelet/bubbletea v0.23.1 github.com/charmbracelet/lipgloss v0.6.0 github.com/go-openapi/errors v0.20.2 @@ -22,9 +23,9 @@ require ( github.com/mattn/go-sqlite3 v1.14.14 github.com/michaelquigley/cf v0.0.13 github.com/michaelquigley/pfxlog v0.6.9 + github.com/muesli/reflow v0.3.0 github.com/opentracing/opentracing-go v1.2.0 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/pkg/errors v0.9.1 github.com/rubenv/sql-migrate v1.1.2 @@ -43,7 +44,6 @@ require ( github.com/atotto/clipboard v0.1.4 // indirect github.com/aymanbagabas/go-osc52 v1.0.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/davecgh/go-spew v1.1.1 // 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/muesli/ansi v0.0.0-20211018074035-2e021307bc4b // 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/netfoundry/secretstream v0.1.2 // indirect github.com/oklog/ulid v1.3.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/metrics v1.1.0 // indirect github.com/openziti/transport/v2 v2.0.30 // indirect diff --git a/rest_client_zrok/account/invite_parameters.go b/rest_client_zrok/account/invite_parameters.go index c19a695f..5b7baaa1 100644 --- a/rest_client_zrok/account/invite_parameters.go +++ b/rest_client_zrok/account/invite_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/account/login_parameters.go b/rest_client_zrok/account/login_parameters.go index 27bf23e8..1b25e6e5 100644 --- a/rest_client_zrok/account/login_parameters.go +++ b/rest_client_zrok/account/login_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/account/login_responses.go b/rest_client_zrok/account/login_responses.go index 63145a6a..08ef25b8 100644 --- a/rest_client_zrok/account/login_responses.go +++ b/rest_client_zrok/account/login_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/account/register_parameters.go b/rest_client_zrok/account/register_parameters.go index 63615655..ac50479a 100644 --- a/rest_client_zrok/account/register_parameters.go +++ b/rest_client_zrok/account/register_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/account/register_responses.go b/rest_client_zrok/account/register_responses.go index 603e42e9..9a5d2488 100644 --- a/rest_client_zrok/account/register_responses.go +++ b/rest_client_zrok/account/register_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/account/verify_parameters.go b/rest_client_zrok/account/verify_parameters.go index e11dc8ec..ffe041b2 100644 --- a/rest_client_zrok/account/verify_parameters.go +++ b/rest_client_zrok/account/verify_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/account/verify_responses.go b/rest_client_zrok/account/verify_responses.go index c1c6f8f9..f333aeaa 100644 --- a/rest_client_zrok/account/verify_responses.go +++ b/rest_client_zrok/account/verify_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/admin/create_frontend_parameters.go b/rest_client_zrok/admin/create_frontend_parameters.go index c021aba1..d533642a 100644 --- a/rest_client_zrok/admin/create_frontend_parameters.go +++ b/rest_client_zrok/admin/create_frontend_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/admin/create_frontend_responses.go b/rest_client_zrok/admin/create_frontend_responses.go index b56ab6ac..6ef6399b 100644 --- a/rest_client_zrok/admin/create_frontend_responses.go +++ b/rest_client_zrok/admin/create_frontend_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/admin/delete_frontend_parameters.go b/rest_client_zrok/admin/delete_frontend_parameters.go index 4635e6bb..0f078161 100644 --- a/rest_client_zrok/admin/delete_frontend_parameters.go +++ b/rest_client_zrok/admin/delete_frontend_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/admin/invite_token_generate_parameters.go b/rest_client_zrok/admin/invite_token_generate_parameters.go index ae9fdef6..cd4fa56c 100644 --- a/rest_client_zrok/admin/invite_token_generate_parameters.go +++ b/rest_client_zrok/admin/invite_token_generate_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/admin/list_frontends_responses.go b/rest_client_zrok/admin/list_frontends_responses.go index 17ed177c..fe9d15fb 100644 --- a/rest_client_zrok/admin/list_frontends_responses.go +++ b/rest_client_zrok/admin/list_frontends_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/admin/update_frontend_parameters.go b/rest_client_zrok/admin/update_frontend_parameters.go index 2025c618..0cfc5ba9 100644 --- a/rest_client_zrok/admin/update_frontend_parameters.go +++ b/rest_client_zrok/admin/update_frontend_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/environment/disable_parameters.go b/rest_client_zrok/environment/disable_parameters.go index 6dbc750d..31818ef9 100644 --- a/rest_client_zrok/environment/disable_parameters.go +++ b/rest_client_zrok/environment/disable_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/environment/enable_parameters.go b/rest_client_zrok/environment/enable_parameters.go index deeb808c..26f8622f 100644 --- a/rest_client_zrok/environment/enable_parameters.go +++ b/rest_client_zrok/environment/enable_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/environment/enable_responses.go b/rest_client_zrok/environment/enable_responses.go index 60839d27..7a3c461a 100644 --- a/rest_client_zrok/environment/enable_responses.go +++ b/rest_client_zrok/environment/enable_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/metadata/get_environment_detail_responses.go b/rest_client_zrok/metadata/get_environment_detail_responses.go index b6a4b770..df5b305d 100644 --- a/rest_client_zrok/metadata/get_environment_detail_responses.go +++ b/rest_client_zrok/metadata/get_environment_detail_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/metadata/get_share_detail_responses.go b/rest_client_zrok/metadata/get_share_detail_responses.go index 4a3a6fb8..bc4407b0 100644 --- a/rest_client_zrok/metadata/get_share_detail_responses.go +++ b/rest_client_zrok/metadata/get_share_detail_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/metadata/overview_responses.go b/rest_client_zrok/metadata/overview_responses.go index d5ecaaf5..af006875 100644 --- a/rest_client_zrok/metadata/overview_responses.go +++ b/rest_client_zrok/metadata/overview_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/metadata/version_responses.go b/rest_client_zrok/metadata/version_responses.go index 2f9adbe6..b1388fed 100644 --- a/rest_client_zrok/metadata/version_responses.go +++ b/rest_client_zrok/metadata/version_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/share/access_parameters.go b/rest_client_zrok/share/access_parameters.go index dad09324..44c1591d 100644 --- a/rest_client_zrok/share/access_parameters.go +++ b/rest_client_zrok/share/access_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/share/access_responses.go b/rest_client_zrok/share/access_responses.go index e916b78e..8d1e8e18 100644 --- a/rest_client_zrok/share/access_responses.go +++ b/rest_client_zrok/share/access_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/share/share_parameters.go b/rest_client_zrok/share/share_parameters.go index 1f99dcc9..174cc5e5 100644 --- a/rest_client_zrok/share/share_parameters.go +++ b/rest_client_zrok/share/share_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/share/share_responses.go b/rest_client_zrok/share/share_responses.go index b6bbcce2..23b4b180 100644 --- a/rest_client_zrok/share/share_responses.go +++ b/rest_client_zrok/share/share_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/share/unaccess_parameters.go b/rest_client_zrok/share/unaccess_parameters.go index 4070364b..b2c0bc2a 100644 --- a/rest_client_zrok/share/unaccess_parameters.go +++ b/rest_client_zrok/share/unaccess_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/share/unshare_parameters.go b/rest_client_zrok/share/unshare_parameters.go index 4d59db36..457173a5 100644 --- a/rest_client_zrok/share/unshare_parameters.go +++ b/rest_client_zrok/share/unshare_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "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, diff --git a/rest_client_zrok/share/unshare_responses.go b/rest_client_zrok/share/unshare_responses.go index 9d4aa5e1..e30e2e50 100644 --- a/rest_client_zrok/share/unshare_responses.go +++ b/rest_client_zrok/share/unshare_responses.go @@ -12,7 +12,7 @@ import ( "github.com/go-openapi/runtime" "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. diff --git a/rest_client_zrok/share/update_share_parameters.go b/rest_client_zrok/share/update_share_parameters.go index 88dd4457..a39f6922 100644 --- a/rest_client_zrok/share/update_share_parameters.go +++ b/rest_client_zrok/share/update_share_parameters.go @@ -15,7 +15,7 @@ import ( cr "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewUpdateShareParams creates a new UpdateShareParams object, diff --git a/rest_client_zrok/zrok_client.go b/rest_client_zrok/zrok_client.go index 2aaac3fd..a4200e67 100644 --- a/rest_client_zrok/zrok_client.go +++ b/rest_client_zrok/zrok_client.go @@ -10,11 +10,11 @@ import ( httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/account" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/admin" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/environment" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/metadata" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok/share" + "github.com/openziti/zrok/rest_client_zrok/account" + "github.com/openziti/zrok/rest_client_zrok/admin" + "github.com/openziti/zrok/rest_client_zrok/environment" + "github.com/openziti/zrok/rest_client_zrok/metadata" + "github.com/openziti/zrok/rest_client_zrok/share" ) // Default zrok HTTP client. diff --git a/rest_server_zrok/configure_zrok.go b/rest_server_zrok/configure_zrok.go index 23b1824e..e8a52b84 100644 --- a/rest_server_zrok/configure_zrok.go +++ b/rest_server_zrok/configure_zrok.go @@ -4,13 +4,13 @@ package rest_server_zrok import ( "crypto/tls" - "github.com/openziti-test-kitchen/zrok/ui" + "github.com/openziti/zrok/ui" "github.com/sirupsen/logrus" "net/http" "github.com/go-openapi/errors" "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations" + "github.com/openziti/zrok/rest_server_zrok/operations" ) //go:generate swagger generate server --target ../../zrok --name Zrok --spec ../specs/zrok.yml --model-package rest_model_zrok --server-package rest_server_zrok --principal interface{} --exclude-main diff --git a/rest_server_zrok/operations/account/invite_parameters.go b/rest_server_zrok/operations/account/invite_parameters.go index 24d397d2..5f50d4cd 100644 --- a/rest_server_zrok/operations/account/invite_parameters.go +++ b/rest_server_zrok/operations/account/invite_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewInviteParams creates a new InviteParams object diff --git a/rest_server_zrok/operations/account/login_parameters.go b/rest_server_zrok/operations/account/login_parameters.go index 4613d6b3..df20c9c3 100644 --- a/rest_server_zrok/operations/account/login_parameters.go +++ b/rest_server_zrok/operations/account/login_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewLoginParams creates a new LoginParams object diff --git a/rest_server_zrok/operations/account/login_responses.go b/rest_server_zrok/operations/account/login_responses.go index df624a34..8ac3887c 100644 --- a/rest_server_zrok/operations/account/login_responses.go +++ b/rest_server_zrok/operations/account/login_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // LoginOKCode is the HTTP code returned for type LoginOK diff --git a/rest_server_zrok/operations/account/register_parameters.go b/rest_server_zrok/operations/account/register_parameters.go index fa0a82e5..a37ee656 100644 --- a/rest_server_zrok/operations/account/register_parameters.go +++ b/rest_server_zrok/operations/account/register_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewRegisterParams creates a new RegisterParams object diff --git a/rest_server_zrok/operations/account/register_responses.go b/rest_server_zrok/operations/account/register_responses.go index 89802333..48c8af53 100644 --- a/rest_server_zrok/operations/account/register_responses.go +++ b/rest_server_zrok/operations/account/register_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // RegisterOKCode is the HTTP code returned for type RegisterOK diff --git a/rest_server_zrok/operations/account/verify_parameters.go b/rest_server_zrok/operations/account/verify_parameters.go index 0b7d888c..94298eb6 100644 --- a/rest_server_zrok/operations/account/verify_parameters.go +++ b/rest_server_zrok/operations/account/verify_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewVerifyParams creates a new VerifyParams object diff --git a/rest_server_zrok/operations/account/verify_responses.go b/rest_server_zrok/operations/account/verify_responses.go index 64ae367f..d0d14954 100644 --- a/rest_server_zrok/operations/account/verify_responses.go +++ b/rest_server_zrok/operations/account/verify_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // VerifyOKCode is the HTTP code returned for type VerifyOK diff --git a/rest_server_zrok/operations/admin/create_frontend.go b/rest_server_zrok/operations/admin/create_frontend.go index b095fe15..2509c9a0 100644 --- a/rest_server_zrok/operations/admin/create_frontend.go +++ b/rest_server_zrok/operations/admin/create_frontend.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // CreateFrontendHandlerFunc turns a function with the right signature into a create frontend handler diff --git a/rest_server_zrok/operations/admin/create_frontend_parameters.go b/rest_server_zrok/operations/admin/create_frontend_parameters.go index 32668f6e..2c3fdd71 100644 --- a/rest_server_zrok/operations/admin/create_frontend_parameters.go +++ b/rest_server_zrok/operations/admin/create_frontend_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewCreateFrontendParams creates a new CreateFrontendParams object diff --git a/rest_server_zrok/operations/admin/create_frontend_responses.go b/rest_server_zrok/operations/admin/create_frontend_responses.go index 2a9ed8da..3b3f4865 100644 --- a/rest_server_zrok/operations/admin/create_frontend_responses.go +++ b/rest_server_zrok/operations/admin/create_frontend_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // CreateFrontendCreatedCode is the HTTP code returned for type CreateFrontendCreated diff --git a/rest_server_zrok/operations/admin/create_identity.go b/rest_server_zrok/operations/admin/create_identity.go index 6e4b00fe..7ed5880f 100644 --- a/rest_server_zrok/operations/admin/create_identity.go +++ b/rest_server_zrok/operations/admin/create_identity.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // CreateIdentityHandlerFunc turns a function with the right signature into a create identity handler diff --git a/rest_server_zrok/operations/admin/delete_frontend.go b/rest_server_zrok/operations/admin/delete_frontend.go index fb1da35b..6e77d969 100644 --- a/rest_server_zrok/operations/admin/delete_frontend.go +++ b/rest_server_zrok/operations/admin/delete_frontend.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // DeleteFrontendHandlerFunc turns a function with the right signature into a delete frontend handler diff --git a/rest_server_zrok/operations/admin/delete_frontend_parameters.go b/rest_server_zrok/operations/admin/delete_frontend_parameters.go index 5ce3e437..0ab08625 100644 --- a/rest_server_zrok/operations/admin/delete_frontend_parameters.go +++ b/rest_server_zrok/operations/admin/delete_frontend_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewDeleteFrontendParams creates a new DeleteFrontendParams object diff --git a/rest_server_zrok/operations/admin/invite_token_generate.go b/rest_server_zrok/operations/admin/invite_token_generate.go index ade6d94c..71b44387 100644 --- a/rest_server_zrok/operations/admin/invite_token_generate.go +++ b/rest_server_zrok/operations/admin/invite_token_generate.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // InviteTokenGenerateHandlerFunc turns a function with the right signature into a invite token generate handler diff --git a/rest_server_zrok/operations/admin/invite_token_generate_parameters.go b/rest_server_zrok/operations/admin/invite_token_generate_parameters.go index bbab6f6e..21e606ea 100644 --- a/rest_server_zrok/operations/admin/invite_token_generate_parameters.go +++ b/rest_server_zrok/operations/admin/invite_token_generate_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewInviteTokenGenerateParams creates a new InviteTokenGenerateParams object diff --git a/rest_server_zrok/operations/admin/list_frontends.go b/rest_server_zrok/operations/admin/list_frontends.go index ea52f33b..423724fe 100644 --- a/rest_server_zrok/operations/admin/list_frontends.go +++ b/rest_server_zrok/operations/admin/list_frontends.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // ListFrontendsHandlerFunc turns a function with the right signature into a list frontends handler diff --git a/rest_server_zrok/operations/admin/list_frontends_responses.go b/rest_server_zrok/operations/admin/list_frontends_responses.go index c707742d..5359d5c7 100644 --- a/rest_server_zrok/operations/admin/list_frontends_responses.go +++ b/rest_server_zrok/operations/admin/list_frontends_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // ListFrontendsOKCode is the HTTP code returned for type ListFrontendsOK diff --git a/rest_server_zrok/operations/admin/update_frontend.go b/rest_server_zrok/operations/admin/update_frontend.go index 4f0d13ba..22bb7897 100644 --- a/rest_server_zrok/operations/admin/update_frontend.go +++ b/rest_server_zrok/operations/admin/update_frontend.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // UpdateFrontendHandlerFunc turns a function with the right signature into a update frontend handler diff --git a/rest_server_zrok/operations/admin/update_frontend_parameters.go b/rest_server_zrok/operations/admin/update_frontend_parameters.go index c2441180..b6d03c73 100644 --- a/rest_server_zrok/operations/admin/update_frontend_parameters.go +++ b/rest_server_zrok/operations/admin/update_frontend_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewUpdateFrontendParams creates a new UpdateFrontendParams object diff --git a/rest_server_zrok/operations/environment/disable.go b/rest_server_zrok/operations/environment/disable.go index eadcb51c..d7a2d65b 100644 --- a/rest_server_zrok/operations/environment/disable.go +++ b/rest_server_zrok/operations/environment/disable.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // DisableHandlerFunc turns a function with the right signature into a disable handler diff --git a/rest_server_zrok/operations/environment/disable_parameters.go b/rest_server_zrok/operations/environment/disable_parameters.go index 608d3148..f524a834 100644 --- a/rest_server_zrok/operations/environment/disable_parameters.go +++ b/rest_server_zrok/operations/environment/disable_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewDisableParams creates a new DisableParams object diff --git a/rest_server_zrok/operations/environment/enable.go b/rest_server_zrok/operations/environment/enable.go index 83d716b4..a7a6636c 100644 --- a/rest_server_zrok/operations/environment/enable.go +++ b/rest_server_zrok/operations/environment/enable.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // EnableHandlerFunc turns a function with the right signature into a enable handler diff --git a/rest_server_zrok/operations/environment/enable_parameters.go b/rest_server_zrok/operations/environment/enable_parameters.go index 9a98d44e..974b9ee9 100644 --- a/rest_server_zrok/operations/environment/enable_parameters.go +++ b/rest_server_zrok/operations/environment/enable_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewEnableParams creates a new EnableParams object diff --git a/rest_server_zrok/operations/environment/enable_responses.go b/rest_server_zrok/operations/environment/enable_responses.go index 2841f809..c19a650d 100644 --- a/rest_server_zrok/operations/environment/enable_responses.go +++ b/rest_server_zrok/operations/environment/enable_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // EnableCreatedCode is the HTTP code returned for type EnableCreated diff --git a/rest_server_zrok/operations/metadata/get_environment_detail.go b/rest_server_zrok/operations/metadata/get_environment_detail.go index 9ea1bc6a..32deae55 100644 --- a/rest_server_zrok/operations/metadata/get_environment_detail.go +++ b/rest_server_zrok/operations/metadata/get_environment_detail.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // GetEnvironmentDetailHandlerFunc turns a function with the right signature into a get environment detail handler diff --git a/rest_server_zrok/operations/metadata/get_environment_detail_responses.go b/rest_server_zrok/operations/metadata/get_environment_detail_responses.go index 985388a3..18ad7c1e 100644 --- a/rest_server_zrok/operations/metadata/get_environment_detail_responses.go +++ b/rest_server_zrok/operations/metadata/get_environment_detail_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // GetEnvironmentDetailOKCode is the HTTP code returned for type GetEnvironmentDetailOK diff --git a/rest_server_zrok/operations/metadata/get_share_detail.go b/rest_server_zrok/operations/metadata/get_share_detail.go index d3447d18..f47d1979 100644 --- a/rest_server_zrok/operations/metadata/get_share_detail.go +++ b/rest_server_zrok/operations/metadata/get_share_detail.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // GetShareDetailHandlerFunc turns a function with the right signature into a get share detail handler diff --git a/rest_server_zrok/operations/metadata/get_share_detail_responses.go b/rest_server_zrok/operations/metadata/get_share_detail_responses.go index 2c8b06c0..0f4bdbfc 100644 --- a/rest_server_zrok/operations/metadata/get_share_detail_responses.go +++ b/rest_server_zrok/operations/metadata/get_share_detail_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // GetShareDetailOKCode is the HTTP code returned for type GetShareDetailOK diff --git a/rest_server_zrok/operations/metadata/overview.go b/rest_server_zrok/operations/metadata/overview.go index b478c0ef..60012fec 100644 --- a/rest_server_zrok/operations/metadata/overview.go +++ b/rest_server_zrok/operations/metadata/overview.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // OverviewHandlerFunc turns a function with the right signature into a overview handler diff --git a/rest_server_zrok/operations/metadata/overview_responses.go b/rest_server_zrok/operations/metadata/overview_responses.go index ce13021b..f64c45d9 100644 --- a/rest_server_zrok/operations/metadata/overview_responses.go +++ b/rest_server_zrok/operations/metadata/overview_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // OverviewOKCode is the HTTP code returned for type OverviewOK diff --git a/rest_server_zrok/operations/metadata/version_responses.go b/rest_server_zrok/operations/metadata/version_responses.go index b03ee2e7..a48a43e0 100644 --- a/rest_server_zrok/operations/metadata/version_responses.go +++ b/rest_server_zrok/operations/metadata/version_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // VersionOKCode is the HTTP code returned for type VersionOK diff --git a/rest_server_zrok/operations/share/access.go b/rest_server_zrok/operations/share/access.go index 4ae1d036..b25daf61 100644 --- a/rest_server_zrok/operations/share/access.go +++ b/rest_server_zrok/operations/share/access.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // AccessHandlerFunc turns a function with the right signature into a access handler diff --git a/rest_server_zrok/operations/share/access_parameters.go b/rest_server_zrok/operations/share/access_parameters.go index 9b4b1e7b..7e212a6d 100644 --- a/rest_server_zrok/operations/share/access_parameters.go +++ b/rest_server_zrok/operations/share/access_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewAccessParams creates a new AccessParams object diff --git a/rest_server_zrok/operations/share/access_responses.go b/rest_server_zrok/operations/share/access_responses.go index d1656dc3..d6b663d5 100644 --- a/rest_server_zrok/operations/share/access_responses.go +++ b/rest_server_zrok/operations/share/access_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // AccessCreatedCode is the HTTP code returned for type AccessCreated diff --git a/rest_server_zrok/operations/share/share.go b/rest_server_zrok/operations/share/share.go index 3d9ea54a..7e7aa9b5 100644 --- a/rest_server_zrok/operations/share/share.go +++ b/rest_server_zrok/operations/share/share.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // ShareHandlerFunc turns a function with the right signature into a share handler diff --git a/rest_server_zrok/operations/share/share_parameters.go b/rest_server_zrok/operations/share/share_parameters.go index ffb1f204..b4f22d48 100644 --- a/rest_server_zrok/operations/share/share_parameters.go +++ b/rest_server_zrok/operations/share/share_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewShareParams creates a new ShareParams object diff --git a/rest_server_zrok/operations/share/share_responses.go b/rest_server_zrok/operations/share/share_responses.go index 244ad545..556210b6 100644 --- a/rest_server_zrok/operations/share/share_responses.go +++ b/rest_server_zrok/operations/share/share_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // ShareCreatedCode is the HTTP code returned for type ShareCreated diff --git a/rest_server_zrok/operations/share/unaccess.go b/rest_server_zrok/operations/share/unaccess.go index 396effb0..7003a681 100644 --- a/rest_server_zrok/operations/share/unaccess.go +++ b/rest_server_zrok/operations/share/unaccess.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // UnaccessHandlerFunc turns a function with the right signature into a unaccess handler diff --git a/rest_server_zrok/operations/share/unaccess_parameters.go b/rest_server_zrok/operations/share/unaccess_parameters.go index 4eec8f78..5685787a 100644 --- a/rest_server_zrok/operations/share/unaccess_parameters.go +++ b/rest_server_zrok/operations/share/unaccess_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewUnaccessParams creates a new UnaccessParams object diff --git a/rest_server_zrok/operations/share/unshare.go b/rest_server_zrok/operations/share/unshare.go index f03c4a95..2d2907aa 100644 --- a/rest_server_zrok/operations/share/unshare.go +++ b/rest_server_zrok/operations/share/unshare.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // UnshareHandlerFunc turns a function with the right signature into a unshare handler diff --git a/rest_server_zrok/operations/share/unshare_parameters.go b/rest_server_zrok/operations/share/unshare_parameters.go index 679b82f1..16182936 100644 --- a/rest_server_zrok/operations/share/unshare_parameters.go +++ b/rest_server_zrok/operations/share/unshare_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewUnshareParams creates a new UnshareParams object diff --git a/rest_server_zrok/operations/share/unshare_responses.go b/rest_server_zrok/operations/share/unshare_responses.go index 73491276..0a06f3ea 100644 --- a/rest_server_zrok/operations/share/unshare_responses.go +++ b/rest_server_zrok/operations/share/unshare_responses.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // UnshareOKCode is the HTTP code returned for type UnshareOK diff --git a/rest_server_zrok/operations/share/update_share.go b/rest_server_zrok/operations/share/update_share.go index 9b3757b8..dc702392 100644 --- a/rest_server_zrok/operations/share/update_share.go +++ b/rest_server_zrok/operations/share/update_share.go @@ -10,7 +10,7 @@ import ( "github.com/go-openapi/runtime/middleware" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // UpdateShareHandlerFunc turns a function with the right signature into a update share handler diff --git a/rest_server_zrok/operations/share/update_share_parameters.go b/rest_server_zrok/operations/share/update_share_parameters.go index a8f8f7d5..37538e36 100644 --- a/rest_server_zrok/operations/share/update_share_parameters.go +++ b/rest_server_zrok/operations/share/update_share_parameters.go @@ -13,7 +13,7 @@ import ( "github.com/go-openapi/runtime/middleware" "github.com/go-openapi/validate" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_model_zrok" ) // NewUpdateShareParams creates a new UpdateShareParams object diff --git a/rest_server_zrok/operations/zrok_api.go b/rest_server_zrok/operations/zrok_api.go index d13c7cfa..92ecc1cf 100644 --- a/rest_server_zrok/operations/zrok_api.go +++ b/rest_server_zrok/operations/zrok_api.go @@ -19,12 +19,12 @@ import ( "github.com/go-openapi/strfmt" "github.com/go-openapi/swag" - "github.com/openziti-test-kitchen/zrok/rest_model_zrok" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/account" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/admin" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/environment" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/metadata" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations/share" + "github.com/openziti/zrok/rest_model_zrok" + "github.com/openziti/zrok/rest_server_zrok/operations/account" + "github.com/openziti/zrok/rest_server_zrok/operations/admin" + "github.com/openziti/zrok/rest_server_zrok/operations/environment" + "github.com/openziti/zrok/rest_server_zrok/operations/metadata" + "github.com/openziti/zrok/rest_server_zrok/operations/share" ) // NewZrokAPI creates a new Zrok instance diff --git a/rest_server_zrok/server.go b/rest_server_zrok/server.go index 2bc7f9c6..d07438f0 100644 --- a/rest_server_zrok/server.go +++ b/rest_server_zrok/server.go @@ -24,7 +24,7 @@ import ( flags "github.com/jessevdk/go-flags" "golang.org/x/net/netutil" - "github.com/openziti-test-kitchen/zrok/rest_server_zrok/operations" + "github.com/openziti/zrok/rest_server_zrok/operations" ) const ( diff --git a/zrokdir/client.go b/zrokdir/client.go index ede9e5e3..5676a0ea 100644 --- a/zrokdir/client.go +++ b/zrokdir/client.go @@ -4,8 +4,8 @@ import ( "github.com/go-openapi/runtime" httptransport "github.com/go-openapi/runtime/client" "github.com/go-openapi/strfmt" - "github.com/openziti-test-kitchen/zrok/build" - "github.com/openziti-test-kitchen/zrok/rest_client_zrok" + "github.com/openziti/zrok/build" + "github.com/openziti/zrok/rest_client_zrok" "github.com/pkg/errors" "net/url" "os" diff --git a/zrokdir/version.go b/zrokdir/version.go index 177f186d..e073aa99 100644 --- a/zrokdir/version.go +++ b/zrokdir/version.go @@ -2,7 +2,7 @@ package zrokdir import ( "encoding/json" - "github.com/openziti-test-kitchen/zrok/tui" + "github.com/openziti/zrok/tui" "github.com/pkg/errors" "os" "path/filepath"