a
/
agola
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

migrate

This commit is contained in:
6543 2020-05-22 12:07:53 +02:00
parent cc52d49d6b
commit c6f09610f1
No known key found for this signature in database
GPG Key ID: A1CA74D27FD13271
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/gitsources/gitea/gitea.go
View File

@ -37,7 +37,7 @@ import (
const ( const (
// TODO(sgotti) The gitea client doesn't provide an easy way to detect http response codes... // TODO(sgotti) The gitea client doesn't provide an easy way to detect http response codes...
// we should probably use our own client implementation // https://gitea.com/gitea/go-sdk/issues/303
ClientNotFound = "404 Not Found" ClientNotFound = "404 Not Found"
) )
@ -165,6 +165,8 @@ func (c *Client) LoginPassword(username, password, tokenName string) (string, er
// try to get agola access token if it already exists // try to get agola access token if it already exists
// use custom http call since gitea api client doesn't provide an easy way to // use custom http call since gitea api client doesn't provide an easy way to
// guess if the username/password login failed // guess if the username/password login failed
// https://gitea.com/gitea/go-sdk/issues/303
var accessToken string var accessToken string
tokens := make([]*gitea.AccessToken, 0, 10) tokens := make([]*gitea.AccessToken, 0, 10)
@ -199,9 +201,8 @@ func (c *Client) LoginPassword(username, password, tokenName string) (string, er
// create access token // create access token
if accessToken == "" { if accessToken == "" {
c.client.SetBasicAuth(username, password)
token, terr := c.client.CreateAccessToken( token, terr := c.client.CreateAccessToken(
username,
password,
gitea.CreateAccessTokenOption{Name: tokenName}, gitea.CreateAccessTokenOption{Name: tokenName},
) )
if terr != nil { if terr != nil {
@ -271,7 +272,7 @@ func (c *Client) UpdateDeployKey(repopath, title, pubKey string, readonly bool)
// the same value it is correctly readded and the admin must force a // the same value it is correctly readded and the admin must force a
// authorized_keys regeneration on the server. To avoid this we update it only // authorized_keys regeneration on the server. To avoid this we update it only
// when the public key value has changed // when the public key value has changed
keys, err := c.client.ListDeployKeys(owner, reponame) keys, err := c.client.ListDeployKeys(owner, reponame, gitea.ListDeployKeysOptions{})
if err != nil { if err != nil {
return errors.Errorf("error retrieving existing deploy keys: %w", err) return errors.Errorf("error retrieving existing deploy keys: %w", err)
} }
@ -303,7 +304,7 @@ func (c *Client) DeleteDeployKey(repopath, title string) error {
if err != nil { if err != nil {
return err return err
} }
keys, err := c.client.ListDeployKeys(owner, reponame) keys, err := c.client.ListDeployKeys(owner, reponame, gitea.ListDeployKeysOptions{})
if err != nil { if err != nil {
return errors.Errorf("error retrieving existing deploy keys: %w", err) return errors.Errorf("error retrieving existing deploy keys: %w", err)
} }
@ -348,7 +349,7 @@ func (c *Client) DeleteRepoWebhook(repopath, u string) error {
if err != nil { if err != nil {
return err return err
} }
hooks, err := c.client.ListRepoHooks(owner, reponame) hooks, err := c.client.ListRepoHooks(owner, reponame, gitea.ListHooksOptions{})
if err != nil { if err != nil {
return errors.Errorf("error retrieving repository webhooks: %w", err) return errors.Errorf("error retrieving repository webhooks: %w", err)
} }
@ -381,7 +382,7 @@ func (c *Client) CreateCommitStatus(repopath, commitSHA string, status gitsource
} }
func (c *Client) ListUserRepos() ([]*gitsource.RepoInfo, error) { func (c *Client) ListUserRepos() ([]*gitsource.RepoInfo, error) {
remoteRepos, err := c.client.ListMyRepos() remoteRepos, err := c.client.ListMyRepos(gitea.ListReposOptions{})
if err != nil { if err != nil {
return nil, err return nil, err
} }

6
tests/setup_test.go
View File

@ -120,7 +120,8 @@ func setupGitea(t *testing.T, dir, dockerBridgeAddress string) *testutil.TestGit
// Wait for gitea api to be ready // Wait for gitea api to be ready
err = testutil.Wait(30*time.Second, func() (bool, error) { err = testutil.Wait(30*time.Second, func() (bool, error) {
if _, err := giteaClient.ListAccessTokens(giteaUser01, "password"); err != nil { giteaClient.SetBasicAuth(giteaUser01, "password")
if _, err := giteaClient.ListAccessTokens(gitea.ListAccessTokensOptions{}); err != nil {
return false, nil return false, nil
} }
return true, nil return true, nil
@ -392,7 +393,8 @@ func createLinkedAccount(ctx context.Context, t *testing.T, tgitea *testutil.Tes
giteaAPIURL := fmt.Sprintf("http://%s:%s", tgitea.HTTPListenAddress, tgitea.HTTPPort) giteaAPIURL := fmt.Sprintf("http://%s:%s", tgitea.HTTPListenAddress, tgitea.HTTPPort)
giteaClient := gitea.NewClient(giteaAPIURL, "") giteaClient := gitea.NewClient(giteaAPIURL, "")
giteaToken, err := giteaClient.CreateAccessToken(giteaUser01, "password", gitea.CreateAccessTokenOption{Name: "token01"}) giteaClient.SetBasicAuth(giteaUser01, "password")
giteaToken, err := giteaClient.CreateAccessToken(gitea.CreateAccessTokenOption{Name: "token01"})
if err != nil { if err != nil {
t.Fatalf("unexpected err: %v", err) t.Fatalf("unexpected err: %v", err)
} }