do not require --recreate with --recreate-vms-created-before

makes this feature a little nicer to use

Signed-off-by: Nishad Mathur <nishad.mathur@broadcom.com>

Author: mkocher

cmd/deploy.go

@@ -101,6 +101,10 @@ func (c DeployCmd) Run(opts DeployOpts) error {
 		return err
 	}
 
+	if opts.RecreateVMsCreatedBefore.IsSet() {
+		opts.Recreate = true
+	}
+
 	updateOpts := boshdir.UpdateOpts{
 		RecreatePersistentDisks:  opts.RecreatePersistentDisks,
 		Recreate:                 opts.Recreate,

cmd/deploy_test.go

@@ -88,7 +88,23 @@ var _ = Describe("DeployCmd", func() {
 			}))
 		})
 
-		It("deploys manifest allowing to recreate VMs created before a timestamp", func() {
+		It("deploys manifest allowing to recreate VMs created before a timestamp and automatically sets recreate", func() {
+			deployOpts.RecreateVMsCreatedBefore = opts.TimeArg{Time: time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)}
+
+			err := act()
+			Expect(err).ToNot(HaveOccurred())
+
+			Expect(deployment.UpdateCallCount()).To(Equal(1))
+
+			bytes, updateOpts := deployment.UpdateArgsForCall(0)
+			Expect(bytes).To(Equal([]byte("name: dep\n")))
+			Expect(updateOpts).To(Equal(boshdir.UpdateOpts{
+				Recreate:                 true,
+				RecreateVMsCreatedBefore: time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC),
+			}))
+		})
+
+		It("deploys manifest with both recreate and recreate-vms-created-before set explicitly", func() {
 			deployOpts.Recreate = true
 			deployOpts.RecreateVMsCreatedBefore = opts.TimeArg{Time: time.Date(2026, 1, 1, 0, 0, 0, 0, time.UTC)}
 

cmd/opts/opts.go

@@ -505,7 +505,7 @@ type DeployOpts struct {
 
 	Recreate                 bool                `long:"recreate"                                description:"Recreate all VMs in deployment"`
 	RecreatePersistentDisks  bool                `long:"recreate-persistent-disks"               description:"Recreate all persistent disks in deployment"`
-	RecreateVMsCreatedBefore TimeArg             `long:"recreate-vms-created-before"             description:"Only recreate VMs created before the given RFC 3339 timestamp (requires --recreate)"`
+	RecreateVMsCreatedBefore TimeArg             `long:"recreate-vms-created-before"             description:"Only recreate VMs created before the given RFC 3339 timestamp"`
 	Fix                      bool                `long:"fix"                                     description:"Recreate an instance with an unresponsive agent instead of erroring"`
 	FixReleases              bool                `long:"fix-releases"                            description:"Reupload releases in manifest and replace corrupt or missing jobs/packages"`
 	SkipDrain                []boshdir.SkipDrain `long:"skip-drain" value-name:"[INSTANCE-GROUP[/INSTANCE-ID]]"  description:"Skip running drain and pre-stop scripts for specific instance groups" optional:"true" optional-value:"*"`