Change vm-resurrection -> update-resurrection

Signed-off-by: Danny Berger <dberger@pivotal.io>

Author: zaksoup

cmd/cmd.go

@@ -214,8 +214,8 @@ func (c Cmd) Execute() (cmdErr error) {
 	case *InstancesOpts:
 		return NewInstancesCmd(deps.UI, c.deployment()).Run(*opts)
 
-	case *VMResurrectionOpts:
-		return NewVMResurrectionCmd(c.director()).Run(*opts)
+	case *UpdateResurrectionOpts:
+		return NewUpdateResurrectionCmd(c.director()).Run(*opts)
 
 	case *DeployOpts:
 		director, deployment := c.directorAndDeployment()

cmd/factory_test.go

@@ -78,24 +78,24 @@ var _ = Describe("Factory", func() {
 			"delete-snapshots":      []string{},
 			"instances":             []string{},
 			"vms":                   []string{},
-			"vm-resurrection":       []string{"off"},
-			"cloud-check":           []string{},
-			"logs":                  []string{"slug"},
-			"start":                 []string{"slug"},
-			"stop":                  []string{"slug"},
-			"restart":               []string{"slug"},
-			"recreate":              []string{"slug"},
-			"init-release":          []string{},
-			"reset-release":         []string{},
-			"generate-job":          []string{"/file"},
-			"generate-package":      []string{"/file"},
-			"create-release":        []string{"/file"},
-			"finalize-release":      []string{"/file"},
-			"blobs":                 []string{},
-			"add-blob":              []string{"/file", "directory"},
-			"remove-blob":           []string{"/file"},
-			"sync-blobs":            []string{},
-			"upload-blobs":          []string{},
+			"update-resurrection": []string{"off"},
+			"cloud-check":         []string{},
+			"logs":                []string{"slug"},
+			"start":               []string{"slug"},
+			"stop":                []string{"slug"},
+			"restart":             []string{"slug"},
+			"recreate":            []string{"slug"},
+			"init-release":        []string{},
+			"reset-release":       []string{},
+			"generate-job":        []string{"/file"},
+			"generate-package":    []string{"/file"},
+			"create-release":      []string{"/file"},
+			"finalize-release":    []string{"/file"},
+			"blobs":               []string{},
+			"add-blob":            []string{"/file", "directory"},
+			"remove-blob":         []string{"/file"},
+			"sync-blobs":          []string{},
+			"upload-blobs":        []string{},
 		}
 
 		for cmd, requiredArgs := range cmds {

cmd/opts.go

@@ -101,10 +101,10 @@ type BoshOpts struct {
 	DeleteSnapshots DeleteSnapshotsOpts `command:"delete-snapshots" alias:"delsnaps" description:"Delete all snapshots in a deployment"`
 
 	// Instances
-	Instances      InstancesOpts      `command:"instances"       alias:"is" alias:"ins"         description:"List all instances in a deployment"`
-	VMs            VMsOpts            `command:"vms"                                            description:"List all VMs in all deployments"`
-	VMResurrection VMResurrectionOpts `command:"vm-resurrection" alias:"vmr"                    description:"Enable/disable resurrection for a given VM"`
-	CloudCheck     CloudCheckOpts     `command:"cloud-check"     alias:"cck" alias:"cloudcheck" description:"Cloud consistency check and interactive repair"`
+	Instances          InstancesOpts          `command:"instances"       alias:"is" alias:"ins"         description:"List all instances in a deployment"`
+	VMs                VMsOpts                `command:"vms"                                            description:"List all VMs in all deployments"`
+	UpdateResurrection UpdateResurrectionOpts `command:"update-resurrection"                            description:"Enable/disable resurrection"`
+	CloudCheck         CloudCheckOpts         `command:"cloud-check"     alias:"cck" alias:"cloudcheck" description:"Cloud consistency check and interactive repair"`
 
 	// Instance management
 	Logs     LogsOpts     `command:"logs"     description:"Fetch logs from instance(s)"`
@@ -524,12 +524,12 @@ type CloudCheckOpts struct {
 }
 
 // Instance management
-type VMResurrectionOpts struct {
-	Args VMResurrectionArgs `positional-args:"true" required:"true"`
+type UpdateResurrectionOpts struct {
+	Args UpdateResurrectionArgs `positional-args:"true" required:"true"`
 	cmd
 }
 
-type VMResurrectionArgs struct {
+type UpdateResurrectionArgs struct {
 	Enabled BoolArg `positional-arg-name:"on|off"`
 }
 

cmd/opts_test.go

@@ -511,10 +511,10 @@ var _ = Describe("Opts", func() {
 				})
 			})
 
-			Describe("VMResurrection", func() {
+			Describe("UpdateResurrection", func() {
 				It("contains desired values", func() {
-					Expect(getStructTagForName("VMResurrection", opts)).To(Equal(
-						`command:"vm-resurrection" alias:"vmr"                    description:"Enable/disable resurrection for a given VM"`,
+					Expect(getStructTagForName("UpdateResurrection", opts)).To(Equal(
+						`command:"update-resurrection"                            description:"Enable/disable resurrection"`,
 					))
 				})
 			})
@@ -1960,11 +1960,11 @@ var _ = Describe("Opts", func() {
 		})
 	})
 
-	Describe("VMResurrectionOpts", func() {
-		var opts *VMResurrectionOpts
+	Describe("UpdateResurrectionOpts", func() {
+		var opts *UpdateResurrectionOpts
 
 		BeforeEach(func() {
-			opts = &VMResurrectionOpts{}
+			opts = &UpdateResurrectionOpts{}
 		})
 
 		Describe("Tags (these are used by go flags)", func() {
@@ -1980,11 +1980,11 @@ var _ = Describe("Opts", func() {
 		})
 	})
 
-	Describe("VMResurrectionArgs", func() {
-		var opts *VMResurrectionArgs
+	Describe("UpdateResurrectionArgs", func() {
+		var opts *UpdateResurrectionArgs
 
 		BeforeEach(func() {
-			opts = &VMResurrectionArgs{}
+			opts = &UpdateResurrectionArgs{}
 		})
 
 		Describe("Tags (these are used by go flags)", func() {

cmd/update_resurrection.go

@@ -0,0 +1,17 @@
+package cmd
+
+import (
+	boshdir "github.com/cloudfoundry/bosh-cli/director"
+)
+
+type UpdateResurrectionCmd struct {
+	director boshdir.Director
+}
+
+func NewUpdateResurrectionCmd(director boshdir.Director) UpdateResurrectionCmd {
+	return UpdateResurrectionCmd{director: director}
+}
+
+func (c UpdateResurrectionCmd) Run(opts UpdateResurrectionOpts) error {
+	return c.director.EnableResurrection(bool(opts.Args.Enabled))
+}

cmd/vm_resurrection_test.go cmd/update_resurrection_test.gocmd/vm_resurrection_test.go renamed to cmd/update_resurrection_test.go

@@ -10,24 +10,24 @@ import (
 	fakedir "github.com/cloudfoundry/bosh-cli/director/fakes"
 )
 
-var _ = Describe("VMResurrectionCmd", func() {
+var _ = Describe("UpdateResurrectionCmd", func() {
 	var (
 		director *fakedir.FakeDirector
-		command  VMResurrectionCmd
+		command  UpdateResurrectionCmd
 	)
 
 	BeforeEach(func() {
 		director = &fakedir.FakeDirector{}
-		command = NewVMResurrectionCmd(director)
+		command = NewUpdateResurrectionCmd(director)
 	})
 
 	Describe("Run", func() {
 		var (
-			opts VMResurrectionOpts
+			opts UpdateResurrectionOpts
 		)
 
 		BeforeEach(func() {
-			opts = VMResurrectionOpts{}
+			opts = UpdateResurrectionOpts{}
 		})
 
 		act := func() error { return command.Run(opts) }