Merge branch 'main' into api-key-integration-test

Author: OliverTrautvetter

cli/cmd/licenses.go

@@ -0,0 +1,39 @@
+// Copyright (c) Codesphere Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import (
+	"log"
+
+	"github.com/codesphere-cloud/oms/internal/tmpl"
+	"github.com/spf13/cobra"
+)
+
+type LicensesCmd struct {
+	cmd *cobra.Command
+}
+
+func (c *LicensesCmd) RunE(_ *cobra.Command, args []string) error {
+	log.Println("OMS License:")
+	log.Println(tmpl.License())
+
+	log.Println("=================================")
+
+	log.Println("Open source components included:")
+	log.Println(tmpl.Notice())
+
+	return nil
+}
+
+func AddLicensesCmd(rootCmd *cobra.Command) {
+	licenses := LicensesCmd{
+		cmd: &cobra.Command{
+			Use:   "licenses",
+			Short: "Print license information",
+			Long:  `Print information about the OMS license and open source licenses of dependencies.`,
+		},
+	}
+	rootCmd.AddCommand(licenses.cmd)
+	licenses.cmd.RunE = licenses.RunE
+}

cli/cmd/mocks.go

@@ -31,6 +31,7 @@ func GetRootCmd() *cobra.Command {
 	AddListCmd(rootCmd, opts)
 	AddDownloadCmd(rootCmd, opts)
 	AddBetaCmd(rootCmd, &opts)
+	AddLicensesCmd(rootCmd)
 
 	// OMS API key management commands
 	AddRegisterCmd(rootCmd, opts)

cli/cmd/root.go

@@ -4,7 +4,7 @@
 package cmd
 
 import (
-	"fmt"
+	"log"
 
 	"github.com/spf13/cobra"
 )
@@ -14,7 +14,7 @@ type UpdateCmd struct {
 }
 
 func (c *UpdateCmd) RunE(_ *cobra.Command, args []string) error {
-	fmt.Printf("running %s", c.cmd.Use)
+	log.Printf("running %s", c.cmd.Use)
 
 	return nil
 }

cli/cmd/testdata/testcli.tar.gz

@@ -5,6 +5,7 @@ package cmd
 
 import (
 	"fmt"
+	"log"
 	"time"
 
 	"github.com/codesphere-cloud/oms/internal/portal"
@@ -39,7 +40,7 @@ func AddApiKeyUpdateCmd(parentCmd *cobra.Command) {
 	}
 
 	apiKeyCmd.Flags().StringVarP(&cmdState.Opts.APIKeyID, "id", "i", "", "The ID of the API key to update")
-	apiKeyCmd.Flags().StringVarP(&cmdState.Opts.ExpiresAtStr, "valid-to", "v", "", "The new expiration date in RFC3339 format (e.g., \"2025-12-31T23:59:59Z\")")
+	apiKeyCmd.Flags().StringVar(&cmdState.Opts.ExpiresAtStr, "valid-to", "", "The new expiration date in RFC3339 format (e.g., \"2025-12-31T23:59:59Z\")")
 
 	util.MarkFlagRequired(apiKeyCmd, "id")
 	util.MarkFlagRequired(apiKeyCmd, "valid-to")
@@ -58,6 +59,6 @@ func (c *UpdateAPIKeyCmd) UpdateAPIKey(p portal.Portal) error {
 		return fmt.Errorf("failed to update API key: %w", err)
 	}
 
-	fmt.Printf("Successfully updated API key '%s' with new expiration date %s.\n", c.Opts.APIKeyID, expiresAt.Format(time.RFC1123))
+	log.Printf("Successfully updated API key '%s' with new expiration date %s.\n", c.Opts.APIKeyID, expiresAt.Format(time.RFC1123))
 	return nil
 }

cli/cmd/update.go

@@ -5,27 +5,30 @@ package cmd
 
 import (
 	"fmt"
-	"io"
-	"strings"
+	"log"
 
 	"github.com/blang/semver"
-	"github.com/inconshreveable/go-update"
+	"github.com/rhysd/go-github-selfupdate/selfupdate"
 	"github.com/spf13/cobra"
-	"golang.org/x/sync/errgroup"
 
-	"github.com/codesphere-cloud/oms/internal/portal"
-	"github.com/codesphere-cloud/oms/internal/util"
 	"github.com/codesphere-cloud/oms/internal/version"
 )
 
+const GitHubRepo = "codesphere-cloud/oms"
+
 type OMSUpdater interface {
-	Apply(update io.Reader) error
+	Update(v semver.Version, repo string) (semver.Version, string, error)
 }
 
 type OMSSelfUpdater struct{}
 
-func (s *OMSSelfUpdater) Apply(r io.Reader) error {
-	return update.Apply(r, update.Options{})
+func (s *OMSSelfUpdater) Update(v semver.Version, repo string) (semver.Version, string, error) {
+	latest, err := selfupdate.UpdateSelf(v, repo)
+	if err != nil {
+		return v, "", err
+	}
+
+	return latest.Version, latest.ReleaseNotes, nil
 }
 
 type UpdateOmsCmd struct {
@@ -42,69 +45,27 @@ func AddOmsUpdateCmd(parentCmd *cobra.Command) {
 	omsCmd := &cobra.Command{
 		Use:   "oms",
 		Short: "Update the OMS CLI",
-		Long:  `Updates the OMS CLI to the latest release from OMS Portal.`,
+		Long:  `Updates the OMS CLI to the latest release from GitHub.`,
 		RunE: func(_ *cobra.Command, args []string) error {
-			p := portal.NewPortalClient()
-			return cmdState.SelfUpdate(p)
+			return cmdState.SelfUpdate()
 		},
 	}
 	parentCmd.AddCommand(omsCmd)
 }
-
-func (c *UpdateOmsCmd) SelfUpdate(p portal.Portal) error {
-	currentVersion := semver.MustParse(c.Version.Version())
-
-	latest, err := p.GetBuild(portal.OmsProduct, "", "")
+func (c *UpdateOmsCmd) SelfUpdate() error {
+	v := semver.MustParse(c.Version.Version())
+	latestVersion, releaseNotes, err := c.Updater.Update(v, GitHubRepo)
 	if err != nil {
-		return fmt.Errorf("failed to query OMS Portal for latest version: %w", err)
+		return fmt.Errorf("update failed: %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())
+	if latestVersion.Equals(v) {
+		log.Println("Current OMS CLI is 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
-	}
+	log.Printf("Successfully updated from %s to %s\n", v.String(), latestVersion.String())
+	log.Println("Release notes:\n", releaseNotes)
 
-	fmt.Println("Update finished successfully.")
 	return nil
 }