From 782750e51e0cecdf42c5d7f1baa435ff0c103393 Mon Sep 17 00:00:00 2001 From: Simone Gotti Date: Thu, 11 Apr 2019 17:11:17 +0200 Subject: [PATCH] project: save remote repository id --- internal/services/gateway/command/project.go | 37 ++++++++------------ internal/services/gateway/webhook.go | 2 +- internal/services/types/types.go | 18 ++++++---- 3 files changed, 27 insertions(+), 30 deletions(-) diff --git a/internal/services/gateway/command/project.go b/internal/services/gateway/command/project.go index a4e946c..92c23bd 100644 --- a/internal/services/gateway/command/project.go +++ b/internal/services/gateway/command/project.go @@ -73,7 +73,6 @@ func (c *CommandHandler) CreateProject(ctx context.Context, req *CreateProjectRe return nil, errors.Wrapf(err, "failed to get repository info from gitsource") } - //cloneURL := fmt.Sprintf("git@%s:%s/%s.git", host, repoOwner, repoName) sshCloneURL := repo.SSHCloneURL c.log.Infof("sshCloneURL: %s", sshCloneURL) @@ -96,8 +95,9 @@ func (c *CommandHandler) CreateProject(ctx context.Context, req *CreateProjectRe ID: parentID, }, LinkedAccountID: la.ID, - RepoPath: req.RepoPath, - CloneURL: sshCloneURL, + RepositoryID: repo.ID, + RepositoryPath: req.RepoPath, + RepositoryCloneURL: sshCloneURL, SkipSSHHostKeyCheck: req.SkipSSHHostKeyCheck, SSHPrivateKey: string(privateKey), } @@ -109,44 +109,36 @@ func (c *CommandHandler) CreateProject(ctx context.Context, req *CreateProjectRe } c.log.Infof("project %s created, ID: %s", p.Name, p.ID) - return p, c.SetupProject(ctx, rs, la, &SetupProjectRequest{ - Project: p, - RepoPath: req.RepoPath, - }) + return p, c.SetupProject(ctx, rs, la, p) } -type SetupProjectRequest struct { - Project *types.Project - RepoPath string -} - -func (c *CommandHandler) SetupProject(ctx context.Context, rs *types.RemoteSource, la *types.LinkedAccount, conf *SetupProjectRequest) error { +func (c *CommandHandler) SetupProject(ctx context.Context, rs *types.RemoteSource, la *types.LinkedAccount, project *types.Project) error { gitsource, err := common.GetGitSource(rs, la) if err != nil { return errors.Wrapf(err, "failed to create gitsource client") } - pubKey, err := util.ExtractPublicKey([]byte(conf.Project.SSHPrivateKey)) + pubKey, err := util.ExtractPublicKey([]byte(project.SSHPrivateKey)) if err != nil { return errors.Wrapf(err, "failed to extract public key") } - webhookURL := fmt.Sprintf("%s/webhooks?projectid=%s", c.apiExposedURL, conf.Project.ID) + webhookURL := fmt.Sprintf("%s/webhooks?projectid=%s", c.apiExposedURL, project.ID) // generate deploy keys and webhooks containing the agola project id so we // can have multiple projects referencing the same remote repository and this // will trigger multiple different runs - deployKeyName := fmt.Sprintf("agola deploy key - %s", conf.Project.ID) + deployKeyName := fmt.Sprintf("agola deploy key - %s", project.ID) c.log.Infof("creating/updating deploy key: %s", string(pubKey)) - if err := gitsource.UpdateDeployKey(conf.RepoPath, deployKeyName, string(pubKey), true); err != nil { + if err := gitsource.UpdateDeployKey(project.RepositoryPath, deployKeyName, string(pubKey), true); err != nil { return errors.Wrapf(err, "failed to create deploy key") } c.log.Infof("deleting existing webhooks") - if err := gitsource.DeleteRepoWebhook(conf.RepoPath, webhookURL); err != nil { + if err := gitsource.DeleteRepoWebhook(project.RepositoryPath, webhookURL); err != nil { return errors.Wrapf(err, "failed to delete repository webhook") } c.log.Infof("creating webhook to url: %s", webhookURL) - if err := gitsource.CreateRepoWebhook(conf.RepoPath, webhookURL, ""); err != nil { + if err := gitsource.CreateRepoWebhook(project.RepositoryPath, webhookURL, ""); err != nil { return errors.Wrapf(err, "failed to create repository webhook") } @@ -175,8 +167,7 @@ func (c *CommandHandler) ReconfigProject(ctx context.Context, projectRef string) return ErrFromRemote(resp, errors.Wrapf(err, "failed to get remote source %q", la.RemoteSourceID)) } - return c.SetupProject(ctx, rs, la, &SetupProjectRequest{ - Project: p, - RepoPath: p.RepoPath, - }) + // TODO(sgotti) update project repo path if the remote let us query by repository id + + return c.SetupProject(ctx, rs, la, p) } diff --git a/internal/services/gateway/webhook.go b/internal/services/gateway/webhook.go index dedd2e5..ed2b97f 100644 --- a/internal/services/gateway/webhook.go +++ b/internal/services/gateway/webhook.go @@ -168,7 +168,7 @@ func (h *webhooksHandler) handleWebhook(r *http.Request) (int, string, error) { } sshPrivKey = project.SSHPrivateKey - cloneURL = project.CloneURL + cloneURL = project.RepositoryCloneURL skipSSHHostKeyCheck = project.SkipSSHHostKeyCheck runType = types.RunTypeProject webhookData, err = gitSource.ParseWebhook(r) diff --git a/internal/services/types/types.go b/internal/services/types/types.go index b702345..6f102a1 100644 --- a/internal/services/types/types.go +++ b/internal/services/types/types.go @@ -142,15 +142,21 @@ type Project struct { Parent Parent `json:"parent,omitempty"` - // Project repository path. It may be different for every kind of git source. - // It's needed to get git source needed information like the repo owner and - // repo user - // Examples: sgotti/agola (for github, gitea etc... sources) - RepoPath string `json:"repo_path,omitempty"` + // The remote repository id + RepositoryID string `json:"repository_id,omitempty"` + + // The remote repository path. It may be different for every kind of git source. + // NOTE: it may be changed remotely but won't be updated here. Every git source + // works differently so we must find a way to update it: + // * let the user update it manually + // * auto update it if the remote let us query by repository id (gitea cannot + // do this but gitlab can and github has an hidden api to do this) + RepositoryPath string `json:"repository_path,omitempty"` + + RepositoryCloneURL string `json:"repository_clone_url,omitempty"` LinkedAccountID string `json:"linked_account_id,omitempty"` - CloneURL string `json:"clone_url,omitempty"` SSHPrivateKey string `json:"ssh_private_key,omitempty"` // PEM Encoded private key SkipSSHHostKeyCheck bool `json:"skip_ssh_host_key_check,omitempty"`