diff --git a/cmd/generate-plugin-overview/generate-plugin-overview.go b/cmd/generate-plugin-overview/generate-plugin-overview.go index 49b11500..db7e7f89 100644 --- a/cmd/generate-plugin-overview/generate-plugin-overview.go +++ b/cmd/generate-plugin-overview/generate-plugin-overview.go @@ -24,8 +24,8 @@ import ( "regexp" "strings" + "sigs.k8s.io/krew/internal/index/indexscanner" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/index/indexscanner" ) const ( diff --git a/cmd/generate-plugin-overview/go.sum b/cmd/generate-plugin-overview/go.sum index 3e954193..f3bb114d 100644 --- a/cmd/generate-plugin-overview/go.sum +++ b/cmd/generate-plugin-overview/go.sum @@ -122,6 +122,7 @@ sigs.k8s.io/krew v0.2.2-0.20190724210953-8867a94acd6d h1:ftkzey0SeGithDvmwEsUnlD sigs.k8s.io/krew v0.2.2-0.20190724210953-8867a94acd6d/go.mod h1:wsheYhp5znrUApov8QcNjBCwXu85fIGjRJvjSkE8pI8= sigs.k8s.io/krew v0.3.2 h1:FKBD9xy9GtO5A8FeVk/cbgG6vzPbUg4SwUziZj/TGoU= sigs.k8s.io/krew v0.3.2/go.mod h1:G0cvdJtBb0gHBQZtCBumtllvhU6H+ggDr2oLznaLglc= +sigs.k8s.io/krew v0.3.3 h1:cHv2oReJmFmR0CnT9Fs1c9JCAOC6OBpdq4xKEJis+2E= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/yaml v1.1.0 h1:4A07+ZFc2wgJwo8YNlQpr1rVlgUDlxXHhPJciaPY5gs= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= diff --git a/cmd/krew/cmd/info.go b/cmd/krew/cmd/info.go index fb1d7cbf..2ecb1f7a 100644 --- a/cmd/krew/cmd/info.go +++ b/cmd/krew/cmd/info.go @@ -25,9 +25,9 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" + "sigs.k8s.io/krew/internal/info" + "sigs.k8s.io/krew/internal/installation" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/info" - "sigs.k8s.io/krew/pkg/installation" ) // infoCmd represents the info command diff --git a/cmd/krew/cmd/install.go b/cmd/krew/cmd/install.go index a9065e84..8c7fb137 100644 --- a/cmd/krew/cmd/install.go +++ b/cmd/krew/cmd/install.go @@ -24,10 +24,10 @@ import ( "k8s.io/klog" "sigs.k8s.io/krew/cmd/krew/cmd/internal" + "sigs.k8s.io/krew/internal/index/indexscanner" + "sigs.k8s.io/krew/internal/index/validation" + "sigs.k8s.io/krew/internal/installation" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/index/indexscanner" - "sigs.k8s.io/krew/pkg/index/validation" - "sigs.k8s.io/krew/pkg/installation" ) func init() { diff --git a/cmd/krew/cmd/list.go b/cmd/krew/cmd/list.go index 7a970c6b..a7b400c6 100644 --- a/cmd/krew/cmd/list.go +++ b/cmd/krew/cmd/list.go @@ -25,7 +25,7 @@ import ( "github.com/pkg/errors" "github.com/spf13/cobra" - "sigs.k8s.io/krew/pkg/installation" + "sigs.k8s.io/krew/internal/installation" ) func init() { diff --git a/cmd/krew/cmd/root.go b/cmd/krew/cmd/root.go index 2164eac4..755a8bba 100644 --- a/cmd/krew/cmd/root.go +++ b/cmd/krew/cmd/root.go @@ -25,12 +25,12 @@ import ( "github.com/spf13/pflag" "k8s.io/klog" + "sigs.k8s.io/krew/internal/environment" + "sigs.k8s.io/krew/internal/gitutil" + "sigs.k8s.io/krew/internal/installation" + "sigs.k8s.io/krew/internal/installation/receipt" + "sigs.k8s.io/krew/internal/receiptsmigration" "sigs.k8s.io/krew/pkg/constants" - "sigs.k8s.io/krew/pkg/environment" - "sigs.k8s.io/krew/pkg/gitutil" - "sigs.k8s.io/krew/pkg/installation" - "sigs.k8s.io/krew/pkg/installation/receipt" - "sigs.k8s.io/krew/pkg/receiptsmigration" ) var ( diff --git a/cmd/krew/cmd/search.go b/cmd/krew/cmd/search.go index caae74c1..e25fb5b8 100644 --- a/cmd/krew/cmd/search.go +++ b/cmd/krew/cmd/search.go @@ -23,9 +23,9 @@ import ( "github.com/sahilm/fuzzy" "github.com/spf13/cobra" + "sigs.k8s.io/krew/internal/index/indexscanner" + "sigs.k8s.io/krew/internal/installation" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/index/indexscanner" - "sigs.k8s.io/krew/pkg/installation" ) // searchCmd represents the search command diff --git a/cmd/krew/cmd/system.go b/cmd/krew/cmd/system.go index b4ff5d95..a7b6cded 100644 --- a/cmd/krew/cmd/system.go +++ b/cmd/krew/cmd/system.go @@ -17,7 +17,7 @@ package cmd import ( "github.com/spf13/cobra" - "sigs.k8s.io/krew/pkg/receiptsmigration" + "sigs.k8s.io/krew/internal/receiptsmigration" ) // todo(corneliusweig) remove migration code with v0.4 diff --git a/cmd/krew/cmd/uninstall.go b/cmd/krew/cmd/uninstall.go index d2fb2096..7842fba5 100644 --- a/cmd/krew/cmd/uninstall.go +++ b/cmd/krew/cmd/uninstall.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "k8s.io/klog" - "sigs.k8s.io/krew/pkg/installation" + "sigs.k8s.io/krew/internal/installation" ) // uninstallCmd represents the uninstall command diff --git a/cmd/krew/cmd/update.go b/cmd/krew/cmd/update.go index 0965de5b..4d5fff2f 100644 --- a/cmd/krew/cmd/update.go +++ b/cmd/krew/cmd/update.go @@ -22,8 +22,8 @@ import ( "github.com/spf13/cobra" "k8s.io/klog" + "sigs.k8s.io/krew/internal/gitutil" "sigs.k8s.io/krew/pkg/constants" - "sigs.k8s.io/krew/pkg/gitutil" ) // updateCmd represents the update command diff --git a/cmd/krew/cmd/upgrade.go b/cmd/krew/cmd/upgrade.go index 231acc09..8c7bfc01 100644 --- a/cmd/krew/cmd/upgrade.go +++ b/cmd/krew/cmd/upgrade.go @@ -23,8 +23,8 @@ import ( "k8s.io/klog" "sigs.k8s.io/krew/cmd/krew/cmd/internal" - "sigs.k8s.io/krew/pkg/index/indexscanner" - "sigs.k8s.io/krew/pkg/installation" + "sigs.k8s.io/krew/internal/index/indexscanner" + "sigs.k8s.io/krew/internal/installation" ) func init() { diff --git a/cmd/krew/cmd/version.go b/cmd/krew/cmd/version.go index f4fb07e6..2f7a92c5 100644 --- a/cmd/krew/cmd/version.go +++ b/cmd/krew/cmd/version.go @@ -19,8 +19,8 @@ import ( "github.com/spf13/cobra" + "sigs.k8s.io/krew/internal/version" "sigs.k8s.io/krew/pkg/constants" - "sigs.k8s.io/krew/pkg/version" ) // versionCmd represents the version command diff --git a/cmd/validate-krew-manifest/main.go b/cmd/validate-krew-manifest/main.go index e6ee048d..53c9f998 100644 --- a/cmd/validate-krew-manifest/main.go +++ b/cmd/validate-krew-manifest/main.go @@ -30,10 +30,10 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/klog" + "sigs.k8s.io/krew/internal/index/indexscanner" + "sigs.k8s.io/krew/internal/index/validation" "sigs.k8s.io/krew/pkg/constants" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/index/indexscanner" - "sigs.k8s.io/krew/pkg/index/validation" ) var flManifest string diff --git a/cmd/validate-krew-manifest/main_test.go b/cmd/validate-krew-manifest/main_test.go index a93c574e..d3619eb7 100644 --- a/cmd/validate-krew-manifest/main_test.go +++ b/cmd/validate-krew-manifest/main_test.go @@ -23,8 +23,8 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/yaml" + "sigs.k8s.io/krew/internal/testutil" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/testutil" ) func TestValidateManifestFile(t *testing.T) { diff --git a/integration_test/system_test.go b/integration_test/system_test.go index ef03a96b..4c38e8c0 100644 --- a/integration_test/system_test.go +++ b/integration_test/system_test.go @@ -21,7 +21,7 @@ import ( "path/filepath" "testing" - "sigs.k8s.io/krew/pkg/testutil" + "sigs.k8s.io/krew/internal/testutil" ) func TestKrewSystem(t *testing.T) { diff --git a/integration_test/testutil_test.go b/integration_test/testutil_test.go index c4e5fa35..cbeb9d37 100644 --- a/integration_test/testutil_test.go +++ b/integration_test/testutil_test.go @@ -30,8 +30,8 @@ import ( "github.com/pkg/errors" + "sigs.k8s.io/krew/internal/testutil" "sigs.k8s.io/krew/pkg/constants" - "sigs.k8s.io/krew/pkg/testutil" ) const ( diff --git a/pkg/download/downloader.go b/internal/download/downloader.go similarity index 100% rename from pkg/download/downloader.go rename to internal/download/downloader.go diff --git a/pkg/download/downloader_test.go b/internal/download/downloader_test.go similarity index 99% rename from pkg/download/downloader_test.go rename to internal/download/downloader_test.go index 8a9848db..f484e551 100644 --- a/pkg/download/downloader_test.go +++ b/internal/download/downloader_test.go @@ -29,7 +29,7 @@ import ( "github.com/pkg/errors" - "sigs.k8s.io/krew/pkg/testutil" + "sigs.k8s.io/krew/internal/testutil" ) func testdataPath() string { diff --git a/pkg/download/fetch.go b/internal/download/fetch.go similarity index 100% rename from pkg/download/fetch.go rename to internal/download/fetch.go diff --git a/pkg/download/testdata/bash-ascii-file b/internal/download/testdata/bash-ascii-file similarity index 100% rename from pkg/download/testdata/bash-ascii-file rename to internal/download/testdata/bash-ascii-file diff --git a/pkg/download/testdata/bash-utf8-file b/internal/download/testdata/bash-utf8-file similarity index 100% rename from pkg/download/testdata/bash-utf8-file rename to internal/download/testdata/bash-utf8-file diff --git a/pkg/download/testdata/null-file b/internal/download/testdata/null-file similarity index 100% rename from pkg/download/testdata/null-file rename to internal/download/testdata/null-file diff --git a/pkg/download/testdata/test-with-directory.zip b/internal/download/testdata/test-with-directory.zip similarity index 100% rename from pkg/download/testdata/test-with-directory.zip rename to internal/download/testdata/test-with-directory.zip diff --git a/pkg/download/testdata/test-with-nesting-with-directory-entries.tar.gz b/internal/download/testdata/test-with-nesting-with-directory-entries.tar.gz similarity index 100% rename from pkg/download/testdata/test-with-nesting-with-directory-entries.tar.gz rename to internal/download/testdata/test-with-nesting-with-directory-entries.tar.gz diff --git a/pkg/download/testdata/test-with-nesting-without-directory-entries.tar.gz b/internal/download/testdata/test-with-nesting-without-directory-entries.tar.gz similarity index 100% rename from pkg/download/testdata/test-with-nesting-without-directory-entries.tar.gz rename to internal/download/testdata/test-with-nesting-without-directory-entries.tar.gz diff --git a/pkg/download/testdata/test-without-directory.tar.gz b/internal/download/testdata/test-without-directory.tar.gz similarity index 100% rename from pkg/download/testdata/test-without-directory.tar.gz rename to internal/download/testdata/test-without-directory.tar.gz diff --git a/pkg/download/testdata/test-without-directory.zip b/internal/download/testdata/test-without-directory.zip similarity index 100% rename from pkg/download/testdata/test-without-directory.zip rename to internal/download/testdata/test-without-directory.zip diff --git a/pkg/download/verifier.go b/internal/download/verifier.go similarity index 100% rename from pkg/download/verifier.go rename to internal/download/verifier.go diff --git a/pkg/download/verifier_test.go b/internal/download/verifier_test.go similarity index 100% rename from pkg/download/verifier_test.go rename to internal/download/verifier_test.go diff --git a/pkg/environment/environment.go b/internal/environment/environment.go similarity index 100% rename from pkg/environment/environment.go rename to internal/environment/environment.go diff --git a/pkg/environment/environment_test.go b/internal/environment/environment_test.go similarity index 99% rename from pkg/environment/environment_test.go rename to internal/environment/environment_test.go index e87dd0b4..73095b90 100644 --- a/pkg/environment/environment_test.go +++ b/internal/environment/environment_test.go @@ -22,7 +22,7 @@ import ( "k8s.io/client-go/util/homedir" - "sigs.k8s.io/krew/pkg/testutil" + "sigs.k8s.io/krew/internal/testutil" ) func TestMustGetKrewPaths_resolvesToHomeDir(t *testing.T) { diff --git a/pkg/gitutil/git.go b/internal/gitutil/git.go similarity index 100% rename from pkg/gitutil/git.go rename to internal/gitutil/git.go diff --git a/pkg/index/indexscanner/scanner.go b/internal/index/indexscanner/scanner.go similarity index 98% rename from pkg/index/indexscanner/scanner.go rename to internal/index/indexscanner/scanner.go index d320bf15..6a431450 100644 --- a/pkg/index/indexscanner/scanner.go +++ b/internal/index/indexscanner/scanner.go @@ -25,9 +25,9 @@ import ( "k8s.io/klog" "sigs.k8s.io/yaml" + "sigs.k8s.io/krew/internal/index/validation" "sigs.k8s.io/krew/pkg/constants" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/index/validation" ) func findPluginManifestFiles(indexDir string) ([]string, error) { diff --git a/pkg/index/indexscanner/scanner_test.go b/internal/index/indexscanner/scanner_test.go similarity index 100% rename from pkg/index/indexscanner/scanner_test.go rename to internal/index/indexscanner/scanner_test.go diff --git a/pkg/index/indexscanner/testdata/testindex/dontscan.yaml b/internal/index/indexscanner/testdata/testindex/dontscan.yaml similarity index 100% rename from pkg/index/indexscanner/testdata/testindex/dontscan.yaml rename to internal/index/indexscanner/testdata/testindex/dontscan.yaml diff --git a/pkg/index/indexscanner/testdata/testindex/plugins/badplugin.yaml b/internal/index/indexscanner/testdata/testindex/plugins/badplugin.yaml similarity index 100% rename from pkg/index/indexscanner/testdata/testindex/plugins/badplugin.yaml rename to internal/index/indexscanner/testdata/testindex/plugins/badplugin.yaml diff --git a/pkg/index/indexscanner/testdata/testindex/plugins/badplugin2.yaml b/internal/index/indexscanner/testdata/testindex/plugins/badplugin2.yaml similarity index 100% rename from pkg/index/indexscanner/testdata/testindex/plugins/badplugin2.yaml rename to internal/index/indexscanner/testdata/testindex/plugins/badplugin2.yaml diff --git a/pkg/index/indexscanner/testdata/testindex/plugins/bar.yaml b/internal/index/indexscanner/testdata/testindex/plugins/bar.yaml similarity index 100% rename from pkg/index/indexscanner/testdata/testindex/plugins/bar.yaml rename to internal/index/indexscanner/testdata/testindex/plugins/bar.yaml diff --git a/pkg/index/indexscanner/testdata/testindex/plugins/foo.yaml b/internal/index/indexscanner/testdata/testindex/plugins/foo.yaml similarity index 100% rename from pkg/index/indexscanner/testdata/testindex/plugins/foo.yaml rename to internal/index/indexscanner/testdata/testindex/plugins/foo.yaml diff --git a/pkg/index/indexscanner/testdata/testindex/plugins/notyaml.txt b/internal/index/indexscanner/testdata/testindex/plugins/notyaml.txt similarity index 100% rename from pkg/index/indexscanner/testdata/testindex/plugins/notyaml.txt rename to internal/index/indexscanner/testdata/testindex/plugins/notyaml.txt diff --git a/pkg/index/indexscanner/testdata/testindex/plugins/wrongname.yaml b/internal/index/indexscanner/testdata/testindex/plugins/wrongname.yaml similarity index 100% rename from pkg/index/indexscanner/testdata/testindex/plugins/wrongname.yaml rename to internal/index/indexscanner/testdata/testindex/plugins/wrongname.yaml diff --git a/pkg/index/validation/validate.go b/internal/index/validation/validate.go similarity index 99% rename from pkg/index/validation/validate.go rename to internal/index/validation/validate.go index 6d0bb5c0..1aa31d31 100644 --- a/pkg/index/validation/validate.go +++ b/internal/index/validation/validate.go @@ -22,9 +22,9 @@ import ( "github.com/pkg/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/krew/internal/installation/semver" "sigs.k8s.io/krew/pkg/constants" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/installation/semver" ) const ( diff --git a/pkg/index/validation/validate_test.go b/internal/index/validation/validate_test.go similarity index 99% rename from pkg/index/validation/validate_test.go rename to internal/index/validation/validate_test.go index fbd87a96..e65dfade 100644 --- a/pkg/index/validation/validate_test.go +++ b/internal/index/validation/validate_test.go @@ -19,9 +19,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + "sigs.k8s.io/krew/internal/testutil" "sigs.k8s.io/krew/pkg/constants" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/testutil" ) func Test_IsSafePluginName(t *testing.T) { diff --git a/pkg/info/info.go b/internal/info/info.go similarity index 94% rename from pkg/info/info.go rename to internal/info/info.go index 73a72329..01e21b48 100644 --- a/pkg/info/info.go +++ b/internal/info/info.go @@ -20,9 +20,9 @@ import ( "github.com/pkg/errors" "k8s.io/klog" - "sigs.k8s.io/krew/pkg/environment" + "sigs.k8s.io/krew/internal/environment" + "sigs.k8s.io/krew/internal/index/indexscanner" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/index/indexscanner" ) // LoadManifestFromReceiptOrIndex tries to load a plugin manifest from the diff --git a/pkg/info/info_test.go b/internal/info/info_test.go similarity index 97% rename from pkg/info/info_test.go rename to internal/info/info_test.go index ee7e1653..3a763180 100644 --- a/pkg/info/info_test.go +++ b/internal/info/info_test.go @@ -22,8 +22,8 @@ import ( "github.com/google/go-cmp/cmp" "sigs.k8s.io/yaml" - "sigs.k8s.io/krew/pkg/environment" - "sigs.k8s.io/krew/pkg/testutil" + "sigs.k8s.io/krew/internal/environment" + "sigs.k8s.io/krew/internal/testutil" ) func TestLoadManifestFromReceiptOrIndex(t *testing.T) { diff --git a/pkg/installation/install.go b/internal/installation/install.go similarity index 98% rename from pkg/installation/install.go rename to internal/installation/install.go index ef0bb4f4..762f13f8 100644 --- a/pkg/installation/install.go +++ b/internal/installation/install.go @@ -24,12 +24,12 @@ import ( "github.com/pkg/errors" "k8s.io/klog" + "sigs.k8s.io/krew/internal/download" + "sigs.k8s.io/krew/internal/environment" + "sigs.k8s.io/krew/internal/installation/receipt" + "sigs.k8s.io/krew/internal/pathutil" "sigs.k8s.io/krew/pkg/constants" - "sigs.k8s.io/krew/pkg/download" - "sigs.k8s.io/krew/pkg/environment" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/installation/receipt" - "sigs.k8s.io/krew/pkg/pathutil" ) // InstallOpts specifies options for plugin installation operation. diff --git a/pkg/installation/install_test.go b/internal/installation/install_test.go similarity index 99% rename from pkg/installation/install_test.go rename to internal/installation/install_test.go index d450ebdc..3d2aee82 100644 --- a/pkg/installation/install_test.go +++ b/internal/installation/install_test.go @@ -27,9 +27,9 @@ import ( "github.com/google/go-cmp/cmp" - "sigs.k8s.io/krew/pkg/environment" + "sigs.k8s.io/krew/internal/environment" + "sigs.k8s.io/krew/internal/testutil" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/testutil" ) func Test_moveTargets(t *testing.T) { diff --git a/pkg/installation/move.go b/internal/installation/move.go similarity index 99% rename from pkg/installation/move.go rename to internal/installation/move.go index 8f8ab604..91877616 100644 --- a/pkg/installation/move.go +++ b/internal/installation/move.go @@ -24,8 +24,8 @@ import ( "github.com/pkg/errors" "k8s.io/klog" + "sigs.k8s.io/krew/internal/pathutil" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/pathutil" ) type move struct { diff --git a/pkg/installation/move_test.go b/internal/installation/move_test.go similarity index 99% rename from pkg/installation/move_test.go rename to internal/installation/move_test.go index dfd7c9e9..6d0ad6b9 100644 --- a/pkg/installation/move_test.go +++ b/internal/installation/move_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" + "sigs.k8s.io/krew/internal/testutil" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/testutil" ) func Test_findMoveTargets(t *testing.T) { diff --git a/pkg/installation/platform.go b/internal/installation/platform.go similarity index 100% rename from pkg/installation/platform.go rename to internal/installation/platform.go diff --git a/pkg/installation/platform_test.go b/internal/installation/platform_test.go similarity index 98% rename from pkg/installation/platform_test.go rename to internal/installation/platform_test.go index da2b6d08..874334ba 100644 --- a/pkg/installation/platform_test.go +++ b/internal/installation/platform_test.go @@ -21,8 +21,8 @@ import ( "github.com/google/go-cmp/cmp" + "sigs.k8s.io/krew/internal/testutil" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/testutil" ) func Test_osArch(t *testing.T) { diff --git a/pkg/installation/receipt/receipt.go b/internal/installation/receipt/receipt.go similarity index 96% rename from pkg/installation/receipt/receipt.go rename to internal/installation/receipt/receipt.go index 4fd5bb03..4fb356c6 100644 --- a/pkg/installation/receipt/receipt.go +++ b/internal/installation/receipt/receipt.go @@ -20,8 +20,8 @@ import ( "github.com/pkg/errors" "sigs.k8s.io/yaml" + "sigs.k8s.io/krew/internal/index/indexscanner" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/index/indexscanner" ) // Store saves the given plugin at the destination. diff --git a/pkg/installation/receipt/receipt_test.go b/internal/installation/receipt/receipt_test.go similarity index 95% rename from pkg/installation/receipt/receipt_test.go rename to internal/installation/receipt/receipt_test.go index 6e380c69..3786edb3 100644 --- a/pkg/installation/receipt/receipt_test.go +++ b/internal/installation/receipt/receipt_test.go @@ -20,8 +20,8 @@ import ( "github.com/google/go-cmp/cmp" - "sigs.k8s.io/krew/pkg/index/indexscanner" - "sigs.k8s.io/krew/pkg/testutil" + "sigs.k8s.io/krew/internal/index/indexscanner" + "sigs.k8s.io/krew/internal/testutil" ) func TestStore(t *testing.T) { diff --git a/pkg/installation/semver/version.go b/internal/installation/semver/version.go similarity index 100% rename from pkg/installation/semver/version.go rename to internal/installation/semver/version.go diff --git a/pkg/installation/semver/version_test.go b/internal/installation/semver/version_test.go similarity index 100% rename from pkg/installation/semver/version_test.go rename to internal/installation/semver/version_test.go diff --git a/pkg/installation/testdata/bin/kubectl-foo b/internal/installation/testdata/bin/kubectl-foo similarity index 100% rename from pkg/installation/testdata/bin/kubectl-foo rename to internal/installation/testdata/bin/kubectl-foo diff --git a/pkg/installation/testdata/index/foo/AAAnotplugin/.gitkeep b/internal/installation/testdata/index/foo/AAAnotplugin/.gitkeep similarity index 100% rename from pkg/installation/testdata/index/foo/AAAnotplugin/.gitkeep rename to internal/installation/testdata/index/foo/AAAnotplugin/.gitkeep diff --git a/pkg/installation/testdata/index/foo/deadbeef/.gitkeep b/internal/installation/testdata/index/foo/deadbeef/.gitkeep similarity index 100% rename from pkg/installation/testdata/index/foo/deadbeef/.gitkeep rename to internal/installation/testdata/index/foo/deadbeef/.gitkeep diff --git a/pkg/installation/testdata/index/foo/deadbeef/kubectl-foo b/internal/installation/testdata/index/foo/deadbeef/kubectl-foo similarity index 100% rename from pkg/installation/testdata/index/foo/deadbeef/kubectl-foo rename to internal/installation/testdata/index/foo/deadbeef/kubectl-foo diff --git a/pkg/installation/testdata/plugin-foo/kubectl-foo b/internal/installation/testdata/plugin-foo/kubectl-foo similarity index 100% rename from pkg/installation/testdata/plugin-foo/kubectl-foo rename to internal/installation/testdata/plugin-foo/kubectl-foo diff --git a/pkg/installation/testdata/testdir_A/.secret b/internal/installation/testdata/testdir_A/.secret similarity index 100% rename from pkg/installation/testdata/testdir_A/.secret rename to internal/installation/testdata/testdir_A/.secret diff --git a/pkg/installation/testdata/testdir_A/notsecret b/internal/installation/testdata/testdir_A/notsecret similarity index 100% rename from pkg/installation/testdata/testdir_A/notsecret rename to internal/installation/testdata/testdir_A/notsecret diff --git a/pkg/installation/testdata/testdir_B/.gitkeep b/internal/installation/testdata/testdir_B/.gitkeep similarity index 100% rename from pkg/installation/testdata/testdir_B/.gitkeep rename to internal/installation/testdata/testdir_B/.gitkeep diff --git a/pkg/installation/upgrade.go b/internal/installation/upgrade.go similarity index 96% rename from pkg/installation/upgrade.go rename to internal/installation/upgrade.go index e9250819..36c47ad0 100644 --- a/pkg/installation/upgrade.go +++ b/internal/installation/upgrade.go @@ -21,11 +21,11 @@ import ( "github.com/pkg/errors" "k8s.io/klog" + "sigs.k8s.io/krew/internal/environment" + "sigs.k8s.io/krew/internal/installation/receipt" + "sigs.k8s.io/krew/internal/installation/semver" "sigs.k8s.io/krew/pkg/constants" - "sigs.k8s.io/krew/pkg/environment" "sigs.k8s.io/krew/pkg/index" - "sigs.k8s.io/krew/pkg/installation/receipt" - "sigs.k8s.io/krew/pkg/installation/semver" ) // Upgrade will reinstall and delete the old plugin. The operation tries diff --git a/pkg/installation/util.go b/internal/installation/util.go similarity index 97% rename from pkg/installation/util.go rename to internal/installation/util.go index 4758a93d..3a821042 100644 --- a/pkg/installation/util.go +++ b/internal/installation/util.go @@ -20,8 +20,8 @@ import ( "github.com/pkg/errors" "k8s.io/klog" + "sigs.k8s.io/krew/internal/installation/receipt" "sigs.k8s.io/krew/pkg/constants" - "sigs.k8s.io/krew/pkg/installation/receipt" ) // ListInstalledPlugins returns a list of all install plugins in a diff --git a/pkg/installation/util_test.go b/internal/installation/util_test.go similarity index 100% rename from pkg/installation/util_test.go rename to internal/installation/util_test.go diff --git a/pkg/pathutil/pathutil.go b/internal/pathutil/pathutil.go similarity index 100% rename from pkg/pathutil/pathutil.go rename to internal/pathutil/pathutil.go diff --git a/pkg/pathutil/pathutil_test.go b/internal/pathutil/pathutil_test.go similarity index 100% rename from pkg/pathutil/pathutil_test.go rename to internal/pathutil/pathutil_test.go diff --git a/pkg/receiptsmigration/migration.go b/internal/receiptsmigration/migration.go similarity index 97% rename from pkg/receiptsmigration/migration.go rename to internal/receiptsmigration/migration.go index da9fb8f2..37f6c49f 100644 --- a/pkg/receiptsmigration/migration.go +++ b/internal/receiptsmigration/migration.go @@ -27,10 +27,10 @@ import ( "github.com/pkg/errors" "k8s.io/klog" + "sigs.k8s.io/krew/internal/environment" + "sigs.k8s.io/krew/internal/index/validation" + "sigs.k8s.io/krew/internal/receiptsmigration/oldenvironment" "sigs.k8s.io/krew/pkg/constants" - "sigs.k8s.io/krew/pkg/environment" - "sigs.k8s.io/krew/pkg/index/validation" - "sigs.k8s.io/krew/pkg/receiptsmigration/oldenvironment" ) const ( diff --git a/pkg/receiptsmigration/migration_test.go b/internal/receiptsmigration/migration_test.go similarity index 97% rename from pkg/receiptsmigration/migration_test.go rename to internal/receiptsmigration/migration_test.go index f8e3fc96..332f4cb2 100644 --- a/pkg/receiptsmigration/migration_test.go +++ b/internal/receiptsmigration/migration_test.go @@ -26,9 +26,9 @@ import ( "github.com/google/go-cmp/cmp" - "sigs.k8s.io/krew/pkg/environment" - "sigs.k8s.io/krew/pkg/receiptsmigration/oldenvironment" - "sigs.k8s.io/krew/pkg/testutil" + "sigs.k8s.io/krew/internal/environment" + "sigs.k8s.io/krew/internal/receiptsmigration/oldenvironment" + "sigs.k8s.io/krew/internal/testutil" ) func TestIsMigrated(t *testing.T) { diff --git a/pkg/receiptsmigration/oldenvironment/environment.go b/internal/receiptsmigration/oldenvironment/environment.go similarity index 100% rename from pkg/receiptsmigration/oldenvironment/environment.go rename to internal/receiptsmigration/oldenvironment/environment.go diff --git a/pkg/receiptsmigration/oldenvironment/environment_test.go b/internal/receiptsmigration/oldenvironment/environment_test.go similarity index 100% rename from pkg/receiptsmigration/oldenvironment/environment_test.go rename to internal/receiptsmigration/oldenvironment/environment_test.go diff --git a/pkg/testutil/plugin.go b/internal/testutil/plugin.go similarity index 100% rename from pkg/testutil/plugin.go rename to internal/testutil/plugin.go diff --git a/pkg/testutil/tempdir.go b/internal/testutil/tempdir.go similarity index 100% rename from pkg/testutil/tempdir.go rename to internal/testutil/tempdir.go diff --git a/pkg/version/version.go b/internal/version/version.go similarity index 100% rename from pkg/version/version.go rename to internal/version/version.go diff --git a/pkg/version/version_test.go b/internal/version/version_test.go similarity index 100% rename from pkg/version/version_test.go rename to internal/version/version_test.go