From b8af4d94a58b598be6c703a13134adf8d53a0b1a Mon Sep 17 00:00:00 2001
From: hernandoagudelo <heagma@live.com>
Date: Thu, 17 Nov 2022 23:54:31 +0800
Subject: [PATCH 1/2] feat: Update destroy --remove command to delete stack
 config file

---
 pkg/cmd/pulumi/destroy.go | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkg/cmd/pulumi/destroy.go b/pkg/cmd/pulumi/destroy.go
index 55e7ceee8f00..82bddc20e88a 100644
--- a/pkg/cmd/pulumi/destroy.go
+++ b/pkg/cmd/pulumi/destroy.go
@@ -18,6 +18,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"os"
 
 	"github.com/spf13/cobra"
 
@@ -81,7 +82,7 @@ func newDestroyCmd() *cobra.Command {
 			"all of this stack's resources and associated state are deleted.\n" +
 			"\n" +
 			"The stack itself is not deleted. Use `pulumi stack rm` or the \n" +
-			"`--remove` flag to delete the stack.\n" +
+			"`--remove` flag to delete the stack and its config file.\n" +
 			"\n" +
 			"Warning: this command is generally irreversible and should be used with great care.",
 		Args: cmdArgs,
@@ -271,9 +272,15 @@ func newDestroyCmd() *cobra.Command {
 					_, err = s.Remove(ctx, false)
 					if err != nil {
 						return result.FromError(err)
-					} else if !jsonDisplay {
-						fmt.Printf("The resources in the stack have been deleted, and the history and " +
-							"configuration removed.\n")
+					}
+					// Remove also the stack config file.
+					if _, path, err := workspace.DetectProjectStackPath(s.Ref().Name().Q()); err == nil {
+						if err = os.Remove(path); err != nil && !os.IsNotExist(err) {
+							return result.FromError(err)
+						} else if !jsonDisplay {
+							fmt.Printf("The resources in the stack have been deleted, and the history and " +
+								"configuration removed.\n")
+						}
 					}
 				}
 			} else if res != nil && res.Error() == context.Canceled {
@@ -288,7 +295,7 @@ func newDestroyCmd() *cobra.Command {
 		"Print detailed debugging output during resource operations")
 	cmd.PersistentFlags().BoolVar(
 		&remove, "remove", false,
-		"Remove the stack after all resources in the stack have been deleted")
+		"Remove the stack and its config file after all resources in the stack have been deleted")
 	cmd.PersistentFlags().StringVarP(
 		&stack, "stack", "s", "",
 		"The name of the stack to operate on. Defaults to the current stack")
@@ -368,7 +375,7 @@ func newDestroyCmd() *cobra.Command {
 	return cmd
 }
 
-// seperateProtected returns a list or unprotected and protected resources respectively. This allows
+// separateProtected returns a list or unprotected and protected resources respectively. This allows
 // us to safely destroy all resources in the unprotected list without invalidating any resource in
 // the protected list. Protection is contravarient: A < B where A: Protected => B: Protected, A < B
 // where B: Protected !=> A: Protected.
@@ -385,7 +392,7 @@ func newDestroyCmd() *cobra.Command {
 //
 // We rely on the fact that `resources` is topologically sorted with respect to its dependencies.
 // This function understands that providers live outside this topological sort.
-func seperateProtected(resources []*resource.State) (
+func separateProtected(resources []*resource.State) (
 	/*unprotected*/ []*resource.State /*protected*/, []*resource.State) {
 	dg := graph.NewDependencyGraph(resources)
 	transitiveProtected := graph.ResourceSet{}
@@ -409,7 +416,7 @@ func handleExcludeProtected(ctx context.Context, s backend.Stack) ([]string, int
 	} else if snapshot == nil {
 		return nil, 0, errors.New("Failed to find the stack snapshot. Are you in a stack?")
 	}
-	unprotected, protected := seperateProtected(snapshot.Resources)
+	unprotected, protected := separateProtected(snapshot.Resources)
 	targetUrns := make([]string, len(unprotected))
 	for i, r := range unprotected {
 		targetUrns[i] = string(r.URN)

From 4910bce0071ba2532dabbccc03164f332603b382 Mon Sep 17 00:00:00 2001
From: hernandoagudelo <heagma@live.com>
Date: Fri, 18 Nov 2022 00:05:08 +0800
Subject: [PATCH 2/2] chore: Add changelog

---
 ...21117--cli--delete-stack-config-file-on-pulumi-remove.yaml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 changelog/pending/20221117--cli--delete-stack-config-file-on-pulumi-remove.yaml

diff --git a/changelog/pending/20221117--cli--delete-stack-config-file-on-pulumi-remove.yaml b/changelog/pending/20221117--cli--delete-stack-config-file-on-pulumi-remove.yaml
new file mode 100644
index 000000000000..e371c9ab6643
--- /dev/null
+++ b/changelog/pending/20221117--cli--delete-stack-config-file-on-pulumi-remove.yaml
@@ -0,0 +1,4 @@
+changes:
+- type: feat
+  scope: cli
+  description: pulumi destroy --remove will now delete the stack config file