feat: Add destroy to workspace provision job

kylecarbs · kylecarbs · commit bc7d95ff08b1 · 2022-02-28T02:59:31.000Z
This enables the full flow of create/update/delete.
diff --git a/coderd/provisionerdaemons.go b/coderd/provisionerdaemons.go
@@ -693,6 +693,8 @@ func convertWorkspaceTransition(transition database.WorkspaceTransition) (sdkpro
 		return sdkproto.WorkspaceTransition_START, nil
 	case database.WorkspaceTransitionStop:
 		return sdkproto.WorkspaceTransition_STOP, nil
+	case database.WorkspaceTransitionDelete:
+		return sdkproto.WorkspaceTransition_DESTROY, nil
 	default:
 		return 0, xerrors.Errorf("unrecognized transition: %q", transition)
 	}
diff --git a/provisioner/terraform/provision.go b/provisioner/terraform/provision.go
@@ -317,7 +317,7 @@ func (t *terraform) runTerraformApply(ctx context.Context, terraform *tfexec.Ter
 	}()
 
 	t.logger.Debug(ctx, "running apply", slog.F("vars", len(vars)), slog.F("env", len(env)))
-	err := runApplyCommand(ctx, t.shutdownCtx, terraform.ExecPath(), terraform.WorkingDir(), writer, env, vars)
+	err := runApplyCommand(ctx, t.shutdownCtx, request.Metadata.WorkspaceTransition, terraform.ExecPath(), terraform.WorkingDir(), writer, env, vars)
 	if err != nil {
 		errorMessage := err.Error()
 		// Terraform can fail and apply and still need to store it's state.
@@ -440,7 +440,7 @@ func (t *terraform) runTerraformApply(ctx context.Context, terraform *tfexec.Ter
 
 // This couldn't use terraform-exec, because it doesn't support cancellation, and there didn't appear
 // to be a straight-forward way to add it.
-func runApplyCommand(ctx, shutdownCtx context.Context, bin, dir string, stdout io.Writer, env, vars []string) error {
+func runApplyCommand(ctx, shutdownCtx context.Context, transition proto.WorkspaceTransition, bin, dir string, stdout io.Writer, env, vars []string) error {
 	args := []string{
 		"apply",
 		"-no-color",
@@ -449,6 +449,9 @@ func runApplyCommand(ctx, shutdownCtx context.Context, bin, dir string, stdout i
 		"-json",
 		"-refresh=true",
 	}
+	if transition == proto.WorkspaceTransition_DESTROY {
+		args = append(args, "-destroy")
+	}
 	for _, variable := range vars {
 		args = append(args, "-var", variable)
 	}
diff --git a/provisionersdk/proto/provisioner.pb.go b/provisionersdk/proto/provisioner.pb.go
diff --git a/provisionersdk/proto/provisioner.proto b/provisionersdk/proto/provisioner.proto
@@ -109,6 +109,7 @@ message Parse {
 enum WorkspaceTransition {
     START = 0;
     STOP = 1;
+    DESTROY = 2;
 }
 
 // Provision consumes source-code from a directory to produce resources.

Original file line number	Diff line number	Diff line change
`@@ -693,6 +693,8 @@ func convertWorkspaceTransition(transition database.WorkspaceTransition) (sdkpro`
`693`	`693`	`return sdkproto.WorkspaceTransition_START, nil`
`694`	`694`	`case database.WorkspaceTransitionStop:`
`695`	`695`	`return sdkproto.WorkspaceTransition_STOP, nil`
	`696`	`+ case database.WorkspaceTransitionDelete:`
	`697`	`+ return sdkproto.WorkspaceTransition_DESTROY, nil`
`696`	`698`	`default:`
`697`	`699`	`return 0, xerrors.Errorf("unrecognized transition: %q", transition)`
`698`	`700`	`}`
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ message Parse {`
`109`	`109`	`enum WorkspaceTransition {`
`110`	`110`	`START = 0;`
`111`	`111`	`STOP = 1;`
	`112`	`+ DESTROY = 2;`
`112`	`113`	`}`
`113`	`114`
`114`	`115`	`// Provision consumes source-code from a directory to produce resources.`