Cr 15125 (#618)

* fix requested scopes msg

* bump

* move retry msg to debug

* resolve comments

* patch ut

* fix msg

* wip

* wip

* fix ut

Author: kim-codefresh

Makefile

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

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.0.558/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.559/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.0.558/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.559/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 2.1.1
-  version: 0.0.558
+  version: 0.0.559
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/git/provider_bitbucket.go

@@ -56,6 +56,14 @@ var (
 		{"team", "team:write"},
 		{"webhook"},
 	}
+
+	scopesApiMap = map[string]string{
+		"account:read account:write":        "account:read",
+		"repository:admin repository:write": "repository:write",
+		"repository:admin":                  "repository:admin",
+		"team team:write":                   "workspace membership:write (team:write)",
+		"webhook":                           "webhook:read and write",
+	}
 )
 
 func NewBitbucketProvider(baseURL string, client *http.Client) (Provider, error) {
@@ -107,6 +115,7 @@ func (bb *bitbucket) verifyToken(ctx context.Context, token string, username str
 	if err != nil {
 		return fmt.Errorf("failed checking token scope permission: %w", err)
 	}
+
 	for _, requiredScope := range requiredScopes {
 		isScopeIncluded := false
 		for _, scopeOpt := range requiredScope {
@@ -115,7 +124,8 @@ func (bb *bitbucket) verifyToken(ctx context.Context, token string, username str
 			}
 		}
 		if !isScopeIncluded {
-			return fmt.Errorf("the provided token is missing required token scopes, got: %s required: %v", scopes, requiredScopes)
+			var requestedScopes = bb.getRequestedScopes(requiredScopes)
+			return fmt.Errorf("the provided token is missing required token scopes, got: %s \nrequired: %v", scopes, requestedScopes)
 		}
 	}
 
@@ -154,3 +164,29 @@ func (bb *bitbucket) request(ctx context.Context, username, token, method, urlPa
 
 	return bb.c.Do(req)
 }
+
+func (bb *bitbucket) getRequestedScopes(requiredScopes [][]string) string {
+	var requestedScopes string = ""
+
+	for _, requiredScopeOpts := range requiredScopes {
+		var scopeOpts = ""
+		for _, requiredScope := range requiredScopeOpts {
+			if len(scopeOpts) > 0 {
+				scopeOpts += " "
+			}
+			scopeOpts += requiredScope
+		}
+
+		if len(requestedScopes) > 0 {
+			requestedScopes += ", "
+		}
+
+		if len(scopesApiMap[scopeOpts]) > 0 {
+			requestedScopes += scopesApiMap[scopeOpts]
+		} else {
+			requestedScopes += scopeOpts
+		}
+	}
+
+	return requestedScopes
+}

pkg/git/provider_bitbucket_test.go

@@ -57,7 +57,7 @@ func Test_bitbucket_verifyToken(t *testing.T) {
 		},
 		"Should fail if required scope is not in res header": {
 			requiredScopes: [][]string{{"scope 3"}},
-			wantErr:        "the provided token is missing required token scopes, got: scope 1, scope 2 required: [[scope 3]]",
+			wantErr:        "the provided token is missing required token scopes, got: scope 1, scope 2 \nrequired: scope 3",
 			beforeFn: func(t *testing.T, c *mocks.MockRoundTripper) {
 				c.EXPECT().RoundTrip(gomock.AssignableToTypeOf(&http.Request{})).Times(1).DoAndReturn(func(_ *http.Request) (*http.Response, error) {
 					header := http.Header{}

pkg/util/util.go

@@ -365,10 +365,7 @@ func Retry(ctx context.Context, opts *RetryOptions) error {
 			break
 		}
 
-		log.G(ctx).WithFields(log.Fields{
-			"retry": try,
-			"err":   err.Error(),
-		}).Warn("Function call failed, trying again")
+		log.G(ctx).Debug("retry: %s \n err: %s\n Function call failed, trying again", try, err.Error())
 
 		if opts.Sleep != 0 {
 			time.Sleep(opts.Sleep)