fix(download): Download newest build (#17)

* when multiple builds are available for a given version, the oldest was selected
* mostly (only?) relevant for internal builds (e.g. master)

Card: [869adut7a](https://app.clickup.com/t/869adut7a)

Author: NautiluX

cli/cmd/testdata/testcli.tar.gz

@@ -45,9 +45,9 @@ func AddUpdateCmd(rootCmd *cobra.Command) {
 func (c *UpdateCmd) SelfUpdate(p portal.Portal) error {
 	currentVersion := semver.MustParse(c.Version.Version())
 
-	latest, err := p.GetLatestBuild(portal.OmsProduct)
+	latest, err := p.GetLatestBuild(portal.OmsProduct, "")
 	if err != nil {
-		return fmt.Errorf("failed to OMS Portal for latest version: %w", err)
+		return fmt.Errorf("failed to query OMS Portal for latest version: %w", err)
 	}
 	latestVersion := semver.MustParse(strings.TrimPrefix(latest.Version, "oms-v"))
 

cli/cmd/update.go

@@ -63,7 +63,7 @@ var _ = Describe("Update", func() {
 			mockVersion.EXPECT().Arch().Return("fakearch")
 			mockVersion.EXPECT().Version().Return("0.0.0")
 			mockVersion.EXPECT().Os().Return("fakeos")
-			mockPortal.EXPECT().GetLatestBuild(portal.OmsProduct).Return(latestBuild, nil)
+			mockPortal.EXPECT().GetLatestBuild(portal.OmsProduct, "").Return(latestBuild, nil)
 			mockPortal.EXPECT().DownloadBuildArtifact(portal.OmsProduct, buildToDownload, mock.Anything).RunAndReturn(
 				func(product portal.Product, build portal.Build, file io.Writer) error {
 					embeddedFile, err := testdata.Open("testdata/testcli.tar.gz")
@@ -90,7 +90,7 @@ var _ = Describe("Update", func() {
 
 		It("Detects when current verison is latest version", func() {
 			mockVersion.EXPECT().Version().Return(latestBuild.Version)
-			mockPortal.EXPECT().GetLatestBuild(portal.OmsProduct).Return(latestBuild, nil)
+			mockPortal.EXPECT().GetLatestBuild(portal.OmsProduct, "").Return(latestBuild, nil)
 			err := c.SelfUpdate(mockPortal)
 			Expect(err).NotTo(HaveOccurred())
 		})

cli/cmd/update_test.go

@@ -17,7 +17,7 @@ import (
 
 type Portal interface {
 	DownloadBuildArtifact(product Product, build Build, file io.Writer) error
-	GetLatestBuild(product Product) (Build, error)
+	GetLatestBuild(product Product, version string) (Build, error)
 }
 
 type PortalClient struct {
@@ -122,18 +122,12 @@ func (c *PortalClient) ListBuilds(product Product) (availablePackages Builds, er
 }
 
 func (c *PortalClient) GetCodesphereBuildByVersion(version string) (Build, error) {
-	packages, err := c.ListBuilds(CodesphereProduct)
+	latestBuild, err := c.GetLatestBuild(CodesphereProduct, version)
 	if err != nil {
-		return Build{}, fmt.Errorf("failed to list Codesphere packages: %w", err)
+		return Build{}, fmt.Errorf("failed to get latest build for version %s: %w", version, err)
 	}
 
-	for _, build := range packages.Builds {
-		if build.Version == version {
-			return build, nil
-		}
-	}
-
-	return Build{}, fmt.Errorf("version %s not found", version)
+	return latestBuild, nil
 }
 
 func compareBuilds(l, r Build) int {
@@ -170,7 +164,7 @@ func (c *PortalClient) DownloadBuildArtifact(product Product, build Build, file
 	return nil
 }
 
-func (c *PortalClient) GetLatestBuild(product Product) (Build, error) {
+func (c *PortalClient) GetLatestBuild(product Product, version string) (Build, error) {
 	packages, err := c.ListBuilds(product)
 	if err != nil {
 		return Build{}, fmt.Errorf("failed to list %s packages: %w", product, err)
@@ -180,8 +174,24 @@ func (c *PortalClient) GetLatestBuild(product Product) (Build, error) {
 		return Build{}, errors.New("no builds returned")
 	}
 
-	// Builds are always ordered by date, newest build is latest version
-	return packages.Builds[len(packages.Builds)-1], nil
+	if version == "" {
+		return packages.Builds[len(packages.Builds)-1], nil
+	}
+
+	matchingPackages := []Build{}
+	for _, build := range packages.Builds {
+		if build.Version == version {
+			// Builds are always ordered by date, newest build is latest version
+			matchingPackages = append(matchingPackages, build)
+		}
+	}
+
+	if len(matchingPackages) == 0 {
+		return Build{}, fmt.Errorf("version %s not found", version)
+	}
+
+	// Builds are always ordered by date, return newest build
+	return matchingPackages[len(matchingPackages)-1], nil
 }
 
 // WriteCounter is a custom io.Writer that counts bytes written and logs progress.

internal/portal/http.go

@@ -195,7 +195,7 @@ var _ = Describe("PortalClient", func() {
 			It("returns an error and an empty build", func() {
 				expectedResult := portal.Build{}
 				packages, err := client.GetCodesphereBuildByVersion("1.42.3")
-				Expect(err).To(MatchError("version 1.42.3 not found"))
+				Expect(err.Error()).To(MatchRegexp(".*version 1.42.3 not found"))
 				Expect(packages).To(Equal(expectedResult))
 				Expect(getUrl.String()).To(Equal("fake-portal.com/packages/codesphere"))
 			})
@@ -278,7 +278,7 @@ var _ = Describe("PortalClient", func() {
 					Date:    lastBuild,
 					Version: "1.42.1",
 				}
-				packages, err := client.GetLatestBuild(portal.OmsProduct)
+				packages, err := client.GetLatestBuild(portal.OmsProduct, "")
 				Expect(err).NotTo(HaveOccurred())
 				Expect(packages).To(Equal(expectedResult))
 				Expect(getUrl.String()).To(Equal("fake-portal.com/packages/oms"))
@@ -296,7 +296,7 @@ var _ = Describe("PortalClient", func() {
 			})
 			It("returns an error and an empty build", func() {
 				expectedResult := portal.Build{}
-				packages, err := client.GetLatestBuild(portal.OmsProduct)
+				packages, err := client.GetLatestBuild(portal.OmsProduct, "")
 				Expect(err).To(MatchError("no builds returned"))
 				Expect(packages).To(Equal(expectedResult))
 				Expect(getUrl.String()).To(Equal("fake-portal.com/packages/oms"))