fix(vcs): old and new vcs gerrit compatibility

engine/vcs/bitbucketserver/client_release.go

@@ -2,15 +2,14 @@ package bitbucketserver
 
 import (
 	"context"
-	"fmt"
 	"io"
 
 	"github.com/ovh/cds/sdk"
 )
 
 func (b *bitbucketClient) Release(ctx context.Context, repo, tagName, releaseTitle, releaseDescription string) (*sdk.VCSRelease, error) {
-	return nil, fmt.Errorf("Not yet implemented")
+	return nil, sdk.WithStack(sdk.ErrNotImplemented)
 }
 func (b *bitbucketClient) UploadReleaseFile(ctx context.Context, repo string, releaseName string, uploadURL string, artifactName string, r io.Reader, fileLength int) error {
-	return fmt.Errorf("Not yet implemented")
+	return sdk.WithStack(sdk.ErrNotImplemented)
 }

engine/vcs/gerrit/client_event.go

@@ -2,33 +2,32 @@ package gerrit
 
 import (
 	"context"
-	"fmt"
 	"time"
 
 	"github.com/ovh/cds/sdk"
 )
 
-//GetEvents is not implemented
+// GetEvents is not implemented
 func (c *gerritClient) GetEvents(ctx context.Context, repo string, dateRef time.Time) ([]interface{}, time.Duration, error) {
-	return nil, 0.0, fmt.Errorf("Not implemented on Gerrit")
+	return nil, 0.0, sdk.WithStack(sdk.ErrNotImplemented)
 }
 
-//PushEvents is not implemented
+// PushEvents is not implemented
 func (c *gerritClient) PushEvents(context.Context, string, []interface{}) ([]sdk.VCSPushEvent, error) {
-	return nil, fmt.Errorf("Not implemented on Gerrit")
+	return nil, sdk.WithStack(sdk.ErrNotImplemented)
 }
 
-//CreateEvents is not implemented
+// CreateEvents is not implemented
 func (c *gerritClient) CreateEvents(context.Context, string, []interface{}) ([]sdk.VCSCreateEvent, error) {
-	return nil, fmt.Errorf("Not implemented on Gerrit")
+	return nil, sdk.WithStack(sdk.ErrNotImplemented)
 }
 
-//DeleteEvents is not implemented
+// DeleteEvents is not implemented
 func (c *gerritClient) DeleteEvents(context.Context, string, []interface{}) ([]sdk.VCSDeleteEvent, error) {
-	return nil, fmt.Errorf("Not implemented on Gerrit")
+	return nil, sdk.WithStack(sdk.ErrNotImplemented)
 }
 
-//PullRequestEvents is not implemented
+// PullRequestEvents is not implemented
 func (c *gerritClient) PullRequestEvents(context.Context, string, []interface{}) ([]sdk.VCSPullRequestEvent, error) {
-	return nil, fmt.Errorf("Not implemented on Gerrit")
+	return nil, sdk.WithStack(sdk.ErrNotImplemented)
 }

engine/vcs/gerrit/client_hook.go

@@ -2,32 +2,31 @@ package gerrit
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/ovh/cds/sdk"
 )
 
 func (c *gerritClient) GetHook(ctx context.Context, repo, id string) (sdk.VCSHook, error) {
-	return sdk.VCSHook{}, fmt.Errorf("Not implemented")
+	return sdk.VCSHook{}, sdk.WithStack(sdk.ErrNotImplemented)
 }
 
-//CreateHook enables the default HTTP POST Hook in Gerrit
+// CreateHook enables the default HTTP POST Hook in Gerrit
 func (c *gerritClient) CreateHook(ctx context.Context, repo string, hook *sdk.VCSHook) error {
 	if len(hook.Events) == 0 {
 		hook.Events = sdk.GerritEventsDefault
 	}
 	return nil
 }
 
-//UpdateHook enables the default HTTP POST Hook in Gerrit
+// UpdateHook enables the default HTTP POST Hook in Gerrit
 func (c *gerritClient) UpdateHook(ctx context.Context, repo string, hook *sdk.VCSHook) error {
 	if len(hook.Events) == 0 {
 		hook.Events = sdk.GerritEventsDefault
 	}
 	return nil
 }
 
-//DeleteHook disables the default HTTP POST Hook in Gerrit
+// DeleteHook disables the default HTTP POST Hook in Gerrit
 func (c *gerritClient) DeleteHook(ctx context.Context, repo string, hook sdk.VCSHook) error {
 	return nil
 }

engine/vcs/gerrit/client_release.go

@@ -2,18 +2,17 @@ package gerrit
 
 import (
 	"context"
-	"fmt"
 	"io"
 
 	"github.com/ovh/cds/sdk"
 )
 
 // Release on gerrit
 func (c *gerritClient) Release(ctx context.Context, repo string, tagName string, title string, releaseNote string) (*sdk.VCSRelease, error) {
-	return nil, fmt.Errorf("not implemented")
+	return nil, sdk.WithStack(sdk.ErrNotImplemented)
 }
 
 // UploadReleaseFile upload a release file project
 func (c *gerritClient) UploadReleaseFile(ctx context.Context, repo string, releaseName string, uploadURL string, artifactName string, r io.Reader, fileLength int) error {
-	return fmt.Errorf("not implemented")
+	return sdk.WithStack(sdk.ErrNotImplemented)
 }

