Remove receipts migration (#603)

* Remove receipts migration

* Remove receiptsmigration check from ci

* Rename test

* Remove oldenvironment

* Code review changes

Author: chriskim06

.github/workflows/ci.yml

@@ -60,9 +60,6 @@ jobs:
     - name: Run integration tests
       run: hack/run-integration-tests.sh
 
-    - name: Verify receipt migration from v0.2.x to v0.3.x
-      run: hack/verify-receipts-upgrade-migration.sh
-
     - name: Create a new release
       if: contains(github.ref, 'tags')
       id: create_release

cmd/krew/cmd/root.go

@@ -141,8 +141,11 @@ func preRun(cmd *cobra.Command, _ []string) error {
 	if err != nil {
 		return err
 	}
-	if !isMigrated && cmd.Use != "receipts-upgrade" {
-		fmt.Fprintln(os.Stderr, "You need to perform a migration to continue using krew.\nPlease run `kubectl krew system receipts-upgrade`")
+	if !isMigrated {
+		fmt.Fprintln(os.Stderr, `This version of Krew is not supported anymore. Please manually migrate:
+1. Uninstall Krew: https://krew.sigs.k8s.io/docs/user-guide/setup/uninstall/
+2. Install latest Krew: https://krew.sigs.k8s.io/docs/user-guide/setup/install/
+3. Install the plugins you used`)
 		return errors.New("krew home outdated")
 	}
 

cmd/krew/cmd/system.go

@@ -20,7 +20,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"sigs.k8s.io/krew/internal/indexmigration"
-	"sigs.k8s.io/krew/internal/receiptsmigration"
 	"sigs.k8s.io/krew/pkg/constants"
 )
 
@@ -37,23 +36,6 @@ This command will be removed without further notice from future versions of krew
 	Hidden: true,
 }
 
-// TODO(corneliusweig) remove migration code with v0.4
-// systemCmd represents the system command
-var receiptsUpgradeCmd = &cobra.Command{
-	Use:   "receipts-upgrade",
-	Short: "Perform a migration of the krew home",
-	Long: `Krew became more awesome! To use the new features, you need to run this
-one-time migration, which will reinstall all current plugins.
-
-This command will be removed without further notice from future versions of krew.
-`,
-	Args: cobra.NoArgs,
-	RunE: func(cmd *cobra.Command, args []string) error {
-		return receiptsmigration.Migrate(paths)
-	},
-	PreRunE: func(_ *cobra.Command, _ []string) error { return ensureIndexesUpdated() },
-}
-
 var indexUpgradeCmd = &cobra.Command{
 	Use:   "index-upgrade",
 	Short: "Perform a migration of the krew index",
@@ -72,6 +54,5 @@ func init() {
 	if _, ok := os.LookupEnv(constants.EnableMultiIndexSwitch); ok {
 		systemCmd.AddCommand(indexUpgradeCmd)
 	}
-	systemCmd.AddCommand(receiptsUpgradeCmd)
 	rootCmd.AddCommand(systemCmd)
 }

cmd/krew/main.go

@@ -21,6 +21,6 @@ import (
 )
 
 func main() {
-	cmd.Execute()
 	defer klog.Flush()
+	cmd.Execute()
 }

hack/verify-receipts-upgrade-migration.sh

@@ -16,15 +16,12 @@
 package integrationtest
 
 import (
-	"bytes"
 	"os"
-	"path/filepath"
+	"strings"
 	"testing"
-
-	"sigs.k8s.io/krew/internal/testutil"
 )
 
-func TestKrewSystem(t *testing.T) {
+func TestKrewUnsupportedVersion(t *testing.T) {
 	skipShort(t)
 
 	test, cleanup := NewTest(t)
@@ -35,61 +32,13 @@ func TestKrewSystem(t *testing.T) {
 	// needs to be after initial installation
 	prepareOldKrewRoot(test)
 
-	test.Krew("system", "receipts-upgrade").RunOrFailOutput()
-	test.AssertExecutableInPATH("kubectl-" + validPlugin)
-
-	assertReceiptExistsFor(test, validPlugin)
-}
-
-func TestKrewSystem_ReceiptForKrew(t *testing.T) {
-	skipShort(t)
-
-	test, cleanup := NewTest(t)
-	defer cleanup()
-
-	prepareOldKrewRoot(test)
-	touch(test.tempDir, "store/krew/ensure-folder-exists")
-
-	test.WithDefaultIndex().Krew("system", "receipts-upgrade").RunOrFailOutput()
-
-	assertReceiptExistsFor(test, "krew")
-}
-
-func TestKrewSystem_IgnoreAdditionalFolders(t *testing.T) {
-	skipShort(t)
-
-	test, cleanup := NewTest(t)
-	defer cleanup()
-
-	prepareOldKrewRoot(test)
-
-	touch(test.tempDir, "store/not-a-plugin/ensure-folder-exists")
-	out := test.WithDefaultIndex().Krew("system", "receipts-upgrade").RunOrFailOutput()
-
-	if !bytes.Contains(out, []byte("Skipping plugin not-a-plugin")) {
-		t.Errorf("Expected a message that 'not-a-plugin' is skipped, but output was:")
-		t.Log(string(out))
+	// any command should fail here
+	out, err := test.Krew("list").Run()
+	if err == nil {
+		t.Error("krew should fail when old receipts structure is detected")
 	}
-}
-
-func TestKrewSystem_IgnoreUnknownPlugins(t *testing.T) {
-	skipShort(t)
-
-	test, cleanup := NewTest(t)
-	defer cleanup()
-
-	test.Krew("install",
-		"--manifest", filepath.Join("testdata", "foo.yaml"),
-		"--archive", filepath.Join("testdata", "foo.tar.gz")).
-		RunOrFail()
-
-	prepareOldKrewRoot(test)
-
-	out := test.WithDefaultIndex().Krew("system", "receipts-upgrade").RunOrFailOutput()
-
-	if !bytes.Contains(out, []byte("Skipping plugin foo")) {
-		t.Errorf("Expected a message that 'foo' is skipped, but output was:")
-		t.Log(string(out))
+	if !strings.Contains(string(out), "Uninstall Krew") {
+		t.Errorf("output should contain instructions on upgrading: %s", string(out))
 	}
 }
 
@@ -99,16 +48,3 @@ func prepareOldKrewRoot(test *ITest) {
 		test.t.Fatal(err)
 	}
 }
-
-func assertReceiptExistsFor(it *ITest, plugin string) {
-	receipt := "receipts/" + plugin + ".yaml"
-	_, err := os.Lstat(it.tempDir.Path(receipt))
-	if err != nil {
-		it.t.Errorf("Expected plugin receipt %q but found none.", receipt)
-	}
-}
-
-// touch creates a file without content in the temporary directory.
-func touch(td *testutil.TempDir, file string) {
-	td.Write(file, nil)
-}