Skip to content

Commit ca34ec7

Browse files
fix: delete kubefirst file when doing kubefirst reset - KRA-73 (#2344)
--------- Signed-off-by: nathan-nicholson <[email protected]>
1 parent b7b1e99 commit ca34ec7

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

cmd/reset.go

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,12 @@ var resetCmd = &cobra.Command{
6464
return fmt.Errorf("unable to determine contents of kubefirst-checks: unexpected type %T", v)
6565
}
6666

67-
if err := runReset(); err != nil {
67+
homePath, err := os.UserHomeDir()
68+
if err != nil {
69+
return fmt.Errorf("unable to get user home directory: %w", err)
70+
}
71+
72+
if err := runReset(homePath); err != nil {
6873
return fmt.Errorf("error during reset operation: %w", err)
6974
}
7075
return nil
@@ -94,19 +99,16 @@ func parseConfigEntryKubefirstChecks(checks map[string]interface{}) (map[string]
9499
}
95100

96101
// runReset carries out the reset function
97-
func runReset() error {
102+
func runReset(homePath string) error {
98103
utils.DisplayLogHints()
99104

100105
progressPrinter.AddTracker("removing-platform-content", "Removing local platform content", 2)
101106
progressPrinter.SetupProgress(progressPrinter.TotalOfTrackers(), false)
102107

103108
log.Info().Msg("removing previous platform content")
104109

105-
homePath, err := os.UserHomeDir()
106-
if err != nil {
107-
return fmt.Errorf("unable to get user home directory: %w", err)
108-
}
109110
k1Dir := fmt.Sprintf("%s/.k1", homePath)
111+
kubefirstConfig := fmt.Sprintf("%s/.kubefirst", homePath)
110112

111113
if err := utils.ResetK1Dir(k1Dir); err != nil {
112114
return fmt.Errorf("error resetting k1 directory: %w", err)
@@ -131,9 +133,12 @@ func runReset() error {
131133
return fmt.Errorf("unable to delete %q folder, error: %w", k1Dir, err)
132134
}
133135

136+
if err := os.RemoveAll(kubefirstConfig); err != nil {
137+
return fmt.Errorf("unable to remove %q, error: %w", kubefirstConfig, err)
138+
}
139+
134140
progressPrinter.IncrementTracker("removing-platform-content")
135141
time.Sleep(time.Second * 2)
136142
progress.Progress.Quit()
137-
138143
return nil
139144
}

0 commit comments

Comments
 (0)