Cr 29017 skip hook (#789)

Author: andrii-codefresh

Makefile

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

cmd/commands/account.go

@@ -19,8 +19,10 @@ import (
 	"fmt"
 	"github.com/codefresh-io/cli-v2/internal/kube"
 	"github.com/codefresh-io/cli-v2/internal/log"
+	"github.com/codefresh-io/cli-v2/internal/store"
 	"github.com/codefresh-io/cli-v2/internal/util"
 	"github.com/codefresh-io/cli-v2/internal/util/helm"
+	kubeutil "github.com/codefresh-io/cli-v2/internal/util/kube"
 	"github.com/codefresh-io/go-sdk/pkg/codefresh"
 	"github.com/codefresh-io/go-sdk/pkg/graphql"
 	platmodel "github.com/codefresh-io/go-sdk/pkg/model/platform"
@@ -75,6 +77,9 @@ func NewValidateLimitsCommand() *cobra.Command {
 			return cfConfig.RequireAuthentication(cmd, args)
 		},
 		Example: util.Doc("<BIN> account validate-usage"),
+		PreRun: func(cmd *cobra.Command, _ []string) {
+			opts.namespace = cmd.Flag("namespace").Value.String()
+		},
 		RunE: func(cmd *cobra.Command, _ []string) error {
 			ctx := cmd.Context()
 			if opts.hook {
@@ -86,13 +91,26 @@ func NewValidateLimitsCommand() *cobra.Command {
 				err    error
 			)
 			if opts.hook {
-				client, err = createPlatformClientInRuntime(ctx, opts)
+				runtimeToken, _ := kubeutil.GetValueFromSecret(ctx, opts.kubeFactory, opts.namespace, store.Get().CFTokenSecret, "token")
+				if runtimeToken != "" {
+					log.G(ctx).Infof("Skip hook execution. Runtime already exists.")
+					return nil
+				}
+				client, err = createPlatformClientInRuntime(ctx, &opts.HelmValidateValuesOptions)
 				if err != nil {
 					return err
 				}
 			} else {
 				client = cfConfig.NewClient()
 			}
+			user, err := client.GraphQL().User().GetCurrent(cmd.Context())
+			if err != nil {
+				return err
+			}
+			if v := user.ActiveAccount.Features.GitopsPlanEnforcement; v == nil || !*v {
+				log.G(ctx).Infof("Skip hook execution. GitopsPlanEnforcement feature is disabled.")
+				return nil
+			}
 			payments := client.GraphQL().Payments()
 			err = runValidateLimits(cmd.Context(), opts, payments)
 			if err != nil {

cmd/commands/common.go

@@ -299,7 +299,7 @@ func checkExistingRuntimes(ctx context.Context, runtime string) error {
 	return fmt.Errorf("runtime \"%s\" already exists", runtime)
 }
 
-func createPlatformClientInRuntime(ctx context.Context, opts *ValidateLimitsOptions) (codefresh.Codefresh, error) {
+func createPlatformClientInRuntime(ctx context.Context, opts *HelmValidateValuesOptions) (codefresh.Codefresh, error) {
 	var cfClient codefresh.Codefresh
 	valuesFile, err := opts.helm.GetValues(opts.valuesFile, !opts.hook)
 	if err != nil {
@@ -314,7 +314,7 @@ func createPlatformClientInRuntime(ctx context.Context, opts *ValidateLimitsOpti
 	runtimeToken, _ := kubeutil.GetValueFromSecret(ctx, opts.kubeFactory, opts.namespace, store.Get().CFTokenSecret, "token")
 	if runtimeToken != "" {
 		log.G(ctx).Info("Used runtime token to validate account usage")
-		cfClient, err = getPlatformClient(ctx, &opts.HelmValidateValuesOptions, codefreshValues, runtimeToken)
+		cfClient, err = getPlatformClient(ctx, opts, codefreshValues, runtimeToken)
 		if err != nil {
 			return nil, err
 		}
@@ -336,13 +336,13 @@ func createPlatformClientInRuntime(ctx context.Context, opts *ValidateLimitsOpti
 			return nil, errors.New("userToken must contain either a \"token\" field, or a \"secretKeyRef\"")
 		}
 
-		userToken, err = getValueFromSecretKeyRef(ctx, &opts.HelmValidateValuesOptions, secretKeyRef)
+		userToken, err = getValueFromSecretKeyRef(ctx, opts, secretKeyRef)
 		if err != nil {
 			return nil, fmt.Errorf("failed getting user token from secretKeyRef: %w", err)
 		}
 	}
 
-	cfClient, err = getPlatformClient(ctx, &opts.HelmValidateValuesOptions, codefreshValues, userToken)
+	cfClient, err = getPlatformClient(ctx, opts, codefreshValues, userToken)
 	if err != nil {
 		return nil, fmt.Errorf("failed creating codefresh client using user token: %w", err)
 	}

docs/releases/release_notes.md

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

go.mod

@@ -7,7 +7,7 @@ toolchain go1.23.4
 require (
 	github.com/Masterminds/semver/v3 v3.3.1
 	github.com/argoproj/argo-cd/v2 v2.13.4
-	github.com/codefresh-io/go-sdk v1.4.8
+	github.com/codefresh-io/go-sdk v1.4.9
 	github.com/fatih/color v1.18.0
 	github.com/gobuffalo/packr v1.30.1
 	github.com/golang/mock v1.6.0

go.sum

@@ -106,8 +106,8 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/cloudflare/circl v1.3.7 h1:qlCDlTPz2n9fu58M0Nh1J/JzcFpfgkFHHX3O35r5vcU=
 github.com/cloudflare/circl v1.3.7/go.mod h1:sRTcRWXGLrKw6yIGJ+l7amYJFfAXbZG0kBSc8r4zxgA=
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/codefresh-io/go-sdk v1.4.8 h1:N0HXSmhjrZ8rJiOXEqVLVoyLWdTZtS5fSaWhQR8ZzdA=
-github.com/codefresh-io/go-sdk v1.4.8/go.mod h1:9h1dhKQVupmt/66gWChokPfrGVFKfMMAxcfvPzh4r0U=
+github.com/codefresh-io/go-sdk v1.4.9 h1:W6Y4CmCTx8Y1jX24tkvdzfneAjKAE9w/ApAC6LT4BEY=
+github.com/codefresh-io/go-sdk v1.4.9/go.mod h1:9h1dhKQVupmt/66gWChokPfrGVFKfMMAxcfvPzh4r0U=
 github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
 github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
 github.com/containerd/containerd v1.7.27 h1:yFyEyojddO3MIGVER2xJLWoCIn+Up4GaHFquP7hsFII=