feat(auto-update): Add update command

.mockery.yml

@@ -26,3 +26,11 @@ packages:
     config:
       all: true
     interfaces:
+  github.com/codesphere-cloud/oms/internal/version:
+    config:
+      all: true
+    interfaces:
+  github.com/codesphere-cloud/oms/cli/cmd:
+    config:
+      all: true
+    interfaces:

Makefile

@@ -33,3 +33,8 @@ endif
 generate: install-build-deps
 	mockery
 	go generate ./...
+
+VERSION ?= "0.0.0"
+release-local:
+	rm -rf dist
+	/bin/bash -c "goreleaser --skip=validate,announce,publish -f <(sed s/{{.Version}}/$(VERSION)/g < .goreleaser.yaml)"

cli/cmd/download_package.go

@@ -61,27 +61,21 @@ func AddDownloadPackageCmd(download *cobra.Command, opts GlobalOptions) {
 	pkg.cmd.RunE = pkg.RunE
 }
 
-func (c *DownloadPackageCmd) DownloadBuild(p portal.Portal, build portal.CodesphereBuild, filename string) error {
-	for _, art := range build.Artifacts {
-		if art.Filename == filename {
-			fullFilename := build.Version + "-" + art.Filename
-			out, err := c.FileWriter.Create(fullFilename)
-			if err != nil {
-				return fmt.Errorf("failed to create file %s: %w", fullFilename, err)
-			}
-			defer func() { _ = out.Close() }()
-
-			buildWithArtifact := build
-			buildWithArtifact.Artifacts = []portal.Artifact{art}
-
-			err = p.DownloadBuildArtifact(buildWithArtifact, out)
-			if err != nil {
-				return fmt.Errorf("failed to download build: %w", err)
-			}
-			return nil
-		}
-
+func (c *DownloadPackageCmd) DownloadBuild(p portal.Portal, build portal.Build, filename string) error {
+	download, err := build.GetBuildForDownload(filename)
+	if err != nil {
+		return fmt.Errorf("failed to find artifact in package: %w", err)
 	}
+	fullFilename := build.Version + "-" + filename
+	out, err := c.FileWriter.Create(fullFilename)
+	if err != nil {
+		return fmt.Errorf("failed to create file %s: %w", fullFilename, err)
+	}
+	defer func() { _ = out.Close() }()
 
-	return fmt.Errorf("can't find artifact %s in version %s", filename, build.Version)
+	err = p.DownloadBuildArtifact("codesphere", download, out)
+	if err != nil {
+		return fmt.Errorf("failed to download build: %w", err)
+	}
+	return nil
 }

cli/cmd/download_package_test.go

@@ -18,7 +18,7 @@ var _ = Describe("ListPackages", func() {
 		c              cmd.DownloadPackageCmd
 		filename       string
 		version        string
-		build          portal.CodesphereBuild
+		build          portal.Build
 		mockPortal     *portal.MockPortal
 		mockFileWriter *util.MockFileWriter
 	)
@@ -36,7 +36,7 @@ var _ = Describe("ListPackages", func() {
 			},
 			FileWriter: mockFileWriter,
 		}
-		build = portal.CodesphereBuild{
+		build = portal.Build{
 			Version: version,
 			Artifacts: []portal.Artifact{
 				{Filename: filename},
@@ -51,7 +51,7 @@ var _ = Describe("ListPackages", func() {
 
 	Context("File exists", func() {
 		It("Downloads the correct artifact to the correct output file", func() {
-			expectedBuildToDownload := portal.CodesphereBuild{
+			expectedBuildToDownload := portal.Build{
 				Version: version,
 				Artifacts: []portal.Artifact{
 					{Filename: filename},
@@ -60,7 +60,7 @@ var _ = Describe("ListPackages", func() {
 
 			fakeFile := os.NewFile(uintptr(0), filename)
 			mockFileWriter.EXPECT().Create(version+"-"+filename).Return(fakeFile, nil)
-			mockPortal.EXPECT().DownloadBuildArtifact(expectedBuildToDownload, mock.Anything).Return(nil)
+			mockPortal.EXPECT().DownloadBuildArtifact(portal.CodesphereProduct, expectedBuildToDownload, mock.Anything).Return(nil)
 			err := c.DownloadBuild(mockPortal, build, filename)
 			Expect(err).NotTo(HaveOccurred())
 		})
@@ -69,7 +69,7 @@ var _ = Describe("ListPackages", func() {
 	Context("File doesn't exist in build", func() {
 		It("Returns an error", func() {
 			err := c.DownloadBuild(mockPortal, build, "installer-lite.tar.gz")
-			Expect(err).To(MatchError("can't find artifact installer-lite.tar.gz in version " + version))
+			Expect(err).To(MatchError("failed to find artifact in package: artifact not found: installer-lite.tar.gz"))
 		})
 	})
 })

cli/cmd/list_packages.go

@@ -24,7 +24,7 @@ type ListBuildsOpts struct {
 
 func (c *ListBuildsCmd) RunE(_ *cobra.Command, args []string) error {
 	p := portal.NewPortalClient()
-	packages, err := p.ListCodesphereBuilds()
+	packages, err := p.ListBuilds(portal.CodesphereProduct)
 	if err != nil {
 		return fmt.Errorf("failed to list codesphere packages: %w", err)
 	}
@@ -51,7 +51,7 @@ func AddListPackagesCmd(list *cobra.Command, opts GlobalOptions) {
 	list.AddCommand(builds.cmd)
 }
 
-func (c *ListBuildsCmd) PrintPackagesTable(packages portal.CodesphereBuilds) {
+func (c *ListBuildsCmd) PrintPackagesTable(packages portal.Builds) {
 	c.TableWriter.AppendHeader(table.Row{"Int", "Version", "Build Date", "Hash", "Artifacts"})
 
 	for _, build := range packages.Builds {

cli/cmd/list_packages_test.go

@@ -43,8 +43,8 @@ var _ = Describe("ListPackages", func() {
 				table.Row{"", "1.42", buildDate, "externalBuild", "installer.tar, installer2.tar"},
 			)
 			c.PrintPackagesTable(
-				portal.CodesphereBuilds{
-					Builds: []portal.CodesphereBuild{
+				portal.Builds{
+					Builds: []portal.Build{
 						{
 							Hash:     "externalBuild",
 							Version:  "1.42",
@@ -76,8 +76,8 @@ var _ = Describe("ListPackages", func() {
 				table.Row{"*", "master", buildDate, "internalBuild", "installer.tar, installer2.tar"},
 			)
 			c.PrintPackagesTable(
-				portal.CodesphereBuilds{
-					Builds: []portal.CodesphereBuild{
+				portal.Builds{
+					Builds: []portal.Build{
 						{
 							Hash:     "externalBuild",
 							Version:  "1.42",

cli/cmd/root.go

@@ -27,6 +27,7 @@ func Execute() {
 			like downloading new versions.`),
 	}
 	AddVersionCmd(rootCmd)
+	AddUpdateCmd(rootCmd)
 	AddListCmd(rootCmd, opts)
 	AddDownloadCmd(rootCmd, opts)
 

cli/cmd/update.go

@@ -0,0 +1,111 @@
+package cmd
+
+import (
+	"fmt"
+	"golang.org/x/sync/errgroup"
+	"io"
+	"strings"
+
+	"github.com/blang/semver"
+	"github.com/inconshreveable/go-update"
+	"github.com/spf13/cobra"
+
+	"github.com/codesphere-cloud/oms/internal/portal"
+	"github.com/codesphere-cloud/oms/internal/util"
+	"github.com/codesphere-cloud/oms/internal/version"
+)
+
+type UpdateCmd struct {
+	cmd     *cobra.Command
+	Version version.Version
+	Updater Updater
+}
+
+func (c *UpdateCmd) RunE(_ *cobra.Command, args []string) error {
+
+	p := portal.NewPortalClient()
+
+	return c.SelfUpdate(p)
+}
+
+func AddUpdateCmd(rootCmd *cobra.Command) {
+	update := UpdateCmd{
+		cmd: &cobra.Command{
+			Use:   "update",
+			Short: "Update Codesphere OMS",
+			Long:  `Updates the OMS to the latest release from OMS Portal.`,
+		},
+		Version: &version.Build{},
+		Updater: &SelfUpdater{},
+	}
+	rootCmd.AddCommand(update.cmd)
+	update.cmd.RunE = update.RunE
+}
+
+func (c *UpdateCmd) SelfUpdate(p portal.Portal) error {
+	currentVersion := semver.MustParse(c.Version.Version())
+
+	latest, err := p.GetLatestBuild(portal.OmsProduct)
+	if err != nil {
+		return fmt.Errorf("failed to OMS Portal for latest version: %w", err)
+	}
+	latestVersion := semver.MustParse(strings.TrimPrefix(latest.Version, "oms-v"))
+
+	fmt.Printf("current version: %v\n", currentVersion)
+	fmt.Printf("latest version: %v\n", latestVersion)
+	if latestVersion.Equals(currentVersion) {
+		fmt.Println("Current OMS CLI is already the latest version", c.Version.Version())
+		return nil
+	}
+
+	// Need a build with a single artifact to download it
+	download, err := latest.GetBuildForDownload(fmt.Sprintf("%s_%s.tar.gz", c.Version.Os(), c.Version.Arch()))
+	if err != nil {
+		return fmt.Errorf("failed to find OMS CLI in package: %w", err)
+	}
+
+	// Use a pipe to unzip the file while downloading without storing on the filesystem
+	reader, writer := io.Pipe()
+	defer func() { _ = reader.Close() }()
+
+	eg := errgroup.Group{}
+	eg.Go(func() error {
+		defer func() { _ = writer.Close() }()
+		err = p.DownloadBuildArtifact(portal.OmsProduct, download, writer)
+		if err != nil {
+			return fmt.Errorf("failed to download latest OMS package: %w", err)
+		}
+		return nil
+	})
+
+	cliReader, err := util.StreamFileFromGzip(reader, "oms-cli")
+	if err != nil {
+		return fmt.Errorf("failed to extract binary from archive: %w", err)
+	}
+
+	err = c.Updater.Apply(cliReader)
+	if err != nil {
+		return fmt.Errorf("failed to apply update: %w", err)
+	}
+
+	_, _ = io.Copy(io.Discard, reader)
+
+	// Wait for download to finish and handle any error from the go routine
+	err = eg.Wait()
+	if err != nil {
+		return err
+	}
+
+	fmt.Println("Update finished successfully.")
+	return nil
+}
+
+type Updater interface {
+	Apply(update io.Reader) error
+}
+
+type SelfUpdater struct{}
+
+func (s *SelfUpdater) Apply(r io.Reader) error {
+	return update.Apply(r, update.Options{})
+}