Removes .odo folder if empty

redhat-developer · Apr 15, 2020 · 4299c56 · 4299c56
1 parent 959a954
commit 4299c56
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/pkg/odo/cli/component/delete.go b/pkg/odo/cli/component/delete.go
@@ -212,6 +212,15 @@ func (do *DeleteOptions) DevFileRun() (err error) {
 			if err != nil {
 				return err
 			}
+
+			cfg, err := config.NewLocalConfigInfo(do.componentContext)
+			if err != nil {
+				return err
+			}
+			if err = cfg.DeleteConfigDirIfEmpty(); err != nil {
+				return err
+			}
+
 			log.Successf("Successfully deleted env file")
 		} else {
 			log.Error("Aborting deletion of env folder")

diff --git a/tests/integration/devfile/cmd_devfile_delete_test.go b/tests/integration/devfile/cmd_devfile_delete_test.go
@@ -79,9 +79,8 @@ var _ = Describe("odo devfile delete command tests", func() {
 
 			oc.WaitAndCheckForExistence("deployments", namespace, 1)
 
-			files := helper.ListFilesInDir(filepath.Join(context, ".odo"))
-			Expect(files).To(Not(ContainElement("env")))
-			Expect(files).To(Not(ContainElement("odo-file-index.json")))
+			files := helper.ListFilesInDir(context)
+			Expect(files).To(Not(ContainElement(".odo")))
 		})
 	})
 })