Cr 15334 - added upgrade command (#649)

* added version check

* added upgrade command

* added upgrade command

* small fix

* fixing linting issues

Author: roi-codefresh

Makefile

@@ -1,4 +1,4 @@
-VERSION=v0.1.11
+VERSION=v0.1.12
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")

cmd/commands/root.go

@@ -49,6 +49,7 @@ variables in advanced to simplify the use of those commands.
 	cfConfig = config.AddFlags(cmd.PersistentFlags())
 
 	cmd.AddCommand(NewVersionCommand())
+	cmd.AddCommand(NewUpgradeCommand())
 	cmd.AddCommand(NewConfigCommand())
 	cmd.AddCommand(NewRuntimeCommand())
 	cmd.AddCommand(NewGitSourceCommand())

cmd/commands/upgrade.go

@@ -0,0 +1,45 @@
+// Copyright 2022 The Codefresh Authors.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package commands
+
+import (
+	"github.com/spf13/cobra"
+
+	cliutil "github.com/codefresh-io/cli-v2/pkg/util/cli"
+)
+
+func NewUpgradeCommand() *cobra.Command {
+	var opts struct {
+		version string
+		output  string
+	}
+
+	cmd := &cobra.Command{
+		Use:   "upgrade",
+		Short: "Upgrades the cli",
+		Annotations: map[string]string{
+			cliutil.SkipVersionCheck: "true",
+		},
+		Args: cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			return cliutil.UpgradeCLIToVersion(cmd.Context(), opts.version, opts.output)
+		},
+	}
+
+	cmd.Flags().StringVar(&opts.version, "version", "", "Specify a cli version to upgrade to")
+	cmd.Flags().StringVarP(&opts.output, "ouput", "o", "", "Where to save the new binary (default: replace the old binary)")
+
+	return cmd
+}

cmd/main.go

@@ -23,6 +23,7 @@ import (
 	"github.com/codefresh-io/cli-v2/pkg/reporter"
 	"github.com/codefresh-io/cli-v2/pkg/util"
 	apu "github.com/codefresh-io/cli-v2/pkg/util/aputil"
+	cliutil "github.com/codefresh-io/cli-v2/pkg/util/cli"
 
 	"github.com/sirupsen/logrus"
 )
