Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move implementation details to internal #422

Merged
merged 1 commit into from
Dec 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmd/generate-plugin-overview/generate-plugin-overview.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
1 change: 1 addition & 0 deletions cmd/generate-plugin-overview/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
4 changes: 2 additions & 2 deletions cmd/krew/cmd/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cmd/krew/cmd/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/krew/cmd/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
10 changes: 5 additions & 5 deletions cmd/krew/cmd/root.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
4 changes: 2 additions & 2 deletions cmd/krew/cmd/search.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/krew/cmd/system.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/krew/cmd/uninstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/krew/cmd/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/krew/cmd/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
2 changes: 1 addition & 1 deletion cmd/krew/cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cmd/validate-krew-manifest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmd/validate-krew-manifest/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion integration_test/system_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion integration_test/testutil_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import (

"github.com/pkg/errors"

"sigs.k8s.io/krew/pkg/testutil"
"sigs.k8s.io/krew/internal/testutil"
)

func testdataPath() string {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/info/info.go → internal/info/info.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/info/info_test.go → internal/info/info_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion pkg/installation/move.go → internal/installation/move.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/installation/util.go → internal/installation/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.