Merge pull request #31142 from helm/gjenkins/main/mv_plugin_internal

[HIP-0026] Move pkg/plugin -> internal/plugin
4 weeks ago · 4596c0e062
parent 30404b4173 a1c84f9a4c
commit 4596c0e062
28 changed files with 23 additions and 23 deletions
--- a/internal/plugin/cache/cache.go
+++ b/internal/plugin/cache/cache.go
@ -14,7 +14,7 @@ limitations under the License.
 */

 // Package cache provides a key generator for vcs urls.
-package cache // import "helm.sh/helm/v4/pkg/plugin/cache"
+package cache // import "helm.sh/helm/v4/internal/plugin/cache"

 import (
 	"net/url"
--- a/internal/plugin/hooks.go
+++ b/internal/plugin/hooks.go
@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package plugin // import "helm.sh/helm/v4/pkg/plugin"
+package plugin // import "helm.sh/helm/v4/internal/plugin"

 // Types of hooks
 const (
--- a/internal/plugin/installer/base.go
+++ b/internal/plugin/installer/base.go
@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"

 import (
 	"path/filepath"
--- a/internal/plugin/installer/base_test.go
+++ b/internal/plugin/installer/base_test.go
@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"

 import (
 	"testing"
--- a/internal/plugin/installer/doc.go
+++ b/internal/plugin/installer/doc.go
@ -14,4 +14,4 @@ limitations under the License.
 */

 // Package installer provides an interface for installing Helm plugins.
-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"
--- a/internal/plugin/installer/http_installer.go
+++ b/internal/plugin/installer/http_installer.go
@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"

 import (
 	"archive/tar"
@ -32,11 +32,11 @@ import (

 	securejoin "github.com/cyphar/filepath-securejoin"

+	"helm.sh/helm/v4/internal/plugin/cache"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/pkg/cli"
 	"helm.sh/helm/v4/pkg/getter"
 	"helm.sh/helm/v4/pkg/helmpath"
-	"helm.sh/helm/v4/pkg/plugin/cache"
 )

 // HTTPInstaller installs plugins from an archive served by a web server.
--- a/internal/plugin/installer/http_installer_test.go
+++ b/internal/plugin/installer/http_installer_test.go
@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"

 import (
 	"archive/tar"
--- a/internal/plugin/installer/installer.go
+++ b/internal/plugin/installer/installer.go
@ -22,7 +22,7 @@ import (
 	"path/filepath"
 	"strings"

-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )

 // ErrMissingMetadata indicates that plugin.yaml is missing.
--- a/internal/plugin/installer/installer_test.go
+++ b/internal/plugin/installer/installer_test.go
--- a/internal/plugin/installer/local_installer.go
+++ b/internal/plugin/installer/local_installer.go
@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"

 import (
 	"errors"
--- a/internal/plugin/installer/local_installer_test.go
+++ b/internal/plugin/installer/local_installer_test.go
@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"

 import (
 	"os"
--- a/internal/plugin/installer/vcs_installer.go
+++ b/internal/plugin/installer/vcs_installer.go
@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"

 import (
 	"errors"
@ -26,9 +26,9 @@ import (
 	"github.com/Masterminds/semver/v3"
 	"github.com/Masterminds/vcs"

+	"helm.sh/helm/v4/internal/plugin/cache"
 	"helm.sh/helm/v4/internal/third_party/dep/fs"
 	"helm.sh/helm/v4/pkg/helmpath"
-	"helm.sh/helm/v4/pkg/plugin/cache"
 )

 // VCSInstaller installs plugins from remote a repository.
--- a/internal/plugin/installer/vcs_installer_test.go
+++ b/internal/plugin/installer/vcs_installer_test.go
@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-package installer // import "helm.sh/helm/v4/pkg/plugin/installer"
+package installer // import "helm.sh/helm/v4/internal/plugin/installer"

 import (
 	"fmt"
--- a/internal/plugin/plugin.go
+++ b/internal/plugin/plugin.go
--- a/internal/plugin/plugin_test.go
+++ b/internal/plugin/plugin_test.go
--- a/internal/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/bad/duplicate-entries/plugin.yaml
--- a/internal/plugin/testdata/plugdir/good/downloader/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/good/downloader/plugin.yaml
--- a/internal/plugin/testdata/plugdir/good/echo/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/good/echo/plugin.yaml
--- a/internal/plugin/testdata/plugdir/good/hello/hello.ps1
+++ b/internal/plugin/testdata/plugdir/good/hello/hello.ps1
--- a/internal/plugin/testdata/plugdir/good/hello/hello.sh
+++ b/internal/plugin/testdata/plugdir/good/hello/hello.sh
--- a/internal/plugin/testdata/plugdir/good/hello/plugin.yaml
+++ b/internal/plugin/testdata/plugdir/good/hello/plugin.yaml
--- a/pkg/cmd/load_plugins.go
+++ b/pkg/cmd/load_plugins.go
@ -31,7 +31,7 @@ import (
 	"github.com/spf13/cobra"
 	"sigs.k8s.io/yaml"

-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )

 const (
--- a/pkg/cmd/plugin.go
+++ b/pkg/cmd/plugin.go
@ -24,7 +24,7 @@ import (

 	"github.com/spf13/cobra"

-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )

 const pluginHelp = `
--- a/pkg/cmd/plugin_install.go
+++ b/pkg/cmd/plugin_install.go
@ -22,9 +22,9 @@ import (

 	"github.com/spf13/cobra"

+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/plugin/installer"
 	"helm.sh/helm/v4/pkg/cmd/require"
-	"helm.sh/helm/v4/pkg/plugin"
-	"helm.sh/helm/v4/pkg/plugin/installer"
 )

 type pluginInstallOptions struct {
--- a/pkg/cmd/plugin_list.go
+++ b/pkg/cmd/plugin_list.go
@ -24,7 +24,7 @@ import (
 	"github.com/gosuri/uitable"
 	"github.com/spf13/cobra"

-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )

 func newPluginListCmd(out io.Writer) *cobra.Command {
--- a/pkg/cmd/plugin_uninstall.go
+++ b/pkg/cmd/plugin_uninstall.go
@ -24,7 +24,7 @@ import (

 	"github.com/spf13/cobra"

-	"helm.sh/helm/v4/pkg/plugin"
+	"helm.sh/helm/v4/internal/plugin"
 )

 type pluginUninstallOptions struct {
--- a/pkg/cmd/plugin_update.go
+++ b/pkg/cmd/plugin_update.go
@ -24,8 +24,8 @@ import (

 	"github.com/spf13/cobra"

-	"helm.sh/helm/v4/pkg/plugin"
-	"helm.sh/helm/v4/pkg/plugin/installer"
+	"helm.sh/helm/v4/internal/plugin"
+	"helm.sh/helm/v4/internal/plugin/installer"
 )

 type pluginUpdateOptions struct {
--- a/pkg/getter/plugingetter.go
+++ b/pkg/getter/plugingetter.go
@ -23,8 +23,8 @@ import (
 	"path/filepath"
 	"strings"

+	"helm.sh/helm/v4/internal/plugin"
 	"helm.sh/helm/v4/pkg/cli"
-	"helm.sh/helm/v4/pkg/plugin"
 )

 // collectPlugins scans for getter plugins.