[library usage] Move modules under pkg to pkg/internal (#376)

* refactor: move packages into `pkg/internal` * feat: hide sub commands from package exports * fix: revert go version change
Azure · Dec 20, 2023 · c6802f6 · c6802f6
1 parent 3e83c88
commit c6802f6
Show file tree

Hide file tree

Showing 58 changed files with 35 additions and 35 deletions.
diff --git a/pkg/cmd/convert.go b/pkg/cmd/convert.go
@@ -1,13 +1,13 @@
 package cmd
 
 import (
-	"github.com/Azure/kubelogin/pkg/converter"
+	"github.com/Azure/kubelogin/pkg/internal/converter"
 	"github.com/spf13/cobra"
 	"k8s.io/client-go/tools/clientcmd"
 )
 
-// NewConvertCmd provides a cobra command for convert sub command
-func NewConvertCmd() *cobra.Command {
+// newConvertCmd provides a cobra command for convert sub command
+func newConvertCmd() *cobra.Command {
 	o := converter.New()
 
 	cmd := &cobra.Command{

diff --git a/pkg/cmd/removetokencache.go b/pkg/cmd/removetokencache.go
@@ -3,13 +3,13 @@ package cmd
 import (
 	"os"
 
-	"github.com/Azure/kubelogin/pkg/token"
+	"github.com/Azure/kubelogin/pkg/internal/token"
 	"github.com/spf13/cobra"
 	klog "k8s.io/klog/v2"
 )
 
-// NewRemoveTokenCacheCmd provides a cobra command for removing token cache sub command
-func NewRemoveTokenCacheCmd() *cobra.Command {
+// newRemoveTokenCacheCmd provides a cobra command for removing token cache sub command
+func newRemoveTokenCacheCmd() *cobra.Command {
 	var tokenCacheDir string
 
 	cmd := &cobra.Command{

diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
@@ -17,9 +17,9 @@ func NewRootCmd(version string) *cobra.Command {
 		},
 	}
 
-	cmd.AddCommand(NewConvertCmd())
-	cmd.AddCommand(NewTokenCmd())
-	cmd.AddCommand(NewRemoveTokenCacheCmd())
+	cmd.AddCommand(newConvertCmd())
+	cmd.AddCommand(newTokenCmd())
+	cmd.AddCommand(newRemoveTokenCacheCmd())
 
 	return cmd
 }
diff --git a/pkg/cmd/token.go b/pkg/cmd/token.go
@@ -1,12 +1,12 @@
 package cmd
 
 import (
-	"github.com/Azure/kubelogin/pkg/token"
+	"github.com/Azure/kubelogin/pkg/internal/token"
 	"github.com/spf13/cobra"
 )
 
-// NewTokenCmd provides a cobra command for convert sub command
-func NewTokenCmd() *cobra.Command {
+// newTokenCmd provides a cobra command for convert sub command
+func newTokenCmd() *cobra.Command {
 	o := token.NewOptions()
 
 	cmd := &cobra.Command{

diff --git a/pkg/converter/convert.go → pkg/internal/converter/convert.go b/pkg/converter/convert.go → pkg/internal/converter/convert.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/Azure/kubelogin/pkg/token"
+	"github.com/Azure/kubelogin/pkg/internal/token"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
 	klog "k8s.io/klog/v2"

diff --git a/pkg/converter/convert_test.go → pkg/internal/converter/convert_test.go b/pkg/converter/convert_test.go → pkg/internal/converter/convert_test.go
@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"testing"
 
-	"github.com/Azure/kubelogin/pkg/token"
+	"github.com/Azure/kubelogin/pkg/internal/token"
 	"github.com/spf13/pflag"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/tools/clientcmd"

diff --git a/pkg/converter/options.go → pkg/internal/converter/options.go b/pkg/converter/options.go → pkg/internal/converter/options.go
@@ -3,7 +3,7 @@ package converter
 import (
 	"fmt"
 
-	"github.com/Azure/kubelogin/pkg/token"
+	"github.com/Azure/kubelogin/pkg/internal/token"
 	"github.com/spf13/pflag"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 )

diff --git a/pkg/converter/options_test.go → pkg/internal/converter/options_test.go b/pkg/converter/options_test.go → pkg/internal/converter/options_test.go
diff --git a/pkg/pop/authnscheme.go → pkg/internal/pop/authnscheme.go b/pkg/pop/authnscheme.go → pkg/internal/pop/authnscheme.go
diff --git a/pkg/pop/authnscheme_test.go → pkg/internal/pop/authnscheme_test.go b/pkg/pop/authnscheme_test.go → pkg/internal/pop/authnscheme_test.go
diff --git a/pkg/pop/msal.go → pkg/internal/pop/msal.go b/pkg/pop/msal.go → pkg/internal/pop/msal.go
diff --git a/pkg/pop/msal_test.go → pkg/internal/pop/msal_test.go b/pkg/pop/msal_test.go → pkg/internal/pop/msal_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 	"github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
 	"github.com/golang-jwt/jwt/v4"
 	"github.com/google/uuid"

diff --git a/pkg/pop/poptoken.go → pkg/internal/pop/poptoken.go b/pkg/pop/poptoken.go → pkg/internal/pop/poptoken.go
diff --git a/pkg/pop/poptoken_test.go → pkg/internal/pop/poptoken_test.go b/pkg/pop/poptoken_test.go → pkg/internal/pop/poptoken_test.go
diff --git a/...PoPTokenConfidentialFromBadSecretVCR.yaml → ...PoPTokenConfidentialFromBadSecretVCR.yaml b/...PoPTokenConfidentialFromBadSecretVCR.yaml → ...PoPTokenConfidentialFromBadSecretVCR.yaml
diff --git a/...irePoPTokenConfidentialWithSecretVCR.yaml → ...irePoPTokenConfidentialWithSecretVCR.yaml b/...irePoPTokenConfidentialWithSecretVCR.yaml → ...irePoPTokenConfidentialWithSecretVCR.yaml
diff --git a/pkg/testutils/govcrutils.go → pkg/internal/testutils/govcrutils.go b/pkg/testutils/govcrutils.go → pkg/internal/testutils/govcrutils.go
diff --git a/pkg/testutils/testutils.go → pkg/internal/testutils/testutils.go b/pkg/testutils/testutils.go → pkg/internal/testutils/testutils.go
diff --git a/pkg/testutils/testutils_test.go → pkg/internal/testutils/testutils_test.go b/pkg/testutils/testutils_test.go → pkg/internal/testutils/testutils_test.go
diff --git a/pkg/token/README.MD → pkg/internal/token/README.MD b/pkg/token/README.MD → pkg/internal/token/README.MD
diff --git a/pkg/token/azurecli.go → pkg/internal/token/azurecli.go b/pkg/token/azurecli.go → pkg/internal/token/azurecli.go
diff --git a/pkg/token/azurecli_test.go → pkg/internal/token/azurecli_test.go b/pkg/token/azurecli_test.go → pkg/internal/token/azurecli_test.go
@@ -3,7 +3,7 @@ package token
 import (
 	"testing"
 
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 )
 
 func TestNewAzureCLITokenEmpty(t *testing.T) {

diff --git a/pkg/token/devicecode.go → pkg/internal/token/devicecode.go b/pkg/token/devicecode.go → pkg/internal/token/devicecode.go
diff --git a/pkg/token/devicecode_test.go → pkg/internal/token/devicecode_test.go b/pkg/token/devicecode_test.go → pkg/internal/token/devicecode_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 )
 
 func TestNewDeviceCodeTokenProviderEmpty(t *testing.T) {

diff --git a/pkg/token/execCredentialPlugin.go → pkg/internal/token/execCredentialPlugin.go b/pkg/token/execCredentialPlugin.go → pkg/internal/token/execCredentialPlugin.go
@@ -1,6 +1,6 @@
 package token
 
-//go:generate sh -c "mockgen -destination mock_$GOPACKAGE/execCredentialPlugin.go github.com/Azure/kubelogin/pkg/token ExecCredentialPlugin"
+//go:generate sh -c "mockgen -destination mock_$GOPACKAGE/execCredentialPlugin.go github.com/Azure/kubelogin/pkg/internal/token ExecCredentialPlugin"
 
 import (
 	"fmt"

diff --git a/pkg/token/execCredentialPlugin_test.go → ...ternal/token/execCredentialPlugin_test.go b/pkg/token/execCredentialPlugin_test.go → ...ternal/token/execCredentialPlugin_test.go
@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/kubelogin/pkg/token/mock_token"
+	"github.com/Azure/kubelogin/pkg/internal/token/mock_token"
 	"github.com/golang/mock/gomock"
 )
 

diff --git a/pkg/token/execCredentialWriter.go → pkg/internal/token/execCredentialWriter.go b/pkg/token/execCredentialWriter.go → pkg/internal/token/execCredentialWriter.go
@@ -1,6 +1,6 @@
 package token
 
-//go:generate sh -c "mockgen -destination mock_$GOPACKAGE/execCredentialWriter.go github.com/Azure/kubelogin/pkg/token ExecCredentialWriter"
+//go:generate sh -c "mockgen -destination mock_$GOPACKAGE/execCredentialWriter.go github.com/Azure/kubelogin/pkg/internal/token ExecCredentialWriter"
 
 import (
 	"encoding/json"

diff --git a/pkg/token/execCredentialWriter_test.go → ...ternal/token/execCredentialWriter_test.go b/pkg/token/execCredentialWriter_test.go → ...ternal/token/execCredentialWriter_test.go
diff --git a/pkg/token/federatedIdentity.go → pkg/internal/token/federatedIdentity.go b/pkg/token/federatedIdentity.go → pkg/internal/token/federatedIdentity.go
diff --git a/pkg/token/federatedIdentity_test.go → pkg/internal/token/federatedIdentity_test.go b/pkg/token/federatedIdentity_test.go → pkg/internal/token/federatedIdentity_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 )
 
 func TestNewWorkloadIdentityTokenProviderEmpty(t *testing.T) {

diff --git a/pkg/token/interactive.go → pkg/internal/token/interactive.go b/pkg/token/interactive.go → pkg/internal/token/interactive.go
@@ -12,7 +12,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/kubelogin/pkg/pop"
+	"github.com/Azure/kubelogin/pkg/internal/pop"
 )
 
 type InteractiveToken struct {

diff --git a/pkg/token/interactive_test.go → pkg/internal/token/interactive_test.go b/pkg/token/interactive_test.go → pkg/internal/token/interactive_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/pkg/token/manualtoken.go → pkg/internal/token/manualtoken.go b/pkg/token/manualtoken.go → pkg/internal/token/manualtoken.go
diff --git a/pkg/token/manualtoken_test.go → pkg/internal/token/manualtoken_test.go b/pkg/token/manualtoken_test.go → pkg/internal/token/manualtoken_test.go
diff --git a/pkg/token/mock_token/execCredentialWriter.go → .../token/mock_token/execCredentialWriter.go b/pkg/token/mock_token/execCredentialWriter.go → .../token/mock_token/execCredentialWriter.go
diff --git a/pkg/token/mock_token/provider.go → pkg/internal/token/mock_token/provider.go b/pkg/token/mock_token/provider.go → pkg/internal/token/mock_token/provider.go
diff --git a/pkg/token/mock_token/tokenCache.go → pkg/internal/token/mock_token/tokenCache.go b/pkg/token/mock_token/tokenCache.go → pkg/internal/token/mock_token/tokenCache.go
diff --git a/pkg/token/msi.go → pkg/internal/token/msi.go b/pkg/token/msi.go → pkg/internal/token/msi.go
diff --git a/pkg/token/options.go → pkg/internal/token/options.go b/pkg/token/options.go → pkg/internal/token/options.go
diff --git a/pkg/token/options_test.go → pkg/internal/token/options_test.go b/pkg/token/options_test.go → pkg/internal/token/options_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 	"github.com/google/go-cmp/cmp"
 	"github.com/spf13/pflag"
 )

diff --git a/pkg/token/provider.go → pkg/internal/token/provider.go b/pkg/token/provider.go → pkg/internal/token/provider.go
@@ -1,6 +1,6 @@
 package token
 
-//go:generate sh -c "mockgen -destination mock_$GOPACKAGE/provider.go github.com/Azure/kubelogin/pkg/token TokenProvider"
+//go:generate sh -c "mockgen -destination mock_$GOPACKAGE/provider.go github.com/Azure/kubelogin/pkg/internal/token TokenProvider"
 
 import (
 	"errors"

diff --git a/pkg/token/provider_test.go → pkg/internal/token/provider_test.go b/pkg/token/provider_test.go → pkg/internal/token/provider_test.go
@@ -3,7 +3,7 @@ package token
 import (
 	"testing"
 
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 	"github.com/google/go-cmp/cmp"
 )
 

diff --git a/pkg/token/ropc.go → pkg/internal/token/ropc.go b/pkg/token/ropc.go → pkg/internal/token/ropc.go
diff --git a/pkg/token/serviceprincipaltoken.go → pkg/internal/token/serviceprincipaltoken.go b/pkg/token/serviceprincipaltoken.go → pkg/internal/token/serviceprincipaltoken.go
diff --git a/pkg/token/serviceprincipaltoken_legacy.go → ...nal/token/serviceprincipaltoken_legacy.go b/pkg/token/serviceprincipaltoken_legacy.go → ...nal/token/serviceprincipaltoken_legacy.go
diff --git a/...oken/serviceprincipaltoken_legacy_test.go → ...oken/serviceprincipaltoken_legacy_test.go b/...oken/serviceprincipaltoken_legacy_test.go → ...oken/serviceprincipaltoken_legacy_test.go
diff --git a/pkg/token/serviceprincipaltoken_test.go → ...ernal/token/serviceprincipaltoken_test.go b/pkg/token/serviceprincipaltoken_test.go → ...ernal/token/serviceprincipaltoken_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/cloud"
 	"github.com/Azure/go-autorest/autorest/adal"
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/google/go-cmp/cmp"
 	"github.com/google/uuid"

diff --git a/...token/serviceprincipaltokencertificate.go → ...token/serviceprincipaltokencertificate.go b/...token/serviceprincipaltokencertificate.go → ...token/serviceprincipaltokencertificate.go
@@ -11,7 +11,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
-	"github.com/Azure/kubelogin/pkg/pop"
+	"github.com/Azure/kubelogin/pkg/internal/pop"
 	"github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
 	"golang.org/x/crypto/pkcs12"
 )

diff --git a/.../serviceprincipaltokencertificate_test.go → .../serviceprincipaltokencertificate_test.go b/.../serviceprincipaltokencertificate_test.go → .../serviceprincipaltokencertificate_test.go
@@ -3,7 +3,7 @@ package token
 import (
 	"testing"
 
-	"github.com/Azure/kubelogin/pkg/testutils"
+	"github.com/Azure/kubelogin/pkg/internal/testutils"
 )
 
 func TestMissingCertFile(t *testing.T) {

diff --git a/pkg/token/serviceprincipaltokensecret.go → ...rnal/token/serviceprincipaltokensecret.go b/pkg/token/serviceprincipaltokensecret.go → ...rnal/token/serviceprincipaltokensecret.go
@@ -7,7 +7,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore"
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
 	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
-	"github.com/Azure/kubelogin/pkg/pop"
+	"github.com/Azure/kubelogin/pkg/internal/pop"
 	"github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential"
 )
 

diff --git a/...icePrincipalPoPTokenFromBadSecretVCR.yaml → ...icePrincipalPoPTokenFromBadSecretVCR.yaml b/...icePrincipalPoPTokenFromBadSecretVCR.yaml → ...icePrincipalPoPTokenFromBadSecretVCR.yaml
diff --git a/.../ServicePrincipalPoPTokenFromCertVCR.yaml → .../ServicePrincipalPoPTokenFromCertVCR.yaml b/.../ServicePrincipalPoPTokenFromCertVCR.yaml → .../ServicePrincipalPoPTokenFromCertVCR.yaml
diff --git a/...ervicePrincipalPoPTokenFromSecretVCR.yaml → ...ervicePrincipalPoPTokenFromSecretVCR.yaml b/...ervicePrincipalPoPTokenFromSecretVCR.yaml → ...ervicePrincipalPoPTokenFromSecretVCR.yaml
diff --git a/...ervicePrincipalTokenFromBadSecretVCR.yaml → ...ervicePrincipalTokenFromBadSecretVCR.yaml b/...ervicePrincipalTokenFromBadSecretVCR.yaml → ...ervicePrincipalTokenFromBadSecretVCR.yaml
diff --git a/...ata/ServicePrincipalTokenFromCertVCR.yaml → ...ata/ServicePrincipalTokenFromCertVCR.yaml b/...ata/ServicePrincipalTokenFromCertVCR.yaml → ...ata/ServicePrincipalTokenFromCertVCR.yaml
diff --git a/...a/ServicePrincipalTokenFromSecretVCR.yaml → ...a/ServicePrincipalTokenFromSecretVCR.yaml b/...a/ServicePrincipalTokenFromSecretVCR.yaml → ...a/ServicePrincipalTokenFromSecretVCR.yaml
diff --git a/pkg/token/testdata/testCert.pfx → pkg/internal/token/testdata/testCert.pfx b/pkg/token/testdata/testCert.pfx → pkg/internal/token/testdata/testCert.pfx
diff --git a/pkg/token/tokenCache.go → pkg/internal/token/tokenCache.go b/pkg/token/tokenCache.go → pkg/internal/token/tokenCache.go
@@ -1,6 +1,6 @@
 package token
 
-//go:generate sh -c "mockgen -destination mock_$GOPACKAGE/tokenCache.go github.com/Azure/kubelogin/pkg/token TokenCache"
+//go:generate sh -c "mockgen -destination mock_$GOPACKAGE/tokenCache.go github.com/Azure/kubelogin/pkg/internal/token TokenCache"
 
 import (
 	"os"