@@ -37,6 +38,8 @@ func main() {
 
 	c := commands.NewRoot()
 
+	cliutil.AddCLIVersionCheck(c)
+
 	lgr.AddPFlags(c)
 
 	// configure autopilot logger

docs/commands/cli-v2.md

@@ -40,6 +40,7 @@ cli-v2 [flags]
 * [cli-v2 integration](cli-v2_integration.md)	 - Manage integrations with git providers, container registries and more
 * [cli-v2 pipeline](cli-v2_pipeline.md)	 - Manage pipelines of Codefresh runtimes
 * [cli-v2 runtime](cli-v2_runtime.md)	 - Manage Codefresh runtimes
+* [cli-v2 upgrade](cli-v2_upgrade.md)	 - Upgrades the cli
 * [cli-v2 version](cli-v2_version.md)	 - Show cli version
 * [cli-v2 workflow](cli-v2_workflow.md)	 - Manage workflows of Codefresh runtimes
 

docs/commands/cli-v2_upgrade.md

@@ -0,0 +1,30 @@
+## cli-v2 upgrade
+
+Upgrades the cli
+
+```
+cli-v2 upgrade [flags]
+```
+
+### Options
+
+```
+  -h, --help             help for upgrade
+  -o, --ouput string     Where to save the new binary (default: replace the old binary)
+      --version string   Specify a cli version to upgrade to
+```
+
+### Options inherited from parent commands
+
+```
+      --auth-context string        Run the next command using a specific authentication context
+      --cfconfig string            Custom path for authentication contexts config file (default "/home/user")
+      --insecure                   Disable certificate validation for TLS connections (e.g. to g.codefresh.io)
+      --insecure-ingress-host      Disable certificate validation of ingress host (default: false)
+      --request-timeout duration   Request timeout (default 30s)
+```
+
+### SEE ALSO
+
+* [cli-v2](cli-v2.md)	 - cli-v2 is used for installing and managing codefresh installations using gitops
+

docs/releases/release_notes.md

@@ -23,7 +23,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.11/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.12/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
 
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.11/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.12/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

hack/release.sh

@@ -9,6 +9,8 @@ if [[ -z "$VERSION" ]]; then
     exit 1
 fi
 
+echo "$VERSION" > ./dist/version.txt
+
 if [[ -z "$GITHUB_TOKEN" ]]; then
     echo "error: GITHUB_TOKEN token not defined"
     exit 1
@@ -19,7 +21,7 @@ if [[ -z "$PRERELEASE" ]]; then
 fi
 
 echo "uploading files:"
-ls -1a ./dist/*.tar.gz ./dist/*.sha256 ./manifests/runtime.yaml
+ls -1a ./dist/version.txt ./dist/*.tar.gz ./dist/*.sha256 ./manifests/runtime.yaml
 echo ""
 
 FILE="./docs/releases/release_notes.md"
@@ -28,8 +30,8 @@ cat $FILE | head -n 5 && echo ...
 echo ""
 
 if [[ "$DRY_RUN" == "1" ]]; then
-    echo "gh release create --repo $GIT_REPO -t $VERSION -F $FILE --prerelease=$PRERELEASE $VERSION ./dist/*.tar.gz ./dist/*.sha256 ./manifests/runtime.yaml"
+    echo "gh release create --repo $GIT_REPO -t $VERSION -F $FILE --prerelease=$PRERELEASE $VERSION ./dist/version.txt ./dist/*.tar.gz ./dist/*.sha256 ./manifests/runtime.yaml"
     exit 0
 fi
 
-gh release create --repo $GIT_REPO -t $VERSION -F $FILE --prerelease=$PRERELEASE $VERSION ./dist/*.tar.gz ./dist/*.sha256 ./manifests/runtime.yaml
+gh release create --repo $GIT_REPO -t $VERSION -F $FILE --prerelease=$PRERELEASE $VERSION ./dist/version.txt ./dist/*.tar.gz ./dist/*.sha256 ./manifests/runtime.yaml

pkg/log/logrus.go

@@ -62,11 +62,14 @@ func GetLogrusEntry(l Logger) (*logrus.Entry, error) {
 	return adpt.Entry, nil
 }
 
-func initCommands(cmds []*cobra.Command, initFunc func(*cobra.Command)) {
-	for _, cmd := range cmds {
-		initFunc(cmd)
-		if cmd.HasSubCommands() {
-			initCommands(cmd.Commands(), initFunc)
+func initCommands(cmd *cobra.Command, initFunc func(*cobra.Command)) {
+	initFunc(cmd)
+
+	for _, subCmd := range cmd.Commands() {
+		if subCmd.HasSubCommands() {
+			initCommands(subCmd, initFunc)
+		} else {
+			initFunc(subCmd)
 		}
 	}
 }
@@ -104,7 +107,7 @@ func (l *logrusAdapter) AddPFlags(cmd *cobra.Command) {
 		}
 	}
 
-	cobra.OnInitialize(func() { initCommands(cmd.Commands(), initFunc) })
+	cobra.OnInitialize(func() { initCommands(cmd, initFunc) })
 
 	cmdutil.LogFormat = *format
 	cmdutil.LogLevel = l.c.Level

pkg/store/store.go

@@ -133,6 +133,8 @@ type Store struct {
 	RequirementsLink                  string
 	GitTokensLink                     string
 	DownloadCliLink                   string
+	CLIDownloadTemplate               string
+	CLILatestVersionFileLink          string
 	RolloutReporterName               string
 	RolloutResourceName               string
 	RolloutReporterServiceAccount     string
@@ -252,6 +254,8 @@ func init() {
 	s.RequirementsLink = "https://codefresh.io/csdp-docs/docs/runtime/requirements/"
 	s.GitTokensLink = "https://codefresh.io/csdp-docs/docs/reference/git-tokens/"
 	s.DownloadCliLink = "https://codefresh.io/csdp-docs/docs/clients/csdp-cli/"
+	s.CLIDownloadTemplate = "https://github.com/codefresh-io/cli-v2/releases/download/%s/cf-%s-%s.tar.gz"
+	s.CLILatestVersionFileLink = "https://github.com/codefresh-io/cli-v2/releases/latest/download/version.txt"
 	s.DefaultNamespace = "default"
 	s.NetworkTesterName = "cf-network-tester"
 	s.NetworkTesterGenerateName = "cf-network-tester-"