zero: only leave public packages in pkg/zero (#4854)

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

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"
 )
 

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"
 )
 

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"
+	sdk "github.com/pomerium/pomerium/internal/zero/api"
-	connect_mux "github.com/pomerium/pomerium/pkg/zero/connect-mux"
+	connect_mux "github.com/pomerium/pomerium/internal/zero/connect-mux"
 )
 
 const (

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

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"
 )
 

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"
 )
 

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.

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 {

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.

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

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) {

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 {

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) {

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

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) {

pkg/zero/cluster/token_fetcher.go

@@ -6,8 +6,8 @@ import (
 	"strconv"
 	"time"
 
-	"github.com/pomerium/pomerium/pkg/zero/apierror"
+	"github.com/pomerium/pomerium/internal/zero/apierror"
-	"github.com/pomerium/pomerium/pkg/zero/token"
+	"github.com/pomerium/pomerium/internal/zero/token"
 )
 
 // NewTokenFetcher creates a new authorization token fetcher

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) {