engine/vcs/gerrit/gerrit_consumer.go

@@ -13,20 +13,26 @@ func (g *gerritConsumer) AuthorizeRedirect(ctx context.Context) (string, string,
 	return "", "", nil
 }
 
-//AuthorizeToken returns the authorized token (and its secret)
-//from the request token and the verifier got on authorize url
+// AuthorizeToken returns the authorized token (and its secret)
+// from the request token and the verifier got on authorize url
 func (g *gerritConsumer) AuthorizeToken(ctx context.Context, state, code string) (string, string, error) {
 	// Not implemented for gerrit
 	return "", "", nil
 }
 
-//GetAuthorized returns an authorized client
+// GetAuthorized returns an authorized client
 func (g *gerritConsumer) GetAuthorizedClient(ctx context.Context, vcsAuth sdk.VCSAuth) (sdk.VCSAuthorizedClient, error) {
 	client, err := ger.NewClient(g.URL, nil)
 	if err != nil {
-		return nil, sdk.WrapError(err, "unable to create gerrit client")
+		return nil, sdk.WrapError(err, "unable to create gerrit client on url %q", g.URL)
+	}
+
+	if vcsAuth.Type != "" {
+		client.Authentication.SetBasicAuth(vcsAuth.Username, vcsAuth.Token)
+	} else {
+		// DEPRECATED VCS
+		client.Authentication.SetBasicAuth(vcsAuth.AccessToken, vcsAuth.AccessTokenSecret)
 	}
-	client.Authentication.SetBasicAuth(vcsAuth.AccessToken, vcsAuth.AccessTokenSecret)
 
 	c := &gerritClient{
 		client:               client,

engine/vcs/gitlab/client_release.go

@@ -2,7 +2,6 @@ package gitlab
 
 import (
 	"context"
-	"fmt"
 	"io"
 
 	"github.com/ovh/cds/sdk"
@@ -11,10 +10,10 @@ import (
 // Release on gitlab
 // TODO: https://docs.gitlab.com/ee/api/tags.html#create-a-new-release
 func (c *gitlabClient) Release(ctx context.Context, repo string, tagName string, title string, releaseNote string) (*sdk.VCSRelease, error) {
-	return nil, fmt.Errorf("not implemented")
+	return nil, sdk.WithStack(sdk.ErrNotImplemented)
 }
 
 // UploadReleaseFile upload a release file project
 func (c *gitlabClient) UploadReleaseFile(ctx context.Context, repo string, releaseName string, uploadURL string, artifactName string, r io.Reader, fileLength int) error {
-	return fmt.Errorf("not implemented")
+	return sdk.WithStack(sdk.ErrNotImplemented)
 }

engine/vcs/vcs_handlers.go

@@ -1245,7 +1245,7 @@ func (s *Service) Status(ctx context.Context) *sdk.MonitoringStatus {
 }
 
 func (s *Service) statusHandler() service.Handler {
-	return func(ctx context.Context, w http.ResponseWriter, r *http.Request) error {
+	return func(ctx context.Context, w http.ResponseWriter, _ *http.Request) error {
 		var status = http.StatusOK
 		return service.WriteJSON(w, s.Status(ctx), status)
 	}

sdk/vcs.go

@@ -218,7 +218,7 @@ type VCSAuthProject struct {
 	Token      string `json:"token,omitempty" db:"-"`
 	SSHKeyName string `json:"sshKeyName,omitempty" db:"-"`
 
-	// Use for gerrit
+	// Used by gerrit
 	SSHUsername   string `json:"sshUsername,omitempty" db:"-"`
 	SSHPort       int    `json:"sshPort,omitempty" db:"-"`
 	SSHPrivateKey string `json:"sshPrivateKey,omitempty" db:"-"`

ui/src/app/shared/repomanager/from/repomanager.form.html

@@ -57,8 +57,8 @@
         <ng-container *ngIf="addRepoResponse?.auth_type === 'basic'">
             <button nz-button nzType="primary" name="validationbtn" [nzLoading]="verificationLoading" (click)="sendBasicAuth()">Validate</button>
         </ng-container>
-        <ng-container *ngIf="selectedRepoId != null">
-            <button nz-button nzType="primary" name="validationbtn" [nzLoading]="verificationLoading" (click)="sendVerificationCode()">Validate</button>
+        <ng-container *ngIf="addRepoResponse?.auth_type === 'oauth' && selectedRepoId != null">
+            <button nz-button nzType="primary" name="validationbtn" [nzLoading]="verificationLoading" (click)="sendVerificationCode()">Validate Verification Code</button>
         </ng-container>
     </div>
 </nz-modal>