Cr 15336 (#664)

roi-codefresh · web-flow · commit 9161d8dec190 · 2023-01-03T15:34:33.000+02:00
* added warning message for network errors

* reduced timeout for creating analytics reporter

* reduced time to check for new cli version to 2s

* bump

* codegen

* fix codegen for new year :)
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=v0.1.25
+VERSION=v0.1.26
 
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
diff --git a/cmd/commands/cluster.go b/cmd/commands/cluster.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/cluster_test.go b/cmd/commands/cluster_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
@@ -71,33 +71,33 @@ func Test_sanitizeClusterName(t *testing.T) {
 		name string
 	}
 	tests := []struct {
-		name string
-		args args
-		want string
+		name    string
+		args    args
+		want    string
 		wantErr bool
 	}{
 		{
 			name: "should return sanitized string",
 			args: args{
 				name: "^-.Test!@-:cluster&*`;')test.cluster(-12_3=+::±§.",
 			},
-			want: "test----cluster------test-cluster--12-3",
+			want:    "test----cluster------test-cluster--12-3",
 			wantErr: false,
 		},
 		{
 			name: "should return sanitized string",
 			args: args{
 				name: "^-.123test!@-:cluster&*`;')test.cluster(-12_3=+::±§.",
 			},
-			want: "test----cluster------test-cluster--12-3",
+			want:    "test----cluster------test-cluster--12-3",
 			wantErr: false,
 		},
 		{
 			name: "should return error of sanitization failed",
 			args: args{
 				name: "12345",
 			},
-			want: "",
+			want:    "",
 			wantErr: true,
 		},
 	}
diff --git a/cmd/commands/common.go b/cmd/commands/common.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/completion.go b/cmd/commands/completion.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/component.go b/cmd/commands/component.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/config.go b/cmd/commands/config.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/git-source.go b/cmd/commands/git-source.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/integrations.go b/cmd/commands/integrations.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/pipeline.go b/cmd/commands/pipeline.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/root.go b/cmd/commands/root.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/runtime.go b/cmd/commands/runtime.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
@@ -576,7 +576,6 @@ func runRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
 		cfConfig.GetCurrentContext().DefaultRuntime = ""
 	}
 
-
 	if !opts.Managed {
 		err = runPostUninstallCleanup(ctx, opts.KubeFactory, opts.RuntimeName)
 		if err != nil {
@@ -1138,6 +1137,9 @@ func createAnalyticsReporter(ctx context.Context, flow reporter.FlowType, disabl
 		return
 	}
 
+	ctx, cancel := context.WithTimeout(ctx, time.Second*5)
+	defer cancel()
+
 	user, err := cfConfig.GetCurrentContext().GetUser(ctx)
 	// If error, it will default to noop reporter
 	if err != nil {
diff --git a/cmd/commands/runtime_install.go b/cmd/commands/runtime_install.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
@@ -213,6 +213,8 @@ func NewRuntimeInstallCommand() *cobra.Command {
 					return fmt.Errorf("installation canceled by user")
 				}
 
+				util.CheckNetworkErr(err)
+
 				return util.DecorateErrorWithDocsLink(fmt.Errorf("pre installation error: %w", err), store.Get().RequirementsLink)
 			}
 
@@ -315,6 +317,8 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
 		opts.runtimeDef = runtime.GetRuntimeDefURL(opts.versionStr)
 	}
 
+	log.G(ctx).Info("Downloading runtime definition file")
+
 	runtimeDef := getRuntimeDef(opts.runtimeDef, opts.versionStr)
 	rt, err := runtime.Download(runtimeDef, opts.RuntimeName, opts.featuresToInstall)
 	handleCliStep(reporter.InstallStepRunPreCheckDownloadRuntimeDefinition, "Downloading runtime definition", err, true, true)
@@ -629,6 +633,7 @@ func runRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	rt, err := preInstallationChecks(ctx, opts)
 	handleCliStep(reporter.InstallPhaseRunPreCheckFinish, "Pre run installation checks", err, true, true)
 	if err != nil {
+		util.CheckNetworkErr(err)
 		return fmt.Errorf("pre installation checks failed: %w", err)
 	}
 
@@ -644,6 +649,7 @@ func runRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		postInstallationHandler(ctx, opts, err, &opts.DisableRollback)
 	}()
 
