cmd,internal,servies: add update auth token request

patcito · Mar 10, 2020 · 3670416 · 3670416
1 parent d7d889e
commit 3670416
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 1 deletion.
diff --git a/cmd/agola/cmd/remotesourceupdate.go b/cmd/agola/cmd/remotesourceupdate.go
@@ -39,6 +39,7 @@ type remoteSourceUpdateOptions struct {
 
 	newName             string
 	apiURL              string
+	authToken           string
 	skipVerify          bool
 	oauth2ClientID      string
 	oauth2ClientSecret  string
@@ -56,6 +57,7 @@ func init() {
 	flags.StringVarP(&remoteSourceUpdateOpts.ref, "ref", "", "", "current remotesource name or id")
 	flags.StringVarP(&remoteSourceUpdateOpts.newName, "new-name", "", "", "remotesource new name")
 	flags.StringVar(&remoteSourceUpdateOpts.apiURL, "api-url", "", "remotesource api url")
+	flags.StringVar(&remoteSourceUpdateOpts.authToken, "auth-token", "", "remotesource auth token")
 	flags.BoolVarP(&remoteSourceUpdateOpts.skipVerify, "skip-verify", "", false, "skip remote source api tls certificate verification")
 	flags.StringVar(&remoteSourceUpdateOpts.oauth2ClientID, "clientid", "", "remotesource oauth2 client id")
 	flags.StringVar(&remoteSourceUpdateOpts.oauth2ClientSecret, "secret", "", "remotesource oauth2 secret")
@@ -83,6 +85,9 @@ func remoteSourceUpdate(cmd *cobra.Command, args []string) error {
 	if flags.Changed("api-url") {
 		req.APIURL = &remoteSourceUpdateOpts.apiURL
 	}
+	if flags.Changed("auth-token") {
+		req.AuthToken = &remoteSourceUpdateOpts.authToken
+	}
 	if flags.Changed("skip-verify") {
 		req.SkipVerify = &remoteSourceUpdateOpts.skipVerify
 	}

diff --git a/internal/services/common/gitsource.go b/internal/services/common/gitsource.go
@@ -145,7 +145,7 @@ func GetTokenSource(rs *cstypes.RemoteSource, accessToken string) (gitsource.Use
 	case cstypes.RemoteSourceTypeGitea:
 		userSource, err = newGitea(rs, accessToken)
 	default:
-		return nil, errors.Errorf("remote source %s isn't a valid token source", rs.Name)
+		return nil, errors.Errorf("remote source %s isn't a valid oauth2 source", rs.Name)
 	}
 
 	return userSource, err

diff --git a/internal/services/gateway/action/remotesource.go b/internal/services/gateway/action/remotesource.go
@@ -132,6 +132,7 @@ type UpdateRemoteSourceRequest struct {
 
 	Name                *string
 	APIURL              *string
+	AuthToken           *string
 	SkipVerify          *bool
 	Oauth2ClientID      *string
 	Oauth2ClientSecret  *string
@@ -157,6 +158,9 @@ func (h *ActionHandler) UpdateRemoteSource(ctx context.Context, req *UpdateRemot
 	if req.APIURL != nil {
 		rs.APIURL = *req.APIURL
 	}
+	if req.AuthToken != nil {
+		rs.AuthToken = *req.AuthToken
+	}
 	if req.SkipVerify != nil {
 		rs.SkipVerify = *req.SkipVerify
 	}

diff --git a/internal/services/gateway/api/remotesource.go b/internal/services/gateway/api/remotesource.go
@@ -100,6 +100,7 @@ func (h *UpdateRemoteSourceHandler) ServeHTTP(w http.ResponseWriter, r *http.Req
 
 		Name:                req.Name,
 		APIURL:              req.APIURL,
+		AuthToken:           req.AuthToken,
 		SkipVerify:          req.SkipVerify,
 		Oauth2ClientID:      req.Oauth2ClientID,
 		Oauth2ClientSecret:  req.Oauth2ClientSecret,

diff --git a/services/gateway/api/types/remotesource.go b/services/gateway/api/types/remotesource.go
@@ -32,6 +32,7 @@ type CreateRemoteSourceRequest struct {
 type UpdateRemoteSourceRequest struct {
 	Name                *string `json:"name"`
 	APIURL              *string `json:"apiurl"`
+	AuthToken           *string `json:"auth_token"`
 	SkipVerify          *bool   `json:"skip_verify"`
 	Oauth2ClientID      *string `json:"oauth_2_client_id"`
 	Oauth2ClientSecret  *string `json:"oauth_2_client_secret"`