return the cleanup func to be optionally called and explain why.

cmd/puma-dev/main_darwin.go

@@ -59,7 +59,13 @@ func main() {
 	}
 
 	if *fUninstall {
-		dev.Uninstall(LaunchAgentDirPath, domains)
+		onlyDeleteNowUntrustedCertAndKeyInProductionPathFunc := dev.Uninstall(LaunchAgentDirPath, domains)
+		// FIXME: As part of running tests interactively on macOS, we can't delete .cert/.key
+		// generated as part of test runs. But, we don't want to leave untrusted .cert/.key's
+		// hanging around post-uninstall. So, we delete them as part of the main codepath but
+		// ignore this returned func during testing. Eventually, when the cert/key can be
+		// stored in the macOS keychain, we can rely on that to avoid this.
+		onlyDeleteNowUntrustedCertAndKeyInProductionPathFunc()
 		return
 	}
 

dev/setup_darwin.go

@@ -202,7 +202,7 @@ func InstallIntoSystem(config *InstallIntoSystemArgs) error {
 	return nil
 }
 
-func Uninstall(launchAgentDirPath string, domains []string) {
+func Uninstall(launchAgentDirPath string, domains []string) func() {
 	// Default: ~/Library/LaunchAgents/
 	plistDir := homedir.MustExpand(launchAgentDirPath)
 	plist := filepath.Join(plistDir, "io.puma.dev.plist")
@@ -212,17 +212,20 @@ func Uninstall(launchAgentDirPath string, domains []string) {
 	os.Remove(plist)
 	fmt.Printf("* Removed puma-dev from automatically running\n")
 
+	for _, d := range domains {
+		os.Remove(filepath.Join("/etc/resolver", d))
+		fmt.Printf("* Removed domain '%s'\n", d)
+	}
+
 	// Remove all `Puma-dev CA` certificate entries from macOS keychain
 	if err := DeleteAllPumaDevCAFromDefaultKeychain(); err != nil {
 		fmt.Printf("! Unable to remove all Puma-dev CA certs from macOS keychain: %s\n", err)
+		return func() {}
 	} else {
-		expandedSupportDir := homedir.MustExpand(SupportDir)
 		fmt.Printf("* Removed all Puma-dev CA certs from macOS keychain.\n")
-		fmt.Printf("! Before re-installing, please delete %s\n", expandedSupportDir)
-	}
 
-	for _, d := range domains {
-		os.Remove(filepath.Join("/etc/resolver", d))
-		fmt.Printf("* Removed domain '%s'\n", d)
+		return func() {
+			os.RemoveAll(homedir.MustExpand(SupportDir))
+		}
 	}
 }