+	log.G(ctx).Infof("Creating runtime: \"%s\"", opts.RuntimeName)
 	token, iv, err := createRuntimeOnPlatform(ctx, opts, rt)
 	handleCliStep(reporter.InstallStepCreateRuntimeOnPlatform, "Creating runtime on platform", err, false, true)
 	if err != nil {
@@ -2057,8 +2063,8 @@ func getRuntimeDataFromCodefreshCM(_ context.Context, repofs fs.FS, runtimeName
 func postInstallationHandler(ctx context.Context, opts *RuntimeInstallOptions, err error, disableRollback *bool) {
 	if err != nil && !*disableRollback {
 		summaryArr = append(summaryArr, summaryLog{"----------Uninstalling runtime----------", Info})
-		log.G(ctx).Errorf("installation failed due to error : %s, performing installation rollback", err.Error())
-
+		log.G(ctx).Errorf("installation failed due to error: %s, performing installation rollback", err.Error())
+		util.CheckNetworkErr(err)
 		err := runRuntimeUninstall(ctx, &RuntimeUninstallOptions{
 			RuntimeName: opts.RuntimeName,
 			Timeout:     store.Get().WaitTimeout,
diff --git a/cmd/commands/upgrade.go b/cmd/commands/upgrade.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/version.go b/cmd/commands/version.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/commands/workflow.go b/cmd/commands/workflow.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/cmd/main.go b/cmd/main.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/docs/releases/release_notes.md b/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.25/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.26/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.25/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.26/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ go 1.19
 
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
-	github.com/argoproj-labs/argocd-autopilot v0.4.8
+	github.com/argoproj-labs/argocd-autopilot v0.4.9
 	github.com/argoproj/argo-cd/v2 v2.5.2
 	github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec
 	github.com/argoproj/argo-workflows/v3 v3.3.1
diff --git a/go.sum b/go.sum
@@ -179,8 +179,8 @@ github.com/antonmedv/expr v1.9.0/go.mod h1:5qsM3oLGDND7sDmQGDXHkYfkjYMUX14qsgqmH
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/appscode/go v0.0.0-20190808133642-1d4ef1f1c1e0/go.mod h1:iy07dV61Z7QQdCKJCIvUoDL21u6AIceRhZzyleh2ymc=
-github.com/argoproj-labs/argocd-autopilot v0.4.8 h1:zKqFKDJWxzHiNSjH3mHXV78xKeTQ7iMght7Oy7+bAh8=
-github.com/argoproj-labs/argocd-autopilot v0.4.8/go.mod h1:iR9JosRv7UBOQBSDR64Rrg1qs1DURhR+kx8zK2GEap4=
+github.com/argoproj-labs/argocd-autopilot v0.4.9 h1:mXptimJTxZhpgq2lRZTQLO4OHyGyNZpsIxYPdWmdnOY=
+github.com/argoproj-labs/argocd-autopilot v0.4.9/go.mod h1:iR9JosRv7UBOQBSDR64Rrg1qs1DURhR+kx8zK2GEap4=
 github.com/argoproj/argo-cd/v2 v2.5.2 h1:hyPi8NFXW3tG2yURslIMI20GfCdTN1/BDnt4+v5lpoA=
 github.com/argoproj/argo-cd/v2 v2.5.2/go.mod h1:3ToENm286PFVlZKNMutBzOwNyhevz4fw9dcgyiq3FIY=
 github.com/argoproj/argo-events v0.17.1-0.20220327045437-70eaafe9afec h1:95S2LPUUdPO2jYxuR5z1uk1GL2m/u+ud2iFAr5gK6VI=
diff --git a/hack/cmd-docs/main.go b/hack/cmd-docs/main.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/hack/license.go b/hack/license.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/git/mocks/roundTripper.go b/pkg/git/mocks/roundTripper.go
diff --git a/pkg/git/provider.go b/pkg/git/provider.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
@@ -94,7 +94,7 @@ func GetProvider(providerType ProviderType, baseURL, certFile string) (Provider,
 	return nil, fmt.Errorf("failed getting provider for clone url %s", baseURL)
 }
 
-func getGitProviderFromUserSelect(baseURL string, client *http.Client) (Provider) {
+func getGitProviderFromUserSelect(baseURL string, client *http.Client) Provider {
 	var providers = map[string]func(string, *http.Client) (Provider, error){
 		"Bitbucket": NewBitbucketServerProvider,
 		"GitHub":    NewGithubProvider,
diff --git a/pkg/git/provider_bitbucket-server.go b/pkg/git/provider_bitbucket-server.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/git/provider_bitbucket-server_test.go b/pkg/git/provider_bitbucket-server_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/git/provider_bitbucket.go b/pkg/git/provider_bitbucket.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/git/provider_bitbucket_test.go b/pkg/git/provider_bitbucket_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/git/provider_github.go b/pkg/git/provider_github.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/git/provider_github_test.go b/pkg/git/provider_github_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/git/provider_gitlab.go b/pkg/git/provider_gitlab.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/git/provider_gitlab_test.go b/pkg/git/provider_gitlab_test.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/log/log.go b/pkg/log/log.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/log/logrus.go b/pkg/log/logrus.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/reporter/reporter.go b/pkg/reporter/reporter.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/runtime/runtime.go b/pkg/runtime/runtime.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/store/store.go b/pkg/store/store.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/util/aputil/aputil.go b/pkg/util/aputil/aputil.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/util/cd/util.go b/pkg/util/cd/util.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/util/cli/cli.go b/pkg/util/cli/cli.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
@@ -38,7 +38,7 @@ import (
 // we don't want to slow down the cli so it is noticable
 // so you get 2 seconds to check the version, which should
 // be enough for most configurations
-var getVersionTimeout = time.Second * 30
+var getVersionTimeout = time.Second * 2
 
 const (
 	color           = "\u001b[38;5;220m"
diff --git a/pkg/util/events/util.go b/pkg/util/events/util.go
@@ -1,4 +1,4 @@
-// Copyright 2022 The Codefresh Authors.
+// Copyright 2023 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.
diff --git a/pkg/util/http/http.go b/pkg/util/http/http.go
diff --git a/pkg/util/kube/kube.go b/pkg/util/kube/kube.go
diff --git a/pkg/util/kust/util.go b/pkg/util/kust/util.go
diff --git a/pkg/util/openshift/util.go b/pkg/util/openshift/util.go
diff --git a/pkg/util/routing/common.go b/pkg/util/routing/common.go
diff --git a/pkg/util/routing/common_test.go b/pkg/util/routing/common_test.go
diff --git a/pkg/util/routing/contour.go b/pkg/util/routing/contour.go
diff --git a/pkg/util/routing/gatewayapi.go b/pkg/util/routing/gatewayapi.go
diff --git a/pkg/util/routing/ingress.go b/pkg/util/routing/ingress.go
diff --git a/pkg/util/routing/types/http-routes.go b/pkg/util/routing/types/http-routes.go
diff --git a/pkg/util/util.go b/pkg/util/util.go
diff --git a/pkg/util/workflow/util.go b/pkg/util/workflow/util.go
diff --git a/util/assets/assets.go b/util/assets/assets.go

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION=v0.1.25`
	`1`	`+VERSION=v0.1.26`
`2`	`2`
`3`	`3`	`OUT_DIR=dist`
`4`	`4`	`YEAR?=$(shell date +"%Y")`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2022 The Codefresh Authors.`
	`1`	`+// Copyright 2023 The Codefresh Authors.`
`2`	`2`	`//`
`3`	`3`	`// Licensed under the Apache License, Version 2.0 (the "License");`
`4`	`4`	`// you may not use this file except in compliance with the License.`