download-product iginore non-semver compatible versions

We found this as an issue in PKS. It has versions like '1.1.x', which is not parsable by the semver library. So we chose to ignore such versions and give a warning, but continue to parse the rest of versions. The same behavior found in pivnet-resource as well. Signed-off-by: JT Archie <[email protected]>
pivotal-cf · Jan 3, 2019 · 73cf62f · 73cf62f
1 parent 1cab772
commit 73cf62f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/acceptance/configure_product_test.go b/acceptance/configure_product_test.go
@@ -254,7 +254,6 @@ var _ = Describe("configure-product command", func() {
 		_, err = configFile.WriteString(configFileContents)
 		Expect(err).ToNot(HaveOccurred())
 
-
 		command := exec.Command(pathToMain,
 			"--target", server.URL,
 			"--username", "some-username",

diff --git a/commands/download_product.go b/commands/download_product.go
@@ -119,7 +119,8 @@ func (c DownloadProduct) Execute(args []string) error {
 
 			v, err := version.NewVersion(release.Version)
 			if err != nil {
-				return fmt.Errorf("could not parse version: %s: %s", release.Version, err)
+				c.logger.Info(fmt.Sprintf("could not parse version: %s", release.Version))
+				continue
 			}
 			versions = append(versions, v)
 		}
@@ -234,6 +235,7 @@ func (c *DownloadProduct) downloadProductFile(slug, version, glob string) (int,
 	}
 	defer productFile.Close()
 
+	c.logger.Info(fmt.Sprintf("downloading %s...", productFile.Name()))
 	err = c.client.DownloadProductFile(productFile, slug, release.ID, productFileName.ID, c.progressWriter)
 	if err != nil {
 		return release.ID, "", fmt.Errorf("could not download product file %s %s: %s", slug, version, err)

diff --git a/commands/download_product_test.go b/commands/download_product_test.go
@@ -179,6 +179,35 @@ var _ = Describe("DownloadProduct", func() {
 				Expect(fileName).To(BeAnExistingFile())
 				Expect(string(fileContent)).To(MatchJSON(fmt.Sprintf(`{"product_path": "%s", "product_slug": "elastic-runtime" }`, file.Name())))
 			})
+
+			Context("when the releases contains non-semver-compatible version", func() {
+				BeforeEach(func() {
+					fakePivnetDownloader.ReleasesForProductSlugReturns([]pivnet.Release{
+						{
+							ID:      3,
+							Version: "2.1.2",
+						},
+						{
+							ID:      0,
+							Version: "2.0.x",
+						},
+					}, nil)
+				})
+
+				It("ignores the version and prints a warning", func() {
+					err := command.Execute([]string{
+						"--pivnet-api-token", "token",
+						"--pivnet-file-glob", "*.pivotal",
+						"--pivnet-product-slug", "elastic-runtime",
+						"--product-version-regex", `2\..\..*`,
+						"--output-directory", tempDir,
+					})
+					Expect(err).NotTo(HaveOccurred())
+
+					logStr, _ := logger.InfoArgsForCall(0)
+					Expect(logStr).To(Equal("could not parse version: 2.0.x"))
+				})
+			})
 		})
 
 		Context("when the globs returns multiple files", func() {

diff --git a/main.go b/main.go
@@ -134,7 +134,7 @@ func main() {
 	})
 	logWriter := commands.NewLogWriter(os.Stdout)
 	tableWriter := tablewriter.NewWriter(os.Stdout)
-	pivnetLogWriter := logshim.NewLogShim(stdout, stdout, global.Trace)
+	pivnetLogWriter := logshim.NewLogShim(stderr, stderr, global.Trace)
 
 	form := formcontent.NewForm()