diff --git a/pkg/zero/api.go b/internal/zero/api/api.go similarity index 95% rename from pkg/zero/api.go rename to internal/zero/api/api.go index 70141bff1..488c2c31f 100644 --- a/pkg/zero/api.go +++ b/internal/zero/api/api.go @@ -5,12 +5,12 @@ import ( "context" "fmt" + "github.com/pomerium/pomerium/internal/zero/apierror" + connect_mux "github.com/pomerium/pomerium/internal/zero/connect-mux" + token_api "github.com/pomerium/pomerium/internal/zero/token" "github.com/pomerium/pomerium/pkg/fanout" - "github.com/pomerium/pomerium/pkg/zero/apierror" cluster_api "github.com/pomerium/pomerium/pkg/zero/cluster" connect_api "github.com/pomerium/pomerium/pkg/zero/connect" - connect_mux "github.com/pomerium/pomerium/pkg/zero/connect-mux" - token_api "github.com/pomerium/pomerium/pkg/zero/token" ) // API is a Pomerium Zero Cluster API client diff --git a/pkg/zero/config.go b/internal/zero/api/config.go similarity index 100% rename from pkg/zero/config.go rename to internal/zero/api/config.go diff --git a/pkg/zero/download.go b/internal/zero/api/download.go similarity index 99% rename from pkg/zero/download.go rename to internal/zero/api/download.go index be96e0875..596f7a10e 100644 --- a/pkg/zero/download.go +++ b/internal/zero/api/download.go @@ -15,7 +15,7 @@ import ( "github.com/rs/zerolog/log" - "github.com/pomerium/pomerium/pkg/zero/apierror" + "github.com/pomerium/pomerium/internal/zero/apierror" cluster_api "github.com/pomerium/pomerium/pkg/zero/cluster" ) diff --git a/pkg/zero/apierror/request_id.go b/internal/zero/apierror/request_id.go similarity index 100% rename from pkg/zero/apierror/request_id.go rename to internal/zero/apierror/request_id.go diff --git a/pkg/zero/apierror/response.go b/internal/zero/apierror/response.go similarity index 100% rename from pkg/zero/apierror/response.go rename to internal/zero/apierror/response.go diff --git a/pkg/zero/apierror/response_test.go b/internal/zero/apierror/response_test.go similarity index 93% rename from pkg/zero/apierror/response_test.go rename to internal/zero/apierror/response_test.go index ce90a1cfa..ddfee484f 100644 --- a/pkg/zero/apierror/response_test.go +++ b/internal/zero/apierror/response_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/pomerium/pomerium/pkg/zero/apierror" + "github.com/pomerium/pomerium/internal/zero/apierror" "github.com/pomerium/pomerium/pkg/zero/cluster" ) diff --git a/pkg/zero/apierror/terminal.go b/internal/zero/apierror/terminal.go similarity index 100% rename from pkg/zero/apierror/terminal.go rename to internal/zero/apierror/terminal.go diff --git a/internal/zero/bootstrap/bootstrap.go b/internal/zero/bootstrap/bootstrap.go index 08af3157b..a86e43d68 100644 --- a/internal/zero/bootstrap/bootstrap.go +++ b/internal/zero/bootstrap/bootstrap.go @@ -20,8 +20,8 @@ import ( "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/retry" - sdk "github.com/pomerium/pomerium/pkg/zero" - connect_mux "github.com/pomerium/pomerium/pkg/zero/connect-mux" + sdk "github.com/pomerium/pomerium/internal/zero/api" + connect_mux "github.com/pomerium/pomerium/internal/zero/connect-mux" ) const ( diff --git a/internal/zero/bootstrap/new.go b/internal/zero/bootstrap/new.go index d848d3947..3dfec5db0 100644 --- a/internal/zero/bootstrap/new.go +++ b/internal/zero/bootstrap/new.go @@ -14,9 +14,9 @@ import ( "github.com/pomerium/pomerium/config" "github.com/pomerium/pomerium/internal/atomicutil" "github.com/pomerium/pomerium/internal/deterministicecdsa" + sdk "github.com/pomerium/pomerium/internal/zero/api" "github.com/pomerium/pomerium/pkg/cryptutil" "github.com/pomerium/pomerium/pkg/netutil" - sdk "github.com/pomerium/pomerium/pkg/zero" ) // Source is a base config layer for Pomerium diff --git a/pkg/zero/connect-mux/config.go b/internal/zero/connect-mux/config.go similarity index 100% rename from pkg/zero/connect-mux/config.go rename to internal/zero/connect-mux/config.go diff --git a/pkg/zero/connect-mux/messages.go b/internal/zero/connect-mux/messages.go similarity index 97% rename from pkg/zero/connect-mux/messages.go rename to internal/zero/connect-mux/messages.go index 83aaa5b49..4e6ce8be7 100644 --- a/pkg/zero/connect-mux/messages.go +++ b/internal/zero/connect-mux/messages.go @@ -4,7 +4,7 @@ import ( "context" "fmt" - "github.com/pomerium/pomerium/pkg/zero/apierror" + "github.com/pomerium/pomerium/internal/zero/apierror" "github.com/pomerium/pomerium/pkg/zero/connect" ) diff --git a/pkg/zero/connect-mux/service.go b/internal/zero/connect-mux/service.go similarity index 97% rename from pkg/zero/connect-mux/service.go rename to internal/zero/connect-mux/service.go index cda6ba3c9..25db0bd4b 100644 --- a/pkg/zero/connect-mux/service.go +++ b/internal/zero/connect-mux/service.go @@ -11,8 +11,8 @@ import ( "github.com/hashicorp/go-multierror" "github.com/rs/zerolog/log" + "github.com/pomerium/pomerium/internal/zero/apierror" "github.com/pomerium/pomerium/pkg/fanout" - "github.com/pomerium/pomerium/pkg/zero/apierror" "github.com/pomerium/pomerium/pkg/zero/connect" ) diff --git a/internal/zero/controller/controller.go b/internal/zero/controller/controller.go index c702b57da..9581f1ee6 100644 --- a/internal/zero/controller/controller.go +++ b/internal/zero/controller/controller.go @@ -12,11 +12,11 @@ import ( "github.com/pomerium/pomerium/internal/log" "github.com/pomerium/pomerium/internal/zero/analytics" + sdk "github.com/pomerium/pomerium/internal/zero/api" "github.com/pomerium/pomerium/internal/zero/bootstrap" "github.com/pomerium/pomerium/internal/zero/reconciler" "github.com/pomerium/pomerium/pkg/cmd/pomerium" "github.com/pomerium/pomerium/pkg/grpc/databroker" - sdk "github.com/pomerium/pomerium/pkg/zero" ) // Run runs Pomerium is managed mode using the provided token. diff --git a/internal/zero/controller/mux_log.go b/internal/zero/controller/mux_log.go index 9e29d9ec2..87c3d6960 100644 --- a/internal/zero/controller/mux_log.go +++ b/internal/zero/controller/mux_log.go @@ -6,7 +6,7 @@ import ( "github.com/rs/zerolog" "github.com/pomerium/pomerium/internal/log" - connect_mux "github.com/pomerium/pomerium/pkg/zero/connect-mux" + connect_mux "github.com/pomerium/pomerium/internal/zero/connect-mux" ) func (c *controller) RunConnectLog(ctx context.Context) error { diff --git a/internal/zero/reconciler/config.go b/internal/zero/reconciler/config.go index 6e66c0a9d..acd03cf6a 100644 --- a/internal/zero/reconciler/config.go +++ b/internal/zero/reconciler/config.go @@ -6,8 +6,8 @@ import ( "os" "time" + sdk "github.com/pomerium/pomerium/internal/zero/api" "github.com/pomerium/pomerium/pkg/grpc/databroker" - sdk "github.com/pomerium/pomerium/pkg/zero" ) // reconcilerConfig contains the configuration for the resource bundles reconciler. diff --git a/internal/zero/reconciler/download_cache.go b/internal/zero/reconciler/download_cache.go index c7df9adde..94563792f 100644 --- a/internal/zero/reconciler/download_cache.go +++ b/internal/zero/reconciler/download_cache.go @@ -13,9 +13,9 @@ import ( "google.golang.org/protobuf/types/known/structpb" "github.com/pomerium/pomerium/internal/log" + zero_sdk "github.com/pomerium/pomerium/internal/zero/api" "github.com/pomerium/pomerium/pkg/grpc/databroker" "github.com/pomerium/pomerium/pkg/protoutil" - zero_sdk "github.com/pomerium/pomerium/pkg/zero" ) // BundleCacheEntry is a cache entry for a bundle diff --git a/internal/zero/reconciler/download_cache_test.go b/internal/zero/reconciler/download_cache_test.go index 88d351210..dc9a9c5c5 100644 --- a/internal/zero/reconciler/download_cache_test.go +++ b/internal/zero/reconciler/download_cache_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + zero_sdk "github.com/pomerium/pomerium/internal/zero/api" "github.com/pomerium/pomerium/internal/zero/reconciler" - zero_sdk "github.com/pomerium/pomerium/pkg/zero" ) func TestCacheEntryProto(t *testing.T) { diff --git a/internal/zero/reconciler/service.go b/internal/zero/reconciler/service.go index c6e7e6055..0e987b002 100644 --- a/internal/zero/reconciler/service.go +++ b/internal/zero/reconciler/service.go @@ -14,8 +14,8 @@ import ( "golang.org/x/time/rate" "github.com/pomerium/pomerium/internal/atomicutil" + connect_mux "github.com/pomerium/pomerium/internal/zero/connect-mux" "github.com/pomerium/pomerium/pkg/grpc/databroker" - connect_mux "github.com/pomerium/pomerium/pkg/zero/connect-mux" ) type service struct { diff --git a/pkg/zero/token/cache.go b/internal/zero/token/cache.go similarity index 100% rename from pkg/zero/token/cache.go rename to internal/zero/token/cache.go diff --git a/pkg/zero/token/cache_test.go b/internal/zero/token/cache_test.go similarity index 96% rename from pkg/zero/token/cache_test.go rename to internal/zero/token/cache_test.go index 39456bdc1..05d532e73 100644 --- a/pkg/zero/token/cache_test.go +++ b/internal/zero/token/cache_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/pomerium/pomerium/pkg/zero/token" + "github.com/pomerium/pomerium/internal/zero/token" ) func TestCache(t *testing.T) { diff --git a/pkg/zero/cluster/client_errors.go b/pkg/zero/cluster/client_errors.go index 74761c499..fdd2432c1 100644 --- a/pkg/zero/cluster/client_errors.go +++ b/pkg/zero/cluster/client_errors.go @@ -3,7 +3,7 @@ package cluster import ( "net/http" - "github.com/pomerium/pomerium/pkg/zero/apierror" + "github.com/pomerium/pomerium/internal/zero/apierror" ) // EmptyResponse is an empty response diff --git a/pkg/zero/cluster/client_test.go b/pkg/zero/cluster/client_test.go index 6c317a874..0de8f2cdb 100644 --- a/pkg/zero/cluster/client_test.go +++ b/pkg/zero/cluster/client_test.go @@ -9,8 +9,8 @@ import ( "github.com/stretchr/testify/require" + "github.com/pomerium/pomerium/internal/zero/token" api "github.com/pomerium/pomerium/pkg/zero/cluster" - "github.com/pomerium/pomerium/pkg/zero/token" ) func TestAPIClient(t *testing.T) { diff --git a/pkg/zero/cluster/token_fetcher.go b/pkg/zero/cluster/token_fetcher.go index 32f92350a..76f6d87d3 100644 --- a/pkg/zero/cluster/token_fetcher.go +++ b/pkg/zero/cluster/token_fetcher.go @@ -6,8 +6,8 @@ import ( "strconv" "time" - "github.com/pomerium/pomerium/pkg/zero/apierror" - "github.com/pomerium/pomerium/pkg/zero/token" + "github.com/pomerium/pomerium/internal/zero/apierror" + "github.com/pomerium/pomerium/internal/zero/token" ) // NewTokenFetcher creates a new authorization token fetcher diff --git a/pkg/zero/connect/client_test.go b/pkg/zero/connect/client_test.go index 5fd64f5db..9af739751 100644 --- a/pkg/zero/connect/client_test.go +++ b/pkg/zero/connect/client_test.go @@ -9,9 +9,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/pomerium/pomerium/internal/zero/token" cluster_api "github.com/pomerium/pomerium/pkg/zero/cluster" "github.com/pomerium/pomerium/pkg/zero/connect" - "github.com/pomerium/pomerium/pkg/zero/token" ) func TestConfig(t *testing.T) {