cli: remove old migration steps and id-file references (#2440)

* Remove old migration steps and id-file references * Update codeowners file --------- Signed-off-by: Daniel Weiße <[email protected]>
edgelesssys · Oct 13, 2023 · ab8a17e · ab8a17e
1 parent 9e1a0c0
commit ab8a17e
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 579 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -6,7 +6,6 @@
 /bazel/sh @katexochen
 /bootstrapper @3u13r
 /cli/internal/cloudcmd @daniel-weisse
-/cli/internal/clusterid @malt3
 /cli/internal/cmd/upgrade* @derpsteb
 /cli/internal/featureset @malt3
 /cli/internal/helm @derpsteb

diff --git a/cli/internal/clusterid/BUILD.bazel b/cli/internal/clusterid/BUILD.bazel
diff --git a/cli/internal/clusterid/id.go b/cli/internal/clusterid/id.go
diff --git a/cli/internal/clusterid/id_test.go b/cli/internal/clusterid/id_test.go
diff --git a/cli/internal/cmd/BUILD.bazel b/cli/internal/cmd/BUILD.bazel
@@ -40,7 +40,6 @@ go_library(
     deps = [
         "//bootstrapper/initproto",
         "//cli/internal/cloudcmd",
-        "//cli/internal/clusterid",
         "//cli/internal/cmd/pathprefix",
         "//cli/internal/featureset",
         "//cli/internal/helm",
@@ -135,7 +134,6 @@ go_test(
     deps = [
         "//bootstrapper/initproto",
         "//cli/internal/cloudcmd",
-        "//cli/internal/clusterid",
         "//cli/internal/cmd/pathprefix",
         "//cli/internal/helm",
         "//cli/internal/kubecmd",

diff --git a/cli/internal/cmd/terminate.go b/cli/internal/cmd/terminate.go
@@ -84,11 +84,6 @@ func terminate(cmd *cobra.Command, terminator cloudTerminator, fileHandler file.
 		removeErr = errors.Join(err, fmt.Errorf("failed to remove file: '%s', please remove it manually", pf.PrefixPrintablePath(constants.AdminConfFilename)))
 	}
 
-	// TODO(msanft): Once v2.12.0 is released, remove the ID-file-removal here.
-	if err := fileHandler.Remove(constants.ClusterIDsFilename); err != nil && !errors.Is(err, fs.ErrNotExist) {
-		removeErr = errors.Join(err, fmt.Errorf("failed to remove file: '%s', please remove it manually", pf.PrefixPrintablePath(constants.ClusterIDsFilename)))
-	}
-
 	if err := fileHandler.Remove(constants.StateFilename); err != nil && !errors.Is(err, fs.ErrNotExist) {
 		removeErr = errors.Join(err, fmt.Errorf("failed to remove file: '%s', please remove it manually", pf.PrefixPrintablePath(constants.StateFilename)))
 	}