import-installation no longer fails when opsman already configured

* this will make the command idempotent [#155197711] Signed-off-by: Kevin Kelani <[email protected]>
pivotal-cf · Feb 13, 2018 · 620df71 · 620df71
1 parent d6ddccf
commit 620df71
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/acceptance/import_installation_test.go b/acceptance/import_installation_test.go
@@ -124,8 +124,8 @@ var _ = Describe("import-installation command", func() {
 			session, err := gexec.Start(command, GinkgoWriter, GinkgoWriter)
 			Expect(err).NotTo(HaveOccurred())
 
-			Eventually(session, 5).Should(gexec.Exit(1))
-			Eventually(session.Err, 5).Should(gbytes.Say("cannot import installation to an Ops Manager that is already configured"))
+			Eventually(session, 5).Should(gexec.Exit(0))
+			Eventually(session.Out, 5).Should(gbytes.Say("Ops Manager is already configured"))
 		})
 	})
 

diff --git a/commands/import_installation.go b/commands/import_installation.go
@@ -1,7 +1,6 @@
 package commands
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/pivotal-cf/jhanda"
@@ -53,7 +52,8 @@ func (ii ImportInstallation) Execute(args []string) error {
 	}
 
 	if ensureAvailabilityOutput.Status != api.EnsureAvailabilityStatusUnstarted {
-		return errors.New("cannot import installation to an Ops Manager that is already configured")
+		ii.logger.Printf("Ops Manager is already configured")
+		return nil
 	}
 
 	ii.logger.Printf("processing installation")

diff --git a/commands/import_installation_test.go b/commands/import_installation_test.go
@@ -128,7 +128,7 @@ var _ = Describe("ImportInstallation", func() {
 	})
 
 	Context("when the Ops Manager is already configured", func() {
-		It("returns an error", func() {
+		It("prints a helpful message", func() {
 			setupService = &fakes.SetupService{}
 			setupService.EnsureAvailabilityReturns(api.EnsureAvailabilityOutput{
 				Status: api.EnsureAvailabilityStatusComplete,
@@ -140,7 +140,10 @@ var _ = Describe("ImportInstallation", func() {
 				"--installation", "/path/to/some-installation",
 				"--decryption-passphrase", "some-passphrase",
 			})
-			Expect(err).To(MatchError(ContainSubstring("cannot import installation to an Ops Manager that is already configured")))
+			Expect(err).NotTo(HaveOccurred())
+
+			format, v := logger.PrintfArgsForCall(0)
+			Expect(fmt.Sprintf(format, v...)).To(Equal("Ops Manager is already configured"))
 			Expect(setupService.EnsureAvailabilityCallCount()).To(Equal(1))
 		})
 	})