Add --recreate-persistent-disks bosh deploy flag

[#158014878](https://www.pivotaltracker.com/story/show/158014878)

Signed-off-by: Joshua Aresty <joshua.aresty@emc.com>

cmd/deploy.go

@@ -58,13 +58,14 @@ func (c DeployCmd) Run(opts DeployOpts) error {
 	}
 
 	updateOpts := boshdir.UpdateOpts{
-		Recreate:    opts.Recreate,
-		Fix:         opts.Fix,
-		SkipDrain:   opts.SkipDrain,
-		DryRun:      opts.DryRun,
-		Canaries:    opts.Canaries,
-		MaxInFlight: opts.MaxInFlight,
-		Diff:        deploymentDiff,
+		RecreatePersistentDisks: opts.RecreatePersistentDisks,
+		Recreate:                opts.Recreate,
+		Fix:                     opts.Fix,
+		SkipDrain:               opts.SkipDrain,
+		DryRun:                  opts.DryRun,
+		Canaries:                opts.Canaries,
+		MaxInFlight:             opts.MaxInFlight,
+		Diff:                    deploymentDiff,
 	}
 
 	return c.deployment.Update(bytes, updateOpts)

cmd/deploy_test.go

@@ -62,7 +62,8 @@ var _ = Describe("DeployCmd", func() {
 			Expect(updateOpts).To(Equal(boshdir.UpdateOpts{}))
 		})
 
-		It("deploys manifest allowing to recreate, fix, and skip drain", func() {
+		It("deploys manifest allowing to recreate, recreate persistent disks, fix, and skip drain", func() {
+			opts.RecreatePersistentDisks = true
 			opts.Recreate = true
 			opts.Fix = true
 			opts.SkipDrain = boshdir.SkipDrains{boshdir.SkipDrain{All: true}}
@@ -75,9 +76,10 @@ var _ = Describe("DeployCmd", func() {
 			bytes, updateOpts := deployment.UpdateArgsForCall(0)
 			Expect(bytes).To(Equal([]byte("name: dep\n")))
 			Expect(updateOpts).To(Equal(boshdir.UpdateOpts{
-				Recreate:  true,
-				Fix:       true,
-				SkipDrain: boshdir.SkipDrains{boshdir.SkipDrain{All: true}},
+				RecreatePersistentDisks: true,
+				Recreate:                true,
+				Fix:                     true,
+				SkipDrain:               boshdir.SkipDrains{boshdir.SkipDrain{All: true}},
 			}))
 		})
 

cmd/opts.go

@@ -434,9 +434,10 @@ type DeployOpts struct {
 
 	NoRedact bool `long:"no-redact" description:"Show non-redacted manifest diff"`
 
-	Recreate  bool                `long:"recreate"                          description:"Recreate all VMs in deployment"`
-	Fix       bool                `long:"fix"                               description:"Recreate unresponsive instances"`
-	SkipDrain []boshdir.SkipDrain `long:"skip-drain" value-name:"INSTANCE-GROUP"  description:"Skip running drain scripts for specific instance groups" optional:"true" optional-value:"*"`
+	Recreate                bool                `long:"recreate"                                description:"Recreate all VMs in deployment"`
+	RecreatePersistentDisks bool                `long:"recreate-persistent-disks"               description:"Recreate all persistent disks in deployment"`
+	Fix                     bool                `long:"fix"                                     description:"Recreate unresponsive instances"`
+	SkipDrain               []boshdir.SkipDrain `long:"skip-drain" value-name:"INSTANCE-GROUP"  description:"Skip running drain scripts for specific instance groups" optional:"true" optional-value:"*"`
 
 	Canaries    string `long:"canaries" description:"Override manifest values for canaries"`
 	MaxInFlight string `long:"max-in-flight" description:"Override manifest values for max_in_flight"`

cmd/opts_test.go

@@ -1368,6 +1368,14 @@ var _ = Describe("Opts", func() {
 			})
 		})
 
+		Describe("RecreatePersistentDisks", func() {
+			It("contains desired values", func() {
+				Expect(getStructTagForName("RecreatePersistentDisks", opts)).To(Equal(
+					`long:"recreate-persistent-disks" description:"Recreate all persistent disks in deployment"`,
+				))
+			})
+		})
+
 		Describe("NoRedact", func() {
 			It("contains desired values", func() {
 				Expect(getStructTagForName("NoRedact", opts)).To(Equal(

director/deployment.go

@@ -475,6 +475,10 @@ func (c Client) UpdateDeployment(manifest []byte, opts UpdateOpts) error {
 		query.Add("recreate", "true")
 	}
 
+	if opts.RecreatePersistentDisks {
+		query.Add("recreate_persistent_disks", "true")
+	}
+
 	if opts.Fix {
 		query.Add("fix", "true")
 	}

director/deployment_test.go

@@ -676,10 +676,10 @@ var _ = Describe("Deployment", func() {
 			Expect(err).ToNot(HaveOccurred())
 		})
 
-		It("succeeds updating deployment with recreate, fix and skip drain flags", func() {
+		It("succeeds updating deployment with recreate, recreate_persistent_disks, fix and skip drain flags", func() {
 			ConfigureTaskResult(
 				ghttp.CombineHandlers(
-					ghttp.VerifyRequest("POST", "/deployments", "recreate=true&fix=true&skip_drain=*"),
+					ghttp.VerifyRequest("POST", "/deployments", "recreate=true&recreate_persistent_disks=true&fix=true&skip_drain=*"),
 					ghttp.VerifyBasicAuth("username", "password"),
 					ghttp.VerifyHeader(http.Header{
 						"Content-Type": []string{"text/yaml"},
@@ -691,9 +691,10 @@ var _ = Describe("Deployment", func() {
 			)
 
 			updateOpts := UpdateOpts{
-				Recreate:  true,
-				Fix:       true,
-				SkipDrain: SkipDrains{SkipDrain{All: true}},
+				RecreatePersistentDisks: true,
+				Recreate:                true,
+				Fix:                     true,
+				SkipDrain:               SkipDrains{SkipDrain{All: true}},
 			}
 			err := deployment.Update([]byte("manifest"), updateOpts)
 			Expect(err).ToNot(HaveOccurred())

director/interfaces.go

@@ -189,13 +189,14 @@ type RecreateOpts struct {
 }
 
 type UpdateOpts struct {
-	Recreate    bool
-	Fix         bool
-	SkipDrain   SkipDrains
-	Canaries    string
-	MaxInFlight string
-	DryRun      bool
-	Diff        DeploymentDiff
+	Recreate                bool
+	RecreatePersistentDisks bool
+	Fix                     bool
+	SkipDrain               SkipDrains
+	Canaries                string
+	MaxInFlight             string
+	DryRun                  bool
+	Diff                    DeploymentDiff
 }
 
 //go:generate counterfeiter . ReleaseSeries