update uninstall to use InstallOpts from rebase

internal/cli/uninstall.go

@@ -1,7 +1,9 @@
 package cli
 
 import (
+ "fmt"
  "strings"
+ "time"
 
  "github.com/posener/complete"
 
@@ -14,16 +16,16 @@ import (
 type UninstallCommand struct {
  *baseCommand
 
- platform string
- snapshotPath  string
- skipSnapshot bool
- flagConfirm bool
- deleteContext bool
+ platform  string
+ snapshotFilename string
+ skipSnapshot  bool
+ flagConfirm  bool
+ deleteContext  bool
 }
 
 func (c *UninstallCommand) Run(args []string) int {
  ctx := c.Ctx
- log := c.Log.Named("install")
+ log := c.Log.Named("uninstall")
  defer c.Close()
 
  // Initialize. If we fail, we just exit since Init handles the UI.
@@ -67,9 +69,16 @@ func (c *UninstallCommand) Run(args []string) int {
  if !c.skipSnapshot {
  s.Update("Generating server snapshot...")
  defer s.Abort()
- // sn := fmt.Sprintf("%s-%d", c.snapshotPath, time.Now().Unix())
  // generate snapshot
- // s.Update("Snapshot %q generated", sn")
+ // config := snapshot.Config{
+ // Client: c.project.Client(),
+ // }
+ // w, err := os.Create(c.snapshotFilename)
+ // if err = config.WriteSnapshot(ctx, w); err != nil {
+ // fmt.Fprintf(os.Stderr, "Error generating snapshot: %s", err)
+ // return 1
+ // }
+ // s.Update("Snapshot %q generated", c.snapshotFilename)
  } else {
  s.Update("skip-snapshot set; not generating server snapshot")
  s.Status(terminal.StatusWarn)
@@ -88,7 +97,10 @@ func (c *UninstallCommand) Run(args []string) int {
  return 1
  }
 
- err = p.Uninstall(ctx, c.ui, log)
+ err = p.Uninstall(ctx, &serverinstall.InstallOpts{
+ Log: log,
+ UI: c.ui,
+ })
  if err != nil {
  // point to current docs on manual server cleanup
  c.ui.Output(
@@ -157,10 +169,10 @@ func (c *UninstallCommand) Flags() *flag.Sets {
  })
 
  f.StringVar(&flag.StringVar{
- Name: "snapshot-path",
- Target: &c.snapshotPath,
- Default: "",
- Usage: "Path of the file to write the snapshot to.",
+ Name: "snapshot-filename",
+ Target: &c.snapshotFilename,
+ Default: fmt.Sprintf("sever-snapshot-%d", time.Now().Unix()),
+ Usage: "Filename to write the snapshot to.",
  })
 
  f.BoolVar(&flag.BoolVar{

internal/serverinstall/docker.go

@@ -327,9 +327,10 @@ func (i *DockerInstaller) InstallFlags(set *flag.Set) {
 }
 
 func (i *DockerInstaller) Uninstall(
- ctx context.Context, ui terminal.UI, log hclog.Logger,
+ ctx context.Context,
+ opts *InstallOpts,
 ) error {
- sg := ui.StepGroup()
+ sg := opts.UI.StepGroup()
  defer sg.Wait()
 
  // bulk of this copied from PR#660

internal/serverinstall/k8s.go

@@ -633,8 +633,8 @@ func (i *K8sInstaller) InstallFlags(set *flag.Set) {
  })
 }
 
-func (i *K8sInstaller) Uninstall(ctx context.Context, ui terminal.UI, log hclog.Logger) error {
-
+func (i *K8sInstaller) Uninstall(ctx context.Context, opts *InstallOpts) error {
+ // TODO
  // deleteStatefulSet()
  // delete pvc
  // delete svc

internal/serverinstall/nomad.go

@@ -330,7 +330,8 @@ func (i *NomadInstaller) InstallFlags(set *flag.Set) {
  })
 }
 
-func (i *NomadInstaller) Uninstall(ctx context.Context, ui terminal.UI, log hclog.Logger) error {
+func (i *NomadInstaller) Uninstall(ctx context.Context, opts *InstallOpts) error {
+ // TODO
  return nil
 }
 

internal/serverinstall/serverinstall.go

@@ -24,7 +24,13 @@ type Installer interface {
  // specify flags for the install CLI. The flags should be prefixed with
  // the platform name to avoid conflicts with other flags.
  InstallFlags(*flag.Set)
- Uninstall(context.Context, terminal.UI, hclog.Logger) error
+
+ // Uninstall expects the Waypoint server to be uninstalled.
+ Uninstall(context.Context, *InstallOpts) error
+
+ // UninstallFlags is called prior to Uninstall and allows the Uninstaller to
+ // specify flags for the uninstall CLI. The flags should be prefixed with the
+ // platform name to avoid conflicts with other flags.
  UninstallFlags(*flag.Set)
 }