diff --git a/Dockerfile b/Dockerfile index ab36e50b..66674c2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,12 +6,12 @@ ENV GO111MODULE=on \ CGO_ENABLED=0 \ TARGET_GOOS=${TARGET_GOOS} \ TARGET_GOARCH=${TARGET_GOARCH} \ - # the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual + # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual # which changes how cloudflared binds the metrics server CONTAINER_BUILD=1 -WORKDIR /go/src/github.com/kjake/cloudflared/ +WORKDIR /go/src/github.com/cloudflare/cloudflared/ # copy our sources into the builder image COPY . . @@ -24,10 +24,10 @@ RUN PATH="/tmp/go/bin:$PATH" make cloudflared # use a distroless base image with glibc FROM gcr.io/distroless/base-debian11:nonroot -LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" +LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared" # copy our compiled binary -COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ +COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ # run as non-privileged user USER nonroot diff --git a/Dockerfile.amd64 b/Dockerfile.amd64 index 13e67b7b..c375d801 100644 --- a/Dockerfile.amd64 +++ b/Dockerfile.amd64 @@ -2,11 +2,11 @@ FROM golang:1.22.5 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ - # the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual + # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual # which changes how cloudflared binds the metrics server CONTAINER_BUILD=1 -WORKDIR /go/src/github.com/kjake/cloudflared/ +WORKDIR /go/src/github.com/cloudflare/cloudflared/ # copy our sources into the builder image COPY . . @@ -19,10 +19,10 @@ RUN GOOS=linux GOARCH=amd64 PATH="/tmp/go/bin:$PATH" make cloudflared # use a distroless base image with glibc FROM gcr.io/distroless/base-debian11:nonroot -LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" +LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared" # copy our compiled binary -COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ +COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ # run as non-privileged user USER nonroot diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 9470b792..b617d7ae 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -2,11 +2,11 @@ FROM golang:1.22.5 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 \ - # the CONTAINER_BUILD envvar is used set github.com/kjake/cloudflared/metrics.Runtime=virtual + # the CONTAINER_BUILD envvar is used set github.com/cloudflare/cloudflared/metrics.Runtime=virtual # which changes how cloudflared binds the metrics server CONTAINER_BUILD=1 -WORKDIR /go/src/github.com/kjake/cloudflared/ +WORKDIR /go/src/github.com/cloudflare/cloudflared/ # copy our sources into the builder image COPY . . @@ -19,10 +19,10 @@ RUN GOOS=linux GOARCH=arm64 PATH="/tmp/go/bin:$PATH" make cloudflared # use a distroless base image with glibc FROM gcr.io/distroless/base-debian11:nonroot-arm64 -LABEL org.opencontainers.image.source="https://github.com/kjake/cloudflared" +LABEL org.opencontainers.image.source="https://github.com/cloudflare/cloudflared" # copy our compiled binary -COPY --from=builder --chown=nonroot /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ +COPY --from=builder --chown=nonroot /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ # run as non-privileged user USER nonroot diff --git a/Makefile b/Makefile index 2a488145..2e0e82e8 100644 --- a/Makefile +++ b/Makefile @@ -27,11 +27,11 @@ endif DATE := $(shell date -u '+%Y-%m-%d-%H%M UTC') VERSION_FLAGS := -X "main.Version=$(VERSION)" -X "main.BuildTime=$(DATE)" ifdef PACKAGE_MANAGER - VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/kjake/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=$(PACKAGE_MANAGER)" + VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/cloudflare/cloudflared/cmd/cloudflared/updater.BuiltForPackageManager=$(PACKAGE_MANAGER)" endif ifdef CONTAINER_BUILD - VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/kjake/cloudflared/metrics.Runtime=virtual" + VERSION_FLAGS := $(VERSION_FLAGS) -X "github.com/cloudflare/cloudflared/metrics.Runtime=virtual" endif LINK_FLAGS := @@ -51,7 +51,7 @@ ifeq ($(debug), 1) GO_BUILD_TAGS += -gcflags="all=-N -l" endif -IMPORT_PATH := github.com/kjake/cloudflared +IMPORT_PATH := github.com/cloudflare/cloudflared PACKAGE_DIR := $(CURDIR)/packaging PREFIX := /usr INSTALL_BINDIR := $(PREFIX)/bin/ @@ -208,7 +208,7 @@ define build_package --description 'Cloudflare Tunnel daemon' \ --vendor 'Cloudflare' \ --license 'Apache License Version 2.0' \ - --url 'https://github.com/kjake/cloudflared' \ + --url 'https://github.com/cloudflare/cloudflared' \ -m 'Cloudflare ' \ -a $(PACKAGE_ARCH) -v $(VERSION) -n $(DEB_PACKAGE_NAME) $(RPM_DIGEST) $(NIGHTLY_FLAGS) --after-install postinst.sh --after-remove postrm.sh \ cloudflared=$(INSTALL_BINDIR) cloudflared.1=$(INSTALL_MANDIR) @@ -251,11 +251,11 @@ capnp: .PHONY: vet vet: - go vet -mod=vendor github.com/kjake/cloudflared/... + go vet -mod=vendor github.com/cloudflare/cloudflared/... .PHONY: fmt fmt: - @goimports -l -w -local github.com/kjake/cloudflared $$(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc/proto) + @goimports -l -w -local github.com/cloudflare/cloudflared $$(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc/proto) @go fmt $$(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc/proto) .PHONY: fmt-check diff --git a/carrier/carrier.go b/carrier/carrier.go index 2bfb13af..b44e1324 100644 --- a/carrier/carrier.go +++ b/carrier/carrier.go @@ -16,7 +16,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/token" + "github.com/cloudflare/cloudflared/token" ) const ( diff --git a/carrier/websocket.go b/carrier/websocket.go index 3517ae45..31075210 100644 --- a/carrier/websocket.go +++ b/carrier/websocket.go @@ -9,9 +9,9 @@ import ( "github.com/gorilla/websocket" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/stream" - "github.com/kjake/cloudflared/token" - cfwebsocket "github.com/kjake/cloudflared/websocket" + "github.com/cloudflare/cloudflared/stream" + "github.com/cloudflare/cloudflared/token" + cfwebsocket "github.com/cloudflare/cloudflared/websocket" ) // Websocket is used to carry data via WS binary frames over the tunnel from client to the origin diff --git a/carrier/websocket_test.go b/carrier/websocket_test.go index 590e941c..a0a32bb8 100644 --- a/carrier/websocket_test.go +++ b/carrier/websocket_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/websocket" - "github.com/kjake/cloudflared/hello" - "github.com/kjake/cloudflared/tlsconfig" - cfwebsocket "github.com/kjake/cloudflared/websocket" + "github.com/cloudflare/cloudflared/hello" + "github.com/cloudflare/cloudflared/tlsconfig" + cfwebsocket "github.com/cloudflare/cloudflared/websocket" ) func websocketClientTLSConfig(t *testing.T) *tls.Config { diff --git a/cmd/cloudflared/access/carrier.go b/cmd/cloudflared/access/carrier.go index d1b0c944..12cc8ac7 100644 --- a/cmd/cloudflared/access/carrier.go +++ b/cmd/cloudflared/access/carrier.go @@ -11,11 +11,11 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/carrier" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/logger" - "github.com/kjake/cloudflared/stream" - "github.com/kjake/cloudflared/validation" + "github.com/cloudflare/cloudflared/carrier" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/stream" + "github.com/cloudflare/cloudflared/validation" ) const ( diff --git a/cmd/cloudflared/access/cmd.go b/cmd/cloudflared/access/cmd.go index a9479385..d1490ef7 100644 --- a/cmd/cloudflared/access/cmd.go +++ b/cmd/cloudflared/access/cmd.go @@ -17,12 +17,12 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/net/idna" - "github.com/kjake/cloudflared/carrier" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/logger" - "github.com/kjake/cloudflared/sshgen" - "github.com/kjake/cloudflared/token" - "github.com/kjake/cloudflared/validation" + "github.com/cloudflare/cloudflared/carrier" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/sshgen" + "github.com/cloudflare/cloudflared/token" + "github.com/cloudflare/cloudflared/validation" ) const ( diff --git a/cmd/cloudflared/app_forward_service.go b/cmd/cloudflared/app_forward_service.go index dade2a5f..1c015430 100644 --- a/cmd/cloudflared/app_forward_service.go +++ b/cmd/cloudflared/app_forward_service.go @@ -3,8 +3,8 @@ package main import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/cmd/cloudflared/access" - "github.com/kjake/cloudflared/config" + "github.com/cloudflare/cloudflared/cmd/cloudflared/access" + "github.com/cloudflare/cloudflared/config" ) // ForwardServiceType is used to identify what kind of overwatch service this is diff --git a/cmd/cloudflared/app_resolver_service.go b/cmd/cloudflared/app_resolver_service.go index 4b64cab7..e680e307 100644 --- a/cmd/cloudflared/app_resolver_service.go +++ b/cmd/cloudflared/app_resolver_service.go @@ -3,8 +3,8 @@ package main import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/tunneldns" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/tunneldns" ) const ( diff --git a/cmd/cloudflared/app_service.go b/cmd/cloudflared/app_service.go index c5d48bf6..7eb0d542 100644 --- a/cmd/cloudflared/app_service.go +++ b/cmd/cloudflared/app_service.go @@ -3,8 +3,8 @@ package main import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/overwatch" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/overwatch" ) // AppService is the main service that runs when no command lines flags are passed to cloudflared diff --git a/cmd/cloudflared/cliutil/handler.go b/cmd/cloudflared/cliutil/handler.go index 5baf79a4..47c8af87 100644 --- a/cmd/cloudflared/cliutil/handler.go +++ b/cmd/cloudflared/cliutil/handler.go @@ -4,8 +4,8 @@ import ( "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/logger" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/logger" ) func Action(actionFunc cli.ActionFunc) cli.ActionFunc { diff --git a/cmd/cloudflared/cliutil/logger.go b/cmd/cloudflared/cliutil/logger.go index c70275f0..01435213 100644 --- a/cmd/cloudflared/cliutil/logger.go +++ b/cmd/cloudflared/cliutil/logger.go @@ -4,7 +4,7 @@ import ( "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "github.com/kjake/cloudflared/logger" + "github.com/cloudflare/cloudflared/logger" ) var ( diff --git a/cmd/cloudflared/common_service.go b/cmd/cloudflared/common_service.go index 09042ab6..db7338c0 100644 --- a/cmd/cloudflared/common_service.go +++ b/cmd/cloudflared/common_service.go @@ -4,8 +4,8 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/cmd/cloudflared/tunnel" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" ) func buildArgsForToken(c *cli.Context, log *zerolog.Logger) ([]string, error) { diff --git a/cmd/cloudflared/generic_service.go b/cmd/cloudflared/generic_service.go index fcea4136..4ec85865 100644 --- a/cmd/cloudflared/generic_service.go +++ b/cmd/cloudflared/generic_service.go @@ -8,7 +8,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" ) func runApp(app *cli.App, graceShutdownC chan struct{}) { diff --git a/cmd/cloudflared/linux_service.go b/cmd/cloudflared/linux_service.go index 5d0a2599..4e68af17 100644 --- a/cmd/cloudflared/linux_service.go +++ b/cmd/cloudflared/linux_service.go @@ -9,10 +9,10 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/cmd/cloudflared/tunnel" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/logger" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/logger" ) func runApp(app *cli.App, graceShutdownC chan struct{}) { diff --git a/cmd/cloudflared/macos_service.go b/cmd/cloudflared/macos_service.go index d031550f..48d066e0 100644 --- a/cmd/cloudflared/macos_service.go +++ b/cmd/cloudflared/macos_service.go @@ -9,8 +9,8 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/logger" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/logger" ) const ( diff --git a/cmd/cloudflared/main.go b/cmd/cloudflared/main.go index e69b78a3..b0b93cf8 100644 --- a/cmd/cloudflared/main.go +++ b/cmd/cloudflared/main.go @@ -13,19 +13,19 @@ import ( "github.com/urfave/cli/v2" "go.uber.org/automaxprocs/maxprocs" - "github.com/kjake/cloudflared/cmd/cloudflared/access" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/cmd/cloudflared/proxydns" - "github.com/kjake/cloudflared/cmd/cloudflared/tail" - "github.com/kjake/cloudflared/cmd/cloudflared/tunnel" - "github.com/kjake/cloudflared/cmd/cloudflared/updater" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/logger" - "github.com/kjake/cloudflared/metrics" - "github.com/kjake/cloudflared/overwatch" - "github.com/kjake/cloudflared/token" - "github.com/kjake/cloudflared/tracing" - "github.com/kjake/cloudflared/watcher" + "github.com/cloudflare/cloudflared/cmd/cloudflared/access" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/proxydns" + "github.com/cloudflare/cloudflared/cmd/cloudflared/tail" + "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" + "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/metrics" + "github.com/cloudflare/cloudflared/overwatch" + "github.com/cloudflare/cloudflared/token" + "github.com/cloudflare/cloudflared/tracing" + "github.com/cloudflare/cloudflared/watcher" ) const ( diff --git a/cmd/cloudflared/proxydns/cmd.go b/cmd/cloudflared/proxydns/cmd.go index 6df06788..950da293 100644 --- a/cmd/cloudflared/proxydns/cmd.go +++ b/cmd/cloudflared/proxydns/cmd.go @@ -9,10 +9,10 @@ import ( "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/logger" - "github.com/kjake/cloudflared/metrics" - "github.com/kjake/cloudflared/tunneldns" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/metrics" + "github.com/cloudflare/cloudflared/tunneldns" ) func Command(hidden bool) *cli.Command { diff --git a/cmd/cloudflared/service_template.go b/cmd/cloudflared/service_template.go index c58e1364..c2f0d3cf 100644 --- a/cmd/cloudflared/service_template.go +++ b/cmd/cloudflared/service_template.go @@ -12,7 +12,7 @@ import ( homedir "github.com/mitchellh/go-homedir" - "github.com/kjake/cloudflared/config" + "github.com/cloudflare/cloudflared/config" ) type ServiceTemplate struct { diff --git a/cmd/cloudflared/tail/cmd.go b/cmd/cloudflared/tail/cmd.go index d976487b..7d444024 100644 --- a/cmd/cloudflared/tail/cmd.go +++ b/cmd/cloudflared/tail/cmd.go @@ -17,10 +17,10 @@ import ( "github.com/urfave/cli/v2" "nhooyr.io/websocket" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/credentials" - "github.com/kjake/cloudflared/logger" - "github.com/kjake/cloudflared/management" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/credentials" + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/management" ) var ( diff --git a/cmd/cloudflared/tunnel/cmd.go b/cmd/cloudflared/tunnel/cmd.go index a3b83413..c8d565f2 100644 --- a/cmd/cloudflared/tunnel/cmd.go +++ b/cmd/cloudflared/tunnel/cmd.go @@ -22,26 +22,26 @@ import ( "github.com/urfave/cli/v2" "github.com/urfave/cli/v2/altsrc" - "github.com/kjake/cloudflared/cfapi" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/cmd/cloudflared/proxydns" - "github.com/kjake/cloudflared/cmd/cloudflared/updater" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/credentials" - "github.com/kjake/cloudflared/diagnostic" - "github.com/kjake/cloudflared/edgediscovery" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/logger" - "github.com/kjake/cloudflared/management" - "github.com/kjake/cloudflared/metrics" - "github.com/kjake/cloudflared/orchestration" - "github.com/kjake/cloudflared/signal" - "github.com/kjake/cloudflared/supervisor" - "github.com/kjake/cloudflared/tlsconfig" - "github.com/kjake/cloudflared/tunneldns" - "github.com/kjake/cloudflared/tunnelstate" - "github.com/kjake/cloudflared/validation" + "github.com/cloudflare/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/proxydns" + "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/credentials" + "github.com/cloudflare/cloudflared/diagnostic" + "github.com/cloudflare/cloudflared/edgediscovery" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/management" + "github.com/cloudflare/cloudflared/metrics" + "github.com/cloudflare/cloudflared/orchestration" + "github.com/cloudflare/cloudflared/signal" + "github.com/cloudflare/cloudflared/supervisor" + "github.com/cloudflare/cloudflared/tlsconfig" + "github.com/cloudflare/cloudflared/tunneldns" + "github.com/cloudflare/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/validation" ) const ( diff --git a/cmd/cloudflared/tunnel/config_test.go b/cmd/cloudflared/tunnel/config_test.go index 92d8f10b..0ca6c436 100644 --- a/cmd/cloudflared/tunnel/config_test.go +++ b/cmd/cloudflared/tunnel/config_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/features" + "github.com/cloudflare/cloudflared/features" ) func TestDedup(t *testing.T) { diff --git a/cmd/cloudflared/tunnel/configuration.go b/cmd/cloudflared/tunnel/configuration.go index 6392192b..c5983273 100644 --- a/cmd/cloudflared/tunnel/configuration.go +++ b/cmd/cloudflared/tunnel/configuration.go @@ -17,17 +17,17 @@ import ( "github.com/urfave/cli/v2/altsrc" "golang.org/x/term" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/edgediscovery" - "github.com/kjake/cloudflared/edgediscovery/allregions" - "github.com/kjake/cloudflared/features" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/orchestration" - "github.com/kjake/cloudflared/supervisor" - "github.com/kjake/cloudflared/tlsconfig" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/edgediscovery" + "github.com/cloudflare/cloudflared/edgediscovery/allregions" + "github.com/cloudflare/cloudflared/features" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/orchestration" + "github.com/cloudflare/cloudflared/supervisor" + "github.com/cloudflare/cloudflared/tlsconfig" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/cmd/cloudflared/tunnel/credential_finder.go b/cmd/cloudflared/tunnel/credential_finder.go index 2a1eaa2e..92e05495 100644 --- a/cmd/cloudflared/tunnel/credential_finder.go +++ b/cmd/cloudflared/tunnel/credential_finder.go @@ -4,8 +4,8 @@ import ( "fmt" "path/filepath" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/credentials" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/credentials" "github.com/google/uuid" "github.com/rs/zerolog" diff --git a/cmd/cloudflared/tunnel/info.go b/cmd/cloudflared/tunnel/info.go index e400abb0..7c20556a 100644 --- a/cmd/cloudflared/tunnel/info.go +++ b/cmd/cloudflared/tunnel/info.go @@ -5,7 +5,7 @@ import ( "github.com/google/uuid" - "github.com/kjake/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/cfapi" ) type Info struct { diff --git a/cmd/cloudflared/tunnel/ingress_subcommands.go b/cmd/cloudflared/tunnel/ingress_subcommands.go index f07db514..82ef7561 100644 --- a/cmd/cloudflared/tunnel/ingress_subcommands.go +++ b/cmd/cloudflared/tunnel/ingress_subcommands.go @@ -5,9 +5,9 @@ import ( "fmt" "net/url" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/ingress" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ingress" "github.com/pkg/errors" "github.com/urfave/cli/v2" diff --git a/cmd/cloudflared/tunnel/login.go b/cmd/cloudflared/tunnel/login.go index 0fed1024..632e622a 100644 --- a/cmd/cloudflared/tunnel/login.go +++ b/cmd/cloudflared/tunnel/login.go @@ -11,11 +11,11 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/credentials" - "github.com/kjake/cloudflared/logger" - "github.com/kjake/cloudflared/token" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/credentials" + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/token" ) const ( diff --git a/cmd/cloudflared/tunnel/quick_tunnel.go b/cmd/cloudflared/tunnel/quick_tunnel.go index ccbcef87..ee438450 100644 --- a/cmd/cloudflared/tunnel/quick_tunnel.go +++ b/cmd/cloudflared/tunnel/quick_tunnel.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/kjake/cloudflared/connection" + "github.com/cloudflare/cloudflared/connection" ) const httpTimeout = 15 * time.Second diff --git a/cmd/cloudflared/tunnel/server.go b/cmd/cloudflared/tunnel/server.go index 7206103a..63ffad49 100644 --- a/cmd/cloudflared/tunnel/server.go +++ b/cmd/cloudflared/tunnel/server.go @@ -3,7 +3,7 @@ package tunnel import ( "fmt" - "github.com/kjake/cloudflared/tunneldns" + "github.com/cloudflare/cloudflared/tunneldns" "github.com/pkg/errors" "github.com/rs/zerolog" diff --git a/cmd/cloudflared/tunnel/subcommand_context.go b/cmd/cloudflared/tunnel/subcommand_context.go index e22d30ab..83332b51 100644 --- a/cmd/cloudflared/tunnel/subcommand_context.go +++ b/cmd/cloudflared/tunnel/subcommand_context.go @@ -13,10 +13,10 @@ import ( "github.com/rs/zerolog" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cfapi" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/credentials" - "github.com/kjake/cloudflared/logger" + "github.com/cloudflare/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/credentials" + "github.com/cloudflare/cloudflared/logger" ) type errInvalidJSONCredential struct { diff --git a/cmd/cloudflared/tunnel/subcommand_context_teamnet.go b/cmd/cloudflared/tunnel/subcommand_context_teamnet.go index ff52d3ca..55faa82a 100644 --- a/cmd/cloudflared/tunnel/subcommand_context_teamnet.go +++ b/cmd/cloudflared/tunnel/subcommand_context_teamnet.go @@ -6,7 +6,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/kjake/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/cfapi" ) const noClientMsg = "error while creating backend client" diff --git a/cmd/cloudflared/tunnel/subcommand_context_test.go b/cmd/cloudflared/tunnel/subcommand_context_test.go index 23a22759..ca2a42b2 100644 --- a/cmd/cloudflared/tunnel/subcommand_context_test.go +++ b/cmd/cloudflared/tunnel/subcommand_context_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cfapi" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/credentials" + "github.com/cloudflare/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/credentials" ) type mockFileSystem struct { diff --git a/cmd/cloudflared/tunnel/subcommand_context_vnets.go b/cmd/cloudflared/tunnel/subcommand_context_vnets.go index fb8bbf87..c6e9adca 100644 --- a/cmd/cloudflared/tunnel/subcommand_context_vnets.go +++ b/cmd/cloudflared/tunnel/subcommand_context_vnets.go @@ -4,7 +4,7 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/kjake/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/cfapi" ) func (sc *subcommandContext) addVirtualNetwork(newVnet cfapi.NewVirtualNetwork) (cfapi.VirtualNetwork, error) { diff --git a/cmd/cloudflared/tunnel/subcommands.go b/cmd/cloudflared/tunnel/subcommands.go index 6be2529b..ee26e2ae 100644 --- a/cmd/cloudflared/tunnel/subcommands.go +++ b/cmd/cloudflared/tunnel/subcommands.go @@ -23,13 +23,13 @@ import ( "golang.org/x/net/idna" yaml "gopkg.in/yaml.v3" - "github.com/kjake/cloudflared/cfapi" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/cmd/cloudflared/updater" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/diagnostic" - "github.com/kjake/cloudflared/metrics" + "github.com/cloudflare/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/diagnostic" + "github.com/cloudflare/cloudflared/metrics" ) const ( diff --git a/cmd/cloudflared/tunnel/subcommands_test.go b/cmd/cloudflared/tunnel/subcommands_test.go index 9141b3ec..2016fe6d 100644 --- a/cmd/cloudflared/tunnel/subcommands_test.go +++ b/cmd/cloudflared/tunnel/subcommands_test.go @@ -11,8 +11,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/cfapi" - "github.com/kjake/cloudflared/connection" + "github.com/cloudflare/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/connection" ) func Test_fmtConnections(t *testing.T) { diff --git a/cmd/cloudflared/tunnel/tag.go b/cmd/cloudflared/tunnel/tag.go index 6ef49670..badca9d7 100644 --- a/cmd/cloudflared/tunnel/tag.go +++ b/cmd/cloudflared/tunnel/tag.go @@ -4,7 +4,7 @@ import ( "fmt" "regexp" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // Restrict key names to characters allowed in an HTTP header name. diff --git a/cmd/cloudflared/tunnel/tag_test.go b/cmd/cloudflared/tunnel/tag_test.go index 5af0d7b4..0419d4df 100644 --- a/cmd/cloudflared/tunnel/tag_test.go +++ b/cmd/cloudflared/tunnel/tag_test.go @@ -3,7 +3,7 @@ package tunnel import ( "testing" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" "github.com/stretchr/testify/assert" ) diff --git a/cmd/cloudflared/tunnel/teamnet_subcommands.go b/cmd/cloudflared/tunnel/teamnet_subcommands.go index 4c134bd0..b46f52e1 100644 --- a/cmd/cloudflared/tunnel/teamnet_subcommands.go +++ b/cmd/cloudflared/tunnel/teamnet_subcommands.go @@ -10,9 +10,9 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cfapi" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/cmd/cloudflared/updater" + "github.com/cloudflare/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" ) var ( diff --git a/cmd/cloudflared/tunnel/vnets_subcommands.go b/cmd/cloudflared/tunnel/vnets_subcommands.go index 16a85099..57c350c9 100644 --- a/cmd/cloudflared/tunnel/vnets_subcommands.go +++ b/cmd/cloudflared/tunnel/vnets_subcommands.go @@ -9,9 +9,9 @@ import ( "github.com/pkg/errors" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cfapi" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/cmd/cloudflared/updater" + "github.com/cloudflare/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/updater" ) var ( diff --git a/cmd/cloudflared/updater/update.go b/cmd/cloudflared/updater/update.go index 9c21bae1..1d3cbc2e 100644 --- a/cmd/cloudflared/updater/update.go +++ b/cmd/cloudflared/updater/update.go @@ -14,9 +14,9 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/term" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/logger" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/logger" ) const ( diff --git a/cmd/cloudflared/updater/update_test.go b/cmd/cloudflared/updater/update_test.go index dc7f2375..3159f7ab 100644 --- a/cmd/cloudflared/updater/update_test.go +++ b/cmd/cloudflared/updater/update_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" ) func init() { diff --git a/cmd/cloudflared/updater/workers_update.go b/cmd/cloudflared/updater/workers_update.go index 6fdecb07..b7a86ff1 100644 --- a/cmd/cloudflared/updater/workers_update.go +++ b/cmd/cloudflared/updater/workers_update.go @@ -18,7 +18,7 @@ import ( "github.com/getsentry/sentry-go" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" ) const ( diff --git a/cmd/cloudflared/windows_service.go b/cmd/cloudflared/windows_service.go index d1873db7..0858439d 100644 --- a/cmd/cloudflared/windows_service.go +++ b/cmd/cloudflared/windows_service.go @@ -19,8 +19,8 @@ import ( "golang.org/x/sys/windows/svc/eventlog" "golang.org/x/sys/windows/svc/mgr" - "github.com/kjake/cloudflared/cmd/cloudflared/cliutil" - "github.com/kjake/cloudflared/logger" + "github.com/cloudflare/cloudflared/cmd/cloudflared/cliutil" + "github.com/cloudflare/cloudflared/logger" ) const ( diff --git a/config/configuration.go b/config/configuration.go index 8ab09c0f..05122d76 100644 --- a/config/configuration.go +++ b/config/configuration.go @@ -17,7 +17,7 @@ import ( "github.com/urfave/cli/v2" yaml "gopkg.in/yaml.v3" - "github.com/kjake/cloudflared/validation" + "github.com/cloudflare/cloudflared/validation" ) var ( diff --git a/config/manager.go b/config/manager.go index b7f7eca6..e5002c30 100644 --- a/config/manager.go +++ b/config/manager.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" yaml "gopkg.in/yaml.v3" - "github.com/kjake/cloudflared/watcher" + "github.com/cloudflare/cloudflared/watcher" ) // Notifier sends out config updates diff --git a/config/manager_test.go b/config/manager_test.go index a81df0c2..1de80985 100644 --- a/config/manager_test.go +++ b/config/manager_test.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/kjake/cloudflared/watcher" + "github.com/cloudflare/cloudflared/watcher" ) type mockNotifier struct { diff --git a/config/model.go b/config/model.go index eff05a36..f90fd1ec 100644 --- a/config/model.go +++ b/config/model.go @@ -6,7 +6,7 @@ import ( "io" "strings" - "github.com/kjake/cloudflared/tunneldns" + "github.com/cloudflare/cloudflared/tunneldns" ) // Forwarder represents a client side listener to forward traffic to the edge diff --git a/connection/connection.go b/connection/connection.go index 9f94e5fa..b7376e38 100644 --- a/connection/connection.go +++ b/connection/connection.go @@ -15,9 +15,9 @@ import ( "github.com/google/uuid" "github.com/pkg/errors" - "github.com/kjake/cloudflared/tracing" - "github.com/kjake/cloudflared/tunnelrpc/pogs" - "github.com/kjake/cloudflared/websocket" + "github.com/cloudflare/cloudflared/tracing" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/websocket" ) const ( diff --git a/connection/connection_test.go b/connection/connection_test.go index f6fbc630..ffd483d2 100644 --- a/connection/connection_test.go +++ b/connection/connection_test.go @@ -10,10 +10,10 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/stream" - "github.com/kjake/cloudflared/tracing" - tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" - "github.com/kjake/cloudflared/websocket" + "github.com/cloudflare/cloudflared/stream" + "github.com/cloudflare/cloudflared/tracing" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/websocket" ) const ( @@ -120,7 +120,7 @@ func (ep *echoPipe) Write(p []byte) (int, error) { } // A mock origin that echos data by streaming like a tcpOverWSConnection -// https://github.com/kjake/cloudflared/blob/master/ingress/origin_connection.go +// https://github.com/cloudflare/cloudflared/blob/master/ingress/origin_connection.go func wsEchoEndpoint(w ResponseWriter, r *http.Request) error { resp := &http.Response{ StatusCode: http.StatusSwitchingProtocols, diff --git a/connection/control.go b/connection/control.go index 96d8215d..2e5f1e35 100644 --- a/connection/control.go +++ b/connection/control.go @@ -8,9 +8,9 @@ import ( "github.com/pkg/errors" - "github.com/kjake/cloudflared/management" - "github.com/kjake/cloudflared/tunnelrpc" - tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/management" + "github.com/cloudflare/cloudflared/tunnelrpc" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // registerClient derives a named tunnel rpc client that can then be used to register and unregister connections. diff --git a/connection/errors.go b/connection/errors.go index a894634e..1bb34d6d 100644 --- a/connection/errors.go +++ b/connection/errors.go @@ -1,8 +1,8 @@ package connection import ( - "github.com/kjake/cloudflared/edgediscovery" - tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/edgediscovery" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/connection/http2.go b/connection/http2.go index ce4dc822..aee9d9da 100644 --- a/connection/http2.go +++ b/connection/http2.go @@ -16,8 +16,8 @@ import ( "github.com/rs/zerolog" "golang.org/x/net/http2" - "github.com/kjake/cloudflared/tracing" - tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tracing" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // note: these constants are exported so we can reuse them in the edge-side code diff --git a/connection/http2_test.go b/connection/http2_test.go index 7ee3e628..92665688 100644 --- a/connection/http2_test.go +++ b/connection/http2_test.go @@ -20,8 +20,8 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/http2" - "github.com/kjake/cloudflared/tunnelrpc" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) var ( diff --git a/connection/observer.go b/connection/observer.go index 74f685c0..817e6d2e 100644 --- a/connection/observer.go +++ b/connection/observer.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/management" + "github.com/cloudflare/cloudflared/management" ) const ( diff --git a/connection/protocol.go b/connection/protocol.go index 9ef07ba4..417c8b72 100644 --- a/connection/protocol.go +++ b/connection/protocol.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/edgediscovery" + "github.com/cloudflare/cloudflared/edgediscovery" ) const ( diff --git a/connection/protocol_test.go b/connection/protocol_test.go index 960c4b97..12d238c5 100644 --- a/connection/protocol_test.go +++ b/connection/protocol_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/kjake/cloudflared/edgediscovery" + "github.com/cloudflare/cloudflared/edgediscovery" ) const ( diff --git a/connection/quic_connection.go b/connection/quic_connection.go index 76e55d1a..7a20e15a 100644 --- a/connection/quic_connection.go +++ b/connection/quic_connection.go @@ -17,11 +17,11 @@ import ( "github.com/rs/zerolog" "golang.org/x/sync/errgroup" - cfdquic "github.com/kjake/cloudflared/quic" - "github.com/kjake/cloudflared/tracing" - "github.com/kjake/cloudflared/tunnelrpc/pogs" - tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" - rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" + cfdquic "github.com/cloudflare/cloudflared/quic" + "github.com/cloudflare/cloudflared/tracing" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic" ) const ( diff --git a/connection/quic_connection_test.go b/connection/quic_connection_test.go index 1f5fbd50..1c22605b 100644 --- a/connection/quic_connection_test.go +++ b/connection/quic_connection_test.go @@ -28,13 +28,13 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/net/nettest" - "github.com/kjake/cloudflared/datagramsession" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/packet" - cfdquic "github.com/kjake/cloudflared/quic" - "github.com/kjake/cloudflared/tracing" - "github.com/kjake/cloudflared/tunnelrpc/pogs" - rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" + "github.com/cloudflare/cloudflared/datagramsession" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/packet" + cfdquic "github.com/cloudflare/cloudflared/quic" + "github.com/cloudflare/cloudflared/tracing" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic" ) var ( diff --git a/connection/quic_datagram_v2.go b/connection/quic_datagram_v2.go index 427d8f51..c6b8bc03 100644 --- a/connection/quic_datagram_v2.go +++ b/connection/quic_datagram_v2.go @@ -13,15 +13,15 @@ import ( "go.opentelemetry.io/otel/trace" "golang.org/x/sync/errgroup" - "github.com/kjake/cloudflared/datagramsession" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/management" - "github.com/kjake/cloudflared/packet" - cfdquic "github.com/kjake/cloudflared/quic" - "github.com/kjake/cloudflared/tracing" - "github.com/kjake/cloudflared/tunnelrpc/pogs" - tunnelpogs "github.com/kjake/cloudflared/tunnelrpc/pogs" - rpcquic "github.com/kjake/cloudflared/tunnelrpc/quic" + "github.com/cloudflare/cloudflared/datagramsession" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/management" + "github.com/cloudflare/cloudflared/packet" + cfdquic "github.com/cloudflare/cloudflared/quic" + "github.com/cloudflare/cloudflared/tracing" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + tunnelpogs "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + rpcquic "github.com/cloudflare/cloudflared/tunnelrpc/quic" ) const ( diff --git a/connection/quic_datagram_v3.go b/connection/quic_datagram_v3.go index 803ff6f8..1b42600e 100644 --- a/connection/quic_datagram_v3.go +++ b/connection/quic_datagram_v3.go @@ -10,10 +10,10 @@ import ( "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/management" - cfdquic "github.com/kjake/cloudflared/quic/v3" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/management" + cfdquic "github.com/cloudflare/cloudflared/quic/v3" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) type datagramV3Connection struct { diff --git a/credentials/credentials.go b/credentials/credentials.go index 4384afd8..8d1d8908 100644 --- a/credentials/credentials.go +++ b/credentials/credentials.go @@ -4,7 +4,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/cfapi" + "github.com/cloudflare/cloudflared/cfapi" ) const ( diff --git a/credentials/origin_cert.go b/credentials/origin_cert.go index 6f07cefa..73a59fa3 100644 --- a/credentials/origin_cert.go +++ b/credentials/origin_cert.go @@ -10,7 +10,7 @@ import ( "github.com/mitchellh/go-homedir" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/config" + "github.com/cloudflare/cloudflared/config" ) const ( diff --git a/datagramsession/manager.go b/datagramsession/manager.go index d9123cf9..f315a0d3 100644 --- a/datagramsession/manager.go +++ b/datagramsession/manager.go @@ -10,8 +10,8 @@ import ( "github.com/google/uuid" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/management" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/management" + "github.com/cloudflare/cloudflared/packet" ) const ( diff --git a/datagramsession/manager_test.go b/datagramsession/manager_test.go index 75b2faf3..496ee16d 100644 --- a/datagramsession/manager_test.go +++ b/datagramsession/manager_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) var ( diff --git a/datagramsession/session.go b/datagramsession/session.go index ada0850b..bb1369f9 100644 --- a/datagramsession/session.go +++ b/datagramsession/session.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) const ( diff --git a/datagramsession/session_test.go b/datagramsession/session_test.go index a9518505..997624b7 100644 --- a/datagramsession/session_test.go +++ b/datagramsession/session_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/sync/errgroup" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) // TestCloseSession makes sure a session will stop after context is done diff --git a/dev.Dockerfile b/dev.Dockerfile index cbbaa65c..8986040a 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -1,10 +1,10 @@ FROM golang:1.22.5 as builder ENV GO111MODULE=on \ CGO_ENABLED=0 -WORKDIR /go/src/github.com/kjake/cloudflared/ +WORKDIR /go/src/github.com/cloudflare/cloudflared/ RUN apt-get update COPY . . RUN .teamcity/install-cloudflare-go.sh # compile cloudflared RUN PATH="/tmp/go/bin:$PATH" make cloudflared -RUN cp /go/src/github.com/kjake/cloudflared/cloudflared /usr/local/bin/ +RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/ diff --git a/diagnostic/client.go b/diagnostic/client.go index 8a9ae3b5..6e4dc2d3 100644 --- a/diagnostic/client.go +++ b/diagnostic/client.go @@ -9,7 +9,7 @@ import ( "net/url" "strconv" - "github.com/kjake/cloudflared/logger" + "github.com/cloudflare/cloudflared/logger" ) type httpClient struct { diff --git a/diagnostic/diagnostic.go b/diagnostic/diagnostic.go index c8992e79..0b0edbc8 100644 --- a/diagnostic/diagnostic.go +++ b/diagnostic/diagnostic.go @@ -15,7 +15,7 @@ import ( "github.com/rs/zerolog" - network "github.com/kjake/cloudflared/diagnostic/network" + network "github.com/cloudflare/cloudflared/diagnostic/network" ) const ( diff --git a/diagnostic/diagnostic_utils_test.go b/diagnostic/diagnostic_utils_test.go index 52b19ead..f0f5a6a3 100644 --- a/diagnostic/diagnostic_utils_test.go +++ b/diagnostic/diagnostic_utils_test.go @@ -14,9 +14,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/diagnostic" - "github.com/kjake/cloudflared/metrics" - "github.com/kjake/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/diagnostic" + "github.com/cloudflare/cloudflared/metrics" + "github.com/cloudflare/cloudflared/tunnelstate" ) func helperCreateServer(t *testing.T, listeners *gracenet.Net, tunnelID uuid.UUID, connectorID uuid.UUID) func() { diff --git a/diagnostic/handlers.go b/diagnostic/handlers.go index f111cbfe..e4d85db4 100644 --- a/diagnostic/handlers.go +++ b/diagnostic/handlers.go @@ -11,7 +11,7 @@ import ( "github.com/google/uuid" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/tunnelstate" ) type Handler struct { diff --git a/diagnostic/handlers_test.go b/diagnostic/handlers_test.go index 34aea9ff..2849241c 100644 --- a/diagnostic/handlers_test.go +++ b/diagnostic/handlers_test.go @@ -15,9 +15,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/diagnostic" - "github.com/kjake/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/diagnostic" + "github.com/cloudflare/cloudflared/tunnelstate" ) type SystemCollectorMock struct { diff --git a/diagnostic/network/collector_unix_test.go b/diagnostic/network/collector_unix_test.go index ddc7e7e2..5743b2d9 100644 --- a/diagnostic/network/collector_unix_test.go +++ b/diagnostic/network/collector_unix_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - diagnostic "github.com/kjake/cloudflared/diagnostic/network" + diagnostic "github.com/cloudflare/cloudflared/diagnostic/network" ) func TestDecode(t *testing.T) { diff --git a/diagnostic/network/collector_windows_test.go b/diagnostic/network/collector_windows_test.go index 1e3f5a85..3338a8bc 100644 --- a/diagnostic/network/collector_windows_test.go +++ b/diagnostic/network/collector_windows_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - diagnostic "github.com/kjake/cloudflared/diagnostic/network" + diagnostic "github.com/cloudflare/cloudflared/diagnostic/network" ) func TestDecode(t *testing.T) { diff --git a/diagnostic/system_collector_test.go b/diagnostic/system_collector_test.go index a568ae9e..c9338740 100644 --- a/diagnostic/system_collector_test.go +++ b/diagnostic/system_collector_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/diagnostic" + "github.com/cloudflare/cloudflared/diagnostic" ) func TestParseMemoryInformationFromKV(t *testing.T) { diff --git a/edgediscovery/allregions/discovery.go b/edgediscovery/allregions/discovery.go index f9acc394..cab06611 100644 --- a/edgediscovery/allregions/discovery.go +++ b/edgediscovery/allregions/discovery.go @@ -10,7 +10,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/management" + "github.com/cloudflare/cloudflared/management" ) const ( diff --git a/edgediscovery/edgediscovery.go b/edgediscovery/edgediscovery.go index 0ce9538e..59091bc7 100644 --- a/edgediscovery/edgediscovery.go +++ b/edgediscovery/edgediscovery.go @@ -5,8 +5,8 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/edgediscovery/allregions" - "github.com/kjake/cloudflared/management" + "github.com/cloudflare/cloudflared/edgediscovery/allregions" + "github.com/cloudflare/cloudflared/management" ) const ( diff --git a/edgediscovery/edgediscovery_test.go b/edgediscovery/edgediscovery_test.go index 5e5d2352..55288ce5 100644 --- a/edgediscovery/edgediscovery_test.go +++ b/edgediscovery/edgediscovery_test.go @@ -7,7 +7,7 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/kjake/cloudflared/edgediscovery/allregions" + "github.com/cloudflare/cloudflared/edgediscovery/allregions" ) var ( diff --git a/fips/fips.go.linux-amd64 b/fips/fips.go.linux-amd64 index ed9d9ad3..5075f298 100644 --- a/fips/fips.go.linux-amd64 +++ b/fips/fips.go.linux-amd64 @@ -4,7 +4,7 @@ package main import ( _ "crypto/tls/fipsonly" - "github.com/kjake/cloudflared/cmd/cloudflared/tunnel" + "github.com/cloudflare/cloudflared/cmd/cloudflared/tunnel" ) func init () { diff --git a/fmt-check.sh b/fmt-check.sh index b112eb80..31fc7abc 100755 --- a/fmt-check.sh +++ b/fmt-check.sh @@ -2,7 +2,7 @@ set -e -o pipefail -OUTPUT=$(goimports -l -d -local github.com/kjake/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc)) +OUTPUT=$(goimports -l -d -local github.com/cloudflare/cloudflared $(go list -mod=vendor -f '{{.Dir}}' -a ./... | fgrep -v tunnelrpc)) if [ -n "$OUTPUT" ] ; then PAGER=$(which colordiff || echo cat) diff --git a/go.mod b/go.mod index b288cdc6..0db3a27b 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/kjake/cloudflared +module github.com/cloudflare/cloudflared go 1.22 @@ -55,10 +55,10 @@ require ( github.com/coredns/caddy v1.1.1 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 // indirect + github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 // indirect github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect - github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 // indirect + github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect github.com/go-logr/logr v1.4.1 // indirect github.com/go-logr/stdr v1.2.2 // indirect @@ -70,7 +70,6 @@ require ( github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect github.com/klauspost/compress v1.15.11 // indirect - github.com/kr/text v0.2.0 // indirect github.com/kylelemons/godebug v1.1.0 // indirect github.com/mattn/go-isatty v0.0.16 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect diff --git a/go.sum b/go.sum index f16ded5b..a2ea4a35 100644 --- a/go.sum +++ b/go.sum @@ -19,21 +19,20 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 h1:0JZ+dUmQeA8IIVUMzysrX4/AKuQwWhV2dYQuPZdvdSQ= -github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= +github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c h1:8ISkoahWXwZR41ois5lSJBSVw4D0OV19Ht/JSTzvSv0= +github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c/go.mod h1:Yg+htXGokKKdzcwhuNDwVvN+uBxDGXJ7G/VN1d8fa64= github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 h1:wWke/RUCl7VRjQhwPlR/v0glZXNYzBHdNUzf/Am2Nmg= github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9/go.mod h1:uPmAp6Sws4L7+Q/OokbWDAK1ibXYhB3PXFP1kol5hPg= github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434 h1:mOp33BLbcbJ8fvTAmZacbBiOASfxN+MLcLxymZCIrGE= github.com/facebookgo/grace v0.0.0-20180706040059-75cf19382434/go.mod h1:KigFdumBXUPSwzLDbeuzyt0elrL7+CP7TKuhrhT4bcU= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 h1:JWuenKqqX8nojtoVVWjGfOF9635RETekkoH6Cc9SX0A= github.com/facebookgo/stack v0.0.0-20160209184415-751773369052/go.mod h1:UbMTZqLaRiH3MsBH8va0n7s1pQYcu3uTb8G4tygF4Zg= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQDg5gKsWoLBOB0n+ZW8s599zru8FJ2/Y= -github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= +github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 h1:7HZCaLC5+BZpmbhCOZJ293Lz68O7PYrF2EzeiFMwCLk= +github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= @@ -123,9 +122,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= diff --git a/hello/hello.go b/hello/hello.go index 127da31b..f8dc1e71 100644 --- a/hello/hello.go +++ b/hello/hello.go @@ -15,7 +15,7 @@ import ( "github.com/gorilla/websocket" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/tlsconfig" + "github.com/cloudflare/cloudflared/tlsconfig" ) const ( diff --git a/ingress/config.go b/ingress/config.go index dfe60057..670a9db1 100644 --- a/ingress/config.go +++ b/ingress/config.go @@ -6,9 +6,9 @@ import ( "github.com/urfave/cli/v2" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/ipaccess" - "github.com/kjake/cloudflared/tlsconfig" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ipaccess" + "github.com/cloudflare/cloudflared/tlsconfig" ) var ( diff --git a/ingress/config_test.go b/ingress/config_test.go index 926a92e4..249cf2d5 100644 --- a/ingress/config_test.go +++ b/ingress/config_test.go @@ -10,8 +10,8 @@ import ( "github.com/urfave/cli/v2" yaml "gopkg.in/yaml.v3" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/ipaccess" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ipaccess" ) // Ensure that the nullable config from `config` package and the diff --git a/ingress/constants_test.go b/ingress/constants_test.go index fe2b8d81..e2f62f0e 100644 --- a/ingress/constants_test.go +++ b/ingress/constants_test.go @@ -1,6 +1,6 @@ package ingress -import "github.com/kjake/cloudflared/logger" +import "github.com/cloudflare/cloudflared/logger" var ( TestLogger = logger.Create(nil) diff --git a/ingress/icmp_darwin.go b/ingress/icmp_darwin.go index 5543ccd3..31972ac5 100644 --- a/ingress/icmp_darwin.go +++ b/ingress/icmp_darwin.go @@ -20,8 +20,8 @@ import ( "go.opentelemetry.io/otel/attribute" "golang.org/x/net/icmp" - "github.com/kjake/cloudflared/packet" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/packet" + "github.com/cloudflare/cloudflared/tracing" ) type icmpProxy struct { diff --git a/ingress/icmp_darwin_test.go b/ingress/icmp_darwin_test.go index 7a6600a9..6cfacb9d 100644 --- a/ingress/icmp_darwin_test.go +++ b/ingress/icmp_darwin_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) func TestSingleEchoIDTracker(t *testing.T) { diff --git a/ingress/icmp_generic.go b/ingress/icmp_generic.go index ac4061f0..4964244a 100644 --- a/ingress/icmp_generic.go +++ b/ingress/icmp_generic.go @@ -11,7 +11,7 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) var errICMPProxyNotImplemented = fmt.Errorf("ICMP proxy is not implemented on %s %s", runtime.GOOS, runtime.GOARCH) diff --git a/ingress/icmp_linux.go b/ingress/icmp_linux.go index 51d1014b..0b263a8f 100644 --- a/ingress/icmp_linux.go +++ b/ingress/icmp_linux.go @@ -21,8 +21,8 @@ import ( "github.com/rs/zerolog" "go.opentelemetry.io/otel/attribute" - "github.com/kjake/cloudflared/packet" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/packet" + "github.com/cloudflare/cloudflared/tracing" ) const ( diff --git a/ingress/icmp_linux_test.go b/ingress/icmp_linux_test.go index f9b83f6d..597b5557 100644 --- a/ingress/icmp_linux_test.go +++ b/ingress/icmp_linux_test.go @@ -5,7 +5,7 @@ package ingress import ( "testing" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) func getFunnel(t *testing.T, proxy *icmpProxy, tuple flow3Tuple) (packet.Funnel, bool) { diff --git a/ingress/icmp_posix.go b/ingress/icmp_posix.go index 47fcf1fe..2c491a8e 100644 --- a/ingress/icmp_posix.go +++ b/ingress/icmp_posix.go @@ -13,7 +13,7 @@ import ( "github.com/rs/zerolog" "golang.org/x/net/icmp" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) // Opens a non-privileged ICMP socket on Linux and Darwin diff --git a/ingress/icmp_posix_test.go b/ingress/icmp_posix_test.go index 85b191af..ebbc4964 100644 --- a/ingress/icmp_posix_test.go +++ b/ingress/icmp_posix_test.go @@ -15,7 +15,7 @@ import ( "golang.org/x/net/icmp" "golang.org/x/net/ipv4" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) func TestFunnelIdleTimeout(t *testing.T) { diff --git a/ingress/icmp_windows.go b/ingress/icmp_windows.go index 06f8b272..23c3eb50 100644 --- a/ingress/icmp_windows.go +++ b/ingress/icmp_windows.go @@ -25,8 +25,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/kjake/cloudflared/packet" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/packet" + "github.com/cloudflare/cloudflared/tracing" ) const ( diff --git a/ingress/ingress.go b/ingress/ingress.go index 20b9c65f..60ee87ac 100644 --- a/ingress/ingress.go +++ b/ingress/ingress.go @@ -13,9 +13,9 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/net/idna" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/ingress/middleware" - "github.com/kjake/cloudflared/ipaccess" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ingress/middleware" + "github.com/cloudflare/cloudflared/ipaccess" ) var ( diff --git a/ingress/ingress_test.go b/ingress/ingress_test.go index 7d5d8157..109cb353 100644 --- a/ingress/ingress_test.go +++ b/ingress/ingress_test.go @@ -14,9 +14,9 @@ import ( "github.com/urfave/cli/v2" yaml "gopkg.in/yaml.v3" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/ipaccess" - "github.com/kjake/cloudflared/tlsconfig" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ipaccess" + "github.com/cloudflare/cloudflared/tlsconfig" ) func TestParseUnixSocket(t *testing.T) { diff --git a/ingress/origin_connection.go b/ingress/origin_connection.go index e0713f27..f7e08004 100644 --- a/ingress/origin_connection.go +++ b/ingress/origin_connection.go @@ -8,10 +8,10 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/ipaccess" - "github.com/kjake/cloudflared/socks" - "github.com/kjake/cloudflared/stream" - "github.com/kjake/cloudflared/websocket" + "github.com/cloudflare/cloudflared/ipaccess" + "github.com/cloudflare/cloudflared/socks" + "github.com/cloudflare/cloudflared/stream" + "github.com/cloudflare/cloudflared/websocket" ) // OriginConnection is a way to stream to a service running on the user's origin. diff --git a/ingress/origin_connection_test.go b/ingress/origin_connection_test.go index fb937e38..40611de7 100644 --- a/ingress/origin_connection_test.go +++ b/ingress/origin_connection_test.go @@ -19,9 +19,9 @@ import ( "golang.org/x/net/proxy" "golang.org/x/sync/errgroup" - "github.com/kjake/cloudflared/socks" - "github.com/kjake/cloudflared/stream" - "github.com/kjake/cloudflared/websocket" + "github.com/cloudflare/cloudflared/socks" + "github.com/cloudflare/cloudflared/stream" + "github.com/cloudflare/cloudflared/websocket" ) const ( diff --git a/ingress/origin_icmp_proxy.go b/ingress/origin_icmp_proxy.go index 1284f883..981b8667 100644 --- a/ingress/origin_icmp_proxy.go +++ b/ingress/origin_icmp_proxy.go @@ -13,8 +13,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/kjake/cloudflared/packet" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/packet" + "github.com/cloudflare/cloudflared/tracing" ) const ( diff --git a/ingress/origin_icmp_proxy_test.go b/ingress/origin_icmp_proxy_test.go index 65852a7c..b85013be 100644 --- a/ingress/origin_icmp_proxy_test.go +++ b/ingress/origin_icmp_proxy_test.go @@ -19,9 +19,9 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/kjake/cloudflared/packet" - quicpogs "github.com/kjake/cloudflared/quic" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/packet" + quicpogs "github.com/cloudflare/cloudflared/quic" + "github.com/cloudflare/cloudflared/tracing" ) var ( diff --git a/ingress/origin_proxy_test.go b/ingress/origin_proxy_test.go index 39c21409..7a6170a2 100644 --- a/ingress/origin_proxy_test.go +++ b/ingress/origin_proxy_test.go @@ -13,8 +13,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/carrier" - "github.com/kjake/cloudflared/websocket" + "github.com/cloudflare/cloudflared/carrier" + "github.com/cloudflare/cloudflared/websocket" ) func TestRawTCPServiceEstablishConnection(t *testing.T) { diff --git a/ingress/origin_service.go b/ingress/origin_service.go index 37a5f553..e13204c5 100644 --- a/ingress/origin_service.go +++ b/ingress/origin_service.go @@ -15,11 +15,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/hello" - "github.com/kjake/cloudflared/ipaccess" - "github.com/kjake/cloudflared/management" - "github.com/kjake/cloudflared/socks" - "github.com/kjake/cloudflared/tlsconfig" + "github.com/cloudflare/cloudflared/hello" + "github.com/cloudflare/cloudflared/ipaccess" + "github.com/cloudflare/cloudflared/management" + "github.com/cloudflare/cloudflared/socks" + "github.com/cloudflare/cloudflared/tlsconfig" ) const ( diff --git a/ingress/packet_router.go b/ingress/packet_router.go index c2e85784..c1224843 100644 --- a/ingress/packet_router.go +++ b/ingress/packet_router.go @@ -8,9 +8,9 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/kjake/cloudflared/packet" - quicpogs "github.com/kjake/cloudflared/quic" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/packet" + quicpogs "github.com/cloudflare/cloudflared/quic" + "github.com/cloudflare/cloudflared/tracing" ) // Upstream of raw packets diff --git a/ingress/packet_router_test.go b/ingress/packet_router_test.go index edfbc8eb..77ab5e89 100644 --- a/ingress/packet_router_test.go +++ b/ingress/packet_router_test.go @@ -14,8 +14,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/net/ipv6" - "github.com/kjake/cloudflared/packet" - quicpogs "github.com/kjake/cloudflared/quic" + "github.com/cloudflare/cloudflared/packet" + quicpogs "github.com/cloudflare/cloudflared/quic" ) var ( diff --git a/ingress/rule.go b/ingress/rule.go index f871805b..43c7ad5e 100644 --- a/ingress/rule.go +++ b/ingress/rule.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - "github.com/kjake/cloudflared/ingress/middleware" + "github.com/cloudflare/cloudflared/ingress/middleware" ) // Rule routes traffic from a hostname/path on the public internet to the diff --git a/ingress/rule_test.go b/ingress/rule_test.go index 4dfa4217..a3d12e01 100644 --- a/ingress/rule_test.go +++ b/ingress/rule_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/config" + "github.com/cloudflare/cloudflared/config" ) func Test_rule_matches(t *testing.T) { diff --git a/logger/create.go b/logger/create.go index f5c1c8e6..4a298ad4 100644 --- a/logger/create.go +++ b/logger/create.go @@ -16,7 +16,7 @@ import ( "golang.org/x/term" "gopkg.in/natefinch/lumberjack.v2" - "github.com/kjake/cloudflared/management" + "github.com/cloudflare/cloudflared/management" ) const ( diff --git a/management/events_test.go b/management/events_test.go index 138b4c01..1d40e29b 100644 --- a/management/events_test.go +++ b/management/events_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" "nhooyr.io/websocket" - "github.com/kjake/cloudflared/internal/test" + "github.com/cloudflare/cloudflared/internal/test" ) var ( diff --git a/management/service_test.go b/management/service_test.go index 76d9e0fd..f283b5f7 100644 --- a/management/service_test.go +++ b/management/service_test.go @@ -15,7 +15,7 @@ import ( "github.com/stretchr/testify/require" "nhooyr.io/websocket" - "github.com/kjake/cloudflared/internal/test" + "github.com/cloudflare/cloudflared/internal/test" ) var ( diff --git a/metrics/metrics.go b/metrics/metrics.go index 63777d02..2a4fe993 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -16,7 +16,7 @@ import ( "github.com/rs/zerolog" "golang.org/x/net/trace" - "github.com/kjake/cloudflared/diagnostic" + "github.com/cloudflare/cloudflared/diagnostic" ) const ( diff --git a/metrics/metrics_test.go b/metrics/metrics_test.go index a8967ad8..849076d7 100644 --- a/metrics/metrics_test.go +++ b/metrics/metrics_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/metrics" + "github.com/cloudflare/cloudflared/metrics" ) func TestMetricsListenerCreation(t *testing.T) { diff --git a/metrics/readiness.go b/metrics/readiness.go index b8529a29..0e5124f1 100644 --- a/metrics/readiness.go +++ b/metrics/readiness.go @@ -7,7 +7,7 @@ import ( "github.com/google/uuid" - "github.com/kjake/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/tunnelstate" ) // ReadyServer serves HTTP 200 if the tunnel can serve traffic. Intended for k8s readiness checks. diff --git a/metrics/readiness_test.go b/metrics/readiness_test.go index a373f5f6..240f171e 100644 --- a/metrics/readiness_test.go +++ b/metrics/readiness_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/metrics" - "github.com/kjake/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/metrics" + "github.com/cloudflare/cloudflared/tunnelstate" ) func mockRequest(t *testing.T, readyServer *metrics.ReadyServer) (int, uint) { diff --git a/orchestration/config.go b/orchestration/config.go index ccca9b47..04c7a0ab 100644 --- a/orchestration/config.go +++ b/orchestration/config.go @@ -4,8 +4,8 @@ import ( "encoding/json" "time" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/ingress" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ingress" ) type newRemoteConfig struct { diff --git a/orchestration/config_test.go b/orchestration/config_test.go index 76efe44f..affac27a 100644 --- a/orchestration/config_test.go +++ b/orchestration/config_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/ingress" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/ingress" ) // TestNewLocalConfig_MarshalJSON tests that we are able to converte a compiled and validated config back diff --git a/orchestration/orchestrator.go b/orchestration/orchestrator.go index 4d69d1a4..9af18865 100644 --- a/orchestration/orchestrator.go +++ b/orchestration/orchestrator.go @@ -10,11 +10,11 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/proxy" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/proxy" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // Orchestrator manages configurations, so they can be updatable during runtime diff --git a/orchestration/orchestrator_test.go b/orchestration/orchestrator_test.go index db609267..eb2c6f72 100644 --- a/orchestration/orchestrator_test.go +++ b/orchestration/orchestrator_test.go @@ -18,12 +18,12 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/management" - "github.com/kjake/cloudflared/tracing" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/management" + "github.com/cloudflare/cloudflared/tracing" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) var ( diff --git a/proxy/logger.go b/proxy/logger.go index 70e0b867..fa202964 100644 --- a/proxy/logger.go +++ b/proxy/logger.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/management" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/management" ) const ( diff --git a/proxy/metrics.go b/proxy/metrics.go index 81bf09b2..54e09ad2 100644 --- a/proxy/metrics.go +++ b/proxy/metrics.go @@ -3,7 +3,7 @@ package proxy import ( "github.com/prometheus/client_golang/prometheus" - "github.com/kjake/cloudflared/connection" + "github.com/cloudflare/cloudflared/connection" ) // Metrics uses connection.MetricsNamespace(aka cloudflared) as namespace and connection.TunnelSubsystem diff --git a/proxy/proxy.go b/proxy/proxy.go index ce38f05e..dd999f87 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -13,13 +13,13 @@ import ( "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/trace" - "github.com/kjake/cloudflared/carrier" - "github.com/kjake/cloudflared/cfio" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/stream" - "github.com/kjake/cloudflared/tracing" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/carrier" + "github.com/cloudflare/cloudflared/cfio" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/stream" + "github.com/cloudflare/cloudflared/tracing" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/proxy/proxy_posix_test.go b/proxy/proxy_posix_test.go index ba29e618..df927fd3 100644 --- a/proxy/proxy_posix_test.go +++ b/proxy/proxy_posix_test.go @@ -11,7 +11,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/config" + "github.com/cloudflare/cloudflared/config" ) func TestUnixSocketOrigin(t *testing.T) { diff --git a/proxy/proxy_test.go b/proxy/proxy_test.go index 8457cba6..c1c60fc4 100644 --- a/proxy/proxy_test.go +++ b/proxy/proxy_test.go @@ -23,14 +23,14 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "github.com/kjake/cloudflared/cfio" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/hello" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/logger" - "github.com/kjake/cloudflared/tracing" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/cfio" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/hello" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/logger" + "github.com/cloudflare/cloudflared/tracing" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) var ( diff --git a/quic/datagram.go b/quic/datagram.go index 56c6e3da..cb5fde77 100644 --- a/quic/datagram.go +++ b/quic/datagram.go @@ -9,7 +9,7 @@ import ( "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/packet" ) const ( diff --git a/quic/datagram_test.go b/quic/datagram_test.go index 0a85e585..3dfbc2fb 100644 --- a/quic/datagram_test.go +++ b/quic/datagram_test.go @@ -24,8 +24,8 @@ import ( "golang.org/x/net/ipv4" "golang.org/x/sync/errgroup" - "github.com/kjake/cloudflared/packet" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/packet" + "github.com/cloudflare/cloudflared/tracing" ) var ( diff --git a/quic/datagramv2.go b/quic/datagramv2.go index 1d7a14e7..27dfe10e 100644 --- a/quic/datagramv2.go +++ b/quic/datagramv2.go @@ -8,8 +8,8 @@ import ( "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/packet" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/packet" + "github.com/cloudflare/cloudflared/tracing" ) type DatagramV2Type byte diff --git a/quic/v3/datagram_test.go b/quic/v3/datagram_test.go index ce55f0c3..834c4ae4 100644 --- a/quic/v3/datagram_test.go +++ b/quic/v3/datagram_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/require" - v3 "github.com/kjake/cloudflared/quic/v3" + v3 "github.com/cloudflare/cloudflared/quic/v3" ) func makePayload(size int) []byte { diff --git a/quic/v3/icmp.go b/quic/v3/icmp.go index d6153f25..e9e3cc01 100644 --- a/quic/v3/icmp.go +++ b/quic/v3/icmp.go @@ -6,9 +6,9 @@ import ( "github.com/rs/zerolog" "go.opentelemetry.io/otel/trace" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/packet" - "github.com/kjake/cloudflared/tracing" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/packet" + "github.com/cloudflare/cloudflared/tracing" ) // packetResponder is an implementation of the [ingress.ICMPResponder] which provides the ICMP Flow manager the diff --git a/quic/v3/icmp_test.go b/quic/v3/icmp_test.go index 706c5c36..3189a571 100644 --- a/quic/v3/icmp_test.go +++ b/quic/v3/icmp_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/packet" ) type noopICMPRouter struct{} diff --git a/quic/v3/manager_test.go b/quic/v3/manager_test.go index 45245e63..71defadd 100644 --- a/quic/v3/manager_test.go +++ b/quic/v3/manager_test.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/ingress" - v3 "github.com/kjake/cloudflared/quic/v3" + "github.com/cloudflare/cloudflared/ingress" + v3 "github.com/cloudflare/cloudflared/quic/v3" ) func TestRegisterSession(t *testing.T) { diff --git a/quic/v3/muxer.go b/quic/v3/muxer.go index 6c8d4da9..29673a3b 100644 --- a/quic/v3/muxer.go +++ b/quic/v3/muxer.go @@ -9,8 +9,8 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/packet" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/packet" ) const ( diff --git a/quic/v3/muxer_test.go b/quic/v3/muxer_test.go index ef7f912d..90c167a6 100644 --- a/quic/v3/muxer_test.go +++ b/quic/v3/muxer_test.go @@ -20,9 +20,9 @@ import ( "golang.org/x/net/icmp" "golang.org/x/net/ipv4" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/packet" - v3 "github.com/kjake/cloudflared/quic/v3" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/packet" + v3 "github.com/cloudflare/cloudflared/quic/v3" ) type noopEyeball struct { diff --git a/quic/v3/request_test.go b/quic/v3/request_test.go index 372d7603..3c7915c7 100644 --- a/quic/v3/request_test.go +++ b/quic/v3/request_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/require" - v3 "github.com/kjake/cloudflared/quic/v3" + v3 "github.com/cloudflare/cloudflared/quic/v3" ) var ( diff --git a/quic/v3/session_test.go b/quic/v3/session_test.go index d0caf27f..b739ca2d 100644 --- a/quic/v3/session_test.go +++ b/quic/v3/session_test.go @@ -13,7 +13,7 @@ import ( "github.com/fortytw2/leaktest" "github.com/rs/zerolog" - v3 "github.com/kjake/cloudflared/quic/v3" + v3 "github.com/cloudflare/cloudflared/quic/v3" ) var ( diff --git a/socks/request_handler.go b/socks/request_handler.go index 05ba635a..179c955c 100644 --- a/socks/request_handler.go +++ b/socks/request_handler.go @@ -8,7 +8,7 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/ipaccess" + "github.com/cloudflare/cloudflared/ipaccess" ) // RequestHandler is the functions needed to handle a SOCKS5 command diff --git a/socks/request_handler_test.go b/socks/request_handler_test.go index c11584af..401b2017 100644 --- a/socks/request_handler_test.go +++ b/socks/request_handler_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/kjake/cloudflared/ipaccess" + "github.com/cloudflare/cloudflared/ipaccess" ) func TestUnsupportedBind(t *testing.T) { diff --git a/sshgen/sshgen.go b/sshgen/sshgen.go index 416793d9..aef3097a 100644 --- a/sshgen/sshgen.go +++ b/sshgen/sshgen.go @@ -21,8 +21,8 @@ import ( "github.com/pkg/errors" gossh "golang.org/x/crypto/ssh" - "github.com/kjake/cloudflared/config" - cfpath "github.com/kjake/cloudflared/token" + "github.com/cloudflare/cloudflared/config" + cfpath "github.com/cloudflare/cloudflared/token" ) const ( diff --git a/sshgen/sshgen_test.go b/sshgen/sshgen_test.go index 0581cc15..429f24f3 100644 --- a/sshgen/sshgen_test.go +++ b/sshgen/sshgen_test.go @@ -20,8 +20,8 @@ import ( "github.com/go-jose/go-jose/v4/jwt" "github.com/stretchr/testify/assert" - "github.com/kjake/cloudflared/config" - cfpath "github.com/kjake/cloudflared/token" + "github.com/cloudflare/cloudflared/config" + cfpath "github.com/cloudflare/cloudflared/token" ) const ( diff --git a/stream/stream.go b/stream/stream.go index 95bfc803..c9491ec6 100644 --- a/stream/stream.go +++ b/stream/stream.go @@ -12,7 +12,7 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/cfio" + "github.com/cloudflare/cloudflared/cfio" ) type Stream interface { diff --git a/supervisor/conn_aware_logger.go b/supervisor/conn_aware_logger.go index fed978b3..1311f20b 100644 --- a/supervisor/conn_aware_logger.go +++ b/supervisor/conn_aware_logger.go @@ -3,8 +3,8 @@ package supervisor import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/tunnelstate" ) type ConnAwareLogger struct { diff --git a/supervisor/metrics.go b/supervisor/metrics.go index 98cb74b9..e6d50cdd 100644 --- a/supervisor/metrics.go +++ b/supervisor/metrics.go @@ -3,7 +3,7 @@ package supervisor import ( "github.com/prometheus/client_golang/prometheus" - "github.com/kjake/cloudflared/connection" + "github.com/cloudflare/cloudflared/connection" ) // Metrics uses connection.MetricsNamespace(aka cloudflared) as namespace and connection.TunnelSubsystem diff --git a/supervisor/pqtunnels.go b/supervisor/pqtunnels.go index b4def29e..70a3fd69 100644 --- a/supervisor/pqtunnels.go +++ b/supervisor/pqtunnels.go @@ -4,7 +4,7 @@ import ( "crypto/tls" "fmt" - "github.com/kjake/cloudflared/features" + "github.com/cloudflare/cloudflared/features" ) // When experimental post-quantum tunnels are enabled, and we're hitting an diff --git a/supervisor/supervisor.go b/supervisor/supervisor.go index ba66030a..8736963c 100644 --- a/supervisor/supervisor.go +++ b/supervisor/supervisor.go @@ -11,14 +11,14 @@ import ( "github.com/quic-go/quic-go" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/edgediscovery" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/orchestration" - v3 "github.com/kjake/cloudflared/quic/v3" - "github.com/kjake/cloudflared/retry" - "github.com/kjake/cloudflared/signal" - "github.com/kjake/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/edgediscovery" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/orchestration" + v3 "github.com/cloudflare/cloudflared/quic/v3" + "github.com/cloudflare/cloudflared/retry" + "github.com/cloudflare/cloudflared/signal" + "github.com/cloudflare/cloudflared/tunnelstate" ) const ( diff --git a/supervisor/tunnel.go b/supervisor/tunnel.go index 4e3f9217..43349c19 100644 --- a/supervisor/tunnel.go +++ b/supervisor/tunnel.go @@ -16,19 +16,19 @@ import ( "github.com/rs/zerolog" "golang.org/x/sync/errgroup" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/edgediscovery" - "github.com/kjake/cloudflared/edgediscovery/allregions" - "github.com/kjake/cloudflared/features" - "github.com/kjake/cloudflared/ingress" - "github.com/kjake/cloudflared/management" - "github.com/kjake/cloudflared/orchestration" - quicpogs "github.com/kjake/cloudflared/quic" - v3 "github.com/kjake/cloudflared/quic/v3" - "github.com/kjake/cloudflared/retry" - "github.com/kjake/cloudflared/signal" - "github.com/kjake/cloudflared/tunnelrpc/pogs" - "github.com/kjake/cloudflared/tunnelstate" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/edgediscovery" + "github.com/cloudflare/cloudflared/edgediscovery/allregions" + "github.com/cloudflare/cloudflared/features" + "github.com/cloudflare/cloudflared/ingress" + "github.com/cloudflare/cloudflared/management" + "github.com/cloudflare/cloudflared/orchestration" + quicpogs "github.com/cloudflare/cloudflared/quic" + v3 "github.com/cloudflare/cloudflared/quic/v3" + "github.com/cloudflare/cloudflared/retry" + "github.com/cloudflare/cloudflared/signal" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelstate" ) const ( diff --git a/supervisor/tunnel_test.go b/supervisor/tunnel_test.go index adc6db2b..b0b6cef5 100644 --- a/supervisor/tunnel_test.go +++ b/supervisor/tunnel_test.go @@ -8,9 +8,9 @@ import ( "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "github.com/kjake/cloudflared/connection" - "github.com/kjake/cloudflared/edgediscovery" - "github.com/kjake/cloudflared/retry" + "github.com/cloudflare/cloudflared/connection" + "github.com/cloudflare/cloudflared/edgediscovery" + "github.com/cloudflare/cloudflared/retry" ) type dynamicMockFetcher struct { diff --git a/token/path.go b/token/path.go index 565b809e..332117c3 100644 --- a/token/path.go +++ b/token/path.go @@ -9,7 +9,7 @@ import ( homedir "github.com/mitchellh/go-homedir" - "github.com/kjake/cloudflared/config" + "github.com/cloudflare/cloudflared/config" ) // GenerateSSHCertFilePathFromURL will return a file path for creating short lived certificates diff --git a/token/token.go b/token/token.go index b4b8120b..d561dc38 100644 --- a/token/token.go +++ b/token/token.go @@ -16,8 +16,8 @@ import ( "github.com/pkg/errors" "github.com/rs/zerolog" - "github.com/kjake/cloudflared/config" - "github.com/kjake/cloudflared/retry" + "github.com/cloudflare/cloudflared/config" + "github.com/cloudflare/cloudflared/retry" ) const ( diff --git a/tunnelrpc/pogs/cloudflared_server.go b/tunnelrpc/pogs/cloudflared_server.go index b7a85bf2..cfc66f03 100644 --- a/tunnelrpc/pogs/cloudflared_server.go +++ b/tunnelrpc/pogs/cloudflared_server.go @@ -4,7 +4,7 @@ import ( capnp "zombiezen.com/go/capnproto2" "zombiezen.com/go/capnproto2/rpc" - "github.com/kjake/cloudflared/tunnelrpc/proto" + "github.com/cloudflare/cloudflared/tunnelrpc/proto" ) type CloudflaredServer interface { diff --git a/tunnelrpc/pogs/configuration_manager.go b/tunnelrpc/pogs/configuration_manager.go index 04bb5d31..4daae802 100644 --- a/tunnelrpc/pogs/configuration_manager.go +++ b/tunnelrpc/pogs/configuration_manager.go @@ -8,8 +8,8 @@ import ( "zombiezen.com/go/capnproto2/rpc" "zombiezen.com/go/capnproto2/server" - "github.com/kjake/cloudflared/tunnelrpc/metrics" - "github.com/kjake/cloudflared/tunnelrpc/proto" + "github.com/cloudflare/cloudflared/tunnelrpc/metrics" + "github.com/cloudflare/cloudflared/tunnelrpc/proto" ) type ConfigurationManager interface { diff --git a/tunnelrpc/pogs/quic_metadata_protocol.go b/tunnelrpc/pogs/quic_metadata_protocol.go index 15a9f26c..cfbfe845 100644 --- a/tunnelrpc/pogs/quic_metadata_protocol.go +++ b/tunnelrpc/pogs/quic_metadata_protocol.go @@ -6,7 +6,7 @@ import ( capnp "zombiezen.com/go/capnproto2" "zombiezen.com/go/capnproto2/pogs" - "github.com/kjake/cloudflared/tunnelrpc/proto" + "github.com/cloudflare/cloudflared/tunnelrpc/proto" ) // ConnectionType indicates the type of underlying connection proxied within the QUIC stream. diff --git a/tunnelrpc/pogs/registration_server.go b/tunnelrpc/pogs/registration_server.go index 0f4f7a38..9908c113 100644 --- a/tunnelrpc/pogs/registration_server.go +++ b/tunnelrpc/pogs/registration_server.go @@ -12,8 +12,8 @@ import ( "zombiezen.com/go/capnproto2/rpc" "zombiezen.com/go/capnproto2/server" - "github.com/kjake/cloudflared/tunnelrpc/metrics" - "github.com/kjake/cloudflared/tunnelrpc/proto" + "github.com/cloudflare/cloudflared/tunnelrpc/metrics" + "github.com/cloudflare/cloudflared/tunnelrpc/proto" ) type RegistrationServer interface { diff --git a/tunnelrpc/pogs/registration_server_test.go b/tunnelrpc/pogs/registration_server_test.go index b8d6c208..70dfba48 100644 --- a/tunnelrpc/pogs/registration_server_test.go +++ b/tunnelrpc/pogs/registration_server_test.go @@ -13,7 +13,7 @@ import ( capnp "zombiezen.com/go/capnproto2" "zombiezen.com/go/capnproto2/rpc" - "github.com/kjake/cloudflared/tunnelrpc/proto" + "github.com/cloudflare/cloudflared/tunnelrpc/proto" ) const testAccountTag = "abc123" diff --git a/tunnelrpc/pogs/session_manager.go b/tunnelrpc/pogs/session_manager.go index e3a5f30d..b5552983 100644 --- a/tunnelrpc/pogs/session_manager.go +++ b/tunnelrpc/pogs/session_manager.go @@ -11,8 +11,8 @@ import ( "zombiezen.com/go/capnproto2/rpc" "zombiezen.com/go/capnproto2/server" - "github.com/kjake/cloudflared/tunnelrpc/metrics" - "github.com/kjake/cloudflared/tunnelrpc/proto" + "github.com/cloudflare/cloudflared/tunnelrpc/metrics" + "github.com/cloudflare/cloudflared/tunnelrpc/proto" ) type SessionManager interface { diff --git a/tunnelrpc/proto/quic_metadata_protocol.capnp b/tunnelrpc/proto/quic_metadata_protocol.capnp index f195891c..290a034a 100644 --- a/tunnelrpc/proto/quic_metadata_protocol.capnp +++ b/tunnelrpc/proto/quic_metadata_protocol.capnp @@ -2,7 +2,7 @@ using Go = import "go.capnp"; @0xb29021ef7421cc32; $Go.package("proto"); -$Go.import("github.com/kjake/cloudflared/tunnelrpc"); +$Go.import("github.com/cloudflare/cloudflared/tunnelrpc"); struct ConnectRequest @0xc47116a1045e4061 { diff --git a/tunnelrpc/proto/tunnelrpc.capnp b/tunnelrpc/proto/tunnelrpc.capnp index d3f71cce..08c3b9e0 100644 --- a/tunnelrpc/proto/tunnelrpc.capnp +++ b/tunnelrpc/proto/tunnelrpc.capnp @@ -1,7 +1,7 @@ using Go = import "go.capnp"; @0xdb8274f9144abc7e; $Go.package("proto"); -$Go.import("github.com/kjake/cloudflared/tunnelrpc"); +$Go.import("github.com/cloudflare/cloudflared/tunnelrpc"); # === DEPRECATED Legacy Tunnel Authentication and Registration methods/servers === # diff --git a/tunnelrpc/quic/cloudflared_client.go b/tunnelrpc/quic/cloudflared_client.go index 5aca8511..85a96b5f 100644 --- a/tunnelrpc/quic/cloudflared_client.go +++ b/tunnelrpc/quic/cloudflared_client.go @@ -11,9 +11,9 @@ import ( "github.com/google/uuid" - "github.com/kjake/cloudflared/tunnelrpc" - "github.com/kjake/cloudflared/tunnelrpc/metrics" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc" + "github.com/cloudflare/cloudflared/tunnelrpc/metrics" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // CloudflaredClient calls capnp rpc methods of SessionManager and ConfigurationManager. diff --git a/tunnelrpc/quic/cloudflared_server.go b/tunnelrpc/quic/cloudflared_server.go index 70019d32..2bba6f1c 100644 --- a/tunnelrpc/quic/cloudflared_server.go +++ b/tunnelrpc/quic/cloudflared_server.go @@ -6,8 +6,8 @@ import ( "io" "time" - "github.com/kjake/cloudflared/tunnelrpc" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // HandleRequestFunc wraps the proxied request from the upstream and also provides methods on the stream to diff --git a/tunnelrpc/quic/request_client_stream.go b/tunnelrpc/quic/request_client_stream.go index ebbddfdd..54d1482e 100644 --- a/tunnelrpc/quic/request_client_stream.go +++ b/tunnelrpc/quic/request_client_stream.go @@ -6,7 +6,7 @@ import ( capnp "zombiezen.com/go/capnproto2" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // RequestClientStream is a stream to provide requests to the server. This operation is typically driven by the edge service. diff --git a/tunnelrpc/quic/request_server_stream.go b/tunnelrpc/quic/request_server_stream.go index 90002fe8..c0aee434 100644 --- a/tunnelrpc/quic/request_server_stream.go +++ b/tunnelrpc/quic/request_server_stream.go @@ -5,7 +5,7 @@ import ( capnp "zombiezen.com/go/capnproto2" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // RequestServerStream is a stream to serve requests diff --git a/tunnelrpc/quic/request_server_stream_test.go b/tunnelrpc/quic/request_server_stream_test.go index c7340b6b..0be17049 100644 --- a/tunnelrpc/quic/request_server_stream_test.go +++ b/tunnelrpc/quic/request_server_stream_test.go @@ -14,7 +14,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) const ( diff --git a/tunnelrpc/quic/session_client.go b/tunnelrpc/quic/session_client.go index ef91e3df..75e36906 100644 --- a/tunnelrpc/quic/session_client.go +++ b/tunnelrpc/quic/session_client.go @@ -10,9 +10,9 @@ import ( "github.com/google/uuid" "zombiezen.com/go/capnproto2/rpc" - "github.com/kjake/cloudflared/tunnelrpc" - "github.com/kjake/cloudflared/tunnelrpc/metrics" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc" + "github.com/cloudflare/cloudflared/tunnelrpc/metrics" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // SessionClient calls capnp rpc methods of SessionManager. diff --git a/tunnelrpc/quic/session_server.go b/tunnelrpc/quic/session_server.go index cfe72fe7..82daa306 100644 --- a/tunnelrpc/quic/session_server.go +++ b/tunnelrpc/quic/session_server.go @@ -6,8 +6,8 @@ import ( "io" "time" - "github.com/kjake/cloudflared/tunnelrpc" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // SessionManagerServer handles streams with the SessionManager RPCs. diff --git a/tunnelrpc/registration_client.go b/tunnelrpc/registration_client.go index 1a9c5d3c..7d945f58 100644 --- a/tunnelrpc/registration_client.go +++ b/tunnelrpc/registration_client.go @@ -9,8 +9,8 @@ import ( "github.com/google/uuid" "zombiezen.com/go/capnproto2/rpc" - "github.com/kjake/cloudflared/tunnelrpc/metrics" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc/metrics" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) type RegistrationClient interface { diff --git a/tunnelrpc/registration_server.go b/tunnelrpc/registration_server.go index 297ace3e..a40e3fb3 100644 --- a/tunnelrpc/registration_server.go +++ b/tunnelrpc/registration_server.go @@ -4,7 +4,7 @@ import ( "context" "io" - "github.com/kjake/cloudflared/tunnelrpc/pogs" + "github.com/cloudflare/cloudflared/tunnelrpc/pogs" ) // RegistrationServer provides a handler interface for a client to provide methods to handle the different types of diff --git a/tunnelstate/conntracker.go b/tunnelstate/conntracker.go index e8bdc363..d0119f10 100644 --- a/tunnelstate/conntracker.go +++ b/tunnelstate/conntracker.go @@ -6,7 +6,7 @@ import ( "github.com/rs/zerolog" - "github.com/kjake/cloudflared/connection" + "github.com/cloudflare/cloudflared/connection" ) type ConnTracker struct { diff --git a/vendor/modules.txt b/vendor/modules.txt index 8f1a21f0..4be6907b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -56,7 +56,7 @@ github.com/cpuguy83/go-md2man/v2/md2man # github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc ## explicit github.com/davecgh/go-spew/spew -# github.com/facebookgo/ensure v0.0.0-20160127193407-b4ab57deab51 +# github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c ## explicit # github.com/facebookgo/freeport v0.0.0-20150612182905-d4adf43b75b9 ## explicit @@ -65,7 +65,7 @@ github.com/davecgh/go-spew/spew github.com/facebookgo/grace/gracenet # github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 ## explicit -# github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 +# github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 ## explicit # github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 ## explicit @@ -148,8 +148,6 @@ github.com/json-iterator/go # github.com/klauspost/compress v1.15.11 ## explicit; go 1.17 github.com/klauspost/compress/flate -# github.com/kr/text v0.2.0 -## explicit # github.com/kylelemons/godebug v1.1.0 ## explicit; go 1.11 # github.com/mattn/go-colorable v0.1.13