mirror of
https://git.vectorsigma.ru/public/atlantis.git
synced 2026-08-04 05:18:45 +00:00
1a8344489f
* fix: add path to WorkingDir methods `WorkingDirLocker` and `WorkingDir` are closely related -- the former acquires a lock, which ensures that the latter can safely operate on a given file path. In #2131 we added `path` to the `WorkingDirLocker` lock key, but neglected to add the same to `WorkingDir`. This commit adds `path` as an argument to certain `WorkingDir` methods, and includes `path` in the directory that we use to clone the repository for a given project. Since `path` can include certain special characters such as `/`, we encode `path` as base32 when using it as part of a file path. This should ensure no special characters are used in the filesystem, and that the value can be decoded if desired (unlike hashes such as md5). Additional changes: - All calls to changed methods have been updated, including unit tests - Mocks have been regenerated for `WorkingDir` and `WorkingDirLocker` - `working_dir_test.go` - Commands that operate on filesystem paths have been updated to include the base32 encoded `path` value - When running `git init`, we include `-b master` as additional arguments, to ensure that `master` is our default branch (expected by the unit tests) * Try fixing E2E tests * Fix DefaultPendingPlanFinder In addition to iterating over `workspaceDirs`, also iterate over `pathDirs`, and use both `workspace` and `path` to build `repoDir`. * Fix DefaultPendingPlanFinder unit tests * Fix DefaultProjectCommandBuilder unit tests Co-authored-by: Kevin Snyder <kevinsnyder@KevinSnydersMBP.lan> Co-authored-by: Kevin Snyder <kevinsnyder@ip-192-168-1-188.ec2.internal>
56 lines
2.1 KiB
Go
56 lines
2.1 KiB
Go
package events
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
|
|
"github.com/mitchellh/go-homedir"
|
|
"github.com/pkg/errors"
|
|
"github.com/runatlantis/atlantis/server/events/models"
|
|
"github.com/runatlantis/atlantis/server/events/vcs"
|
|
"github.com/runatlantis/atlantis/server/logging"
|
|
)
|
|
|
|
// GithubAppWorkingDir implements WorkingDir.
|
|
// It acts as a proxy to an instance of WorkingDir that refreshes the app's token
|
|
// before every clone, given Github App tokens expire quickly
|
|
type GithubAppWorkingDir struct {
|
|
WorkingDir
|
|
Credentials vcs.GithubCredentials
|
|
GithubHostname string
|
|
}
|
|
|
|
// Clone writes a fresh token for Github App authentication
|
|
func (g *GithubAppWorkingDir) Clone(log logging.SimpleLogging, headRepo models.Repo, p models.PullRequest, workspace string, path string) (string, bool, error) {
|
|
|
|
log.Info("Refreshing git tokens for Github App")
|
|
|
|
token, err := g.Credentials.GetToken()
|
|
if err != nil {
|
|
return "", false, errors.Wrap(err, "getting github token")
|
|
}
|
|
|
|
home, err := homedir.Dir()
|
|
if err != nil {
|
|
return "", false, errors.Wrap(err, "getting home dir to write ~/.git-credentials file")
|
|
}
|
|
|
|
// https://developer.github.com/apps/building-github-apps/authenticating-with-github-apps/#http-based-git-access-by-an-installation
|
|
if err := WriteGitCreds("x-access-token", token, g.GithubHostname, home, log, true); err != nil {
|
|
return "", false, err
|
|
}
|
|
|
|
baseRepo := &p.BaseRepo
|
|
|
|
// Realistically, this is a super brittle way of supporting clones using gh app installation tokens
|
|
// This URL should be built during Repo creation and the struct should be immutable going forward.
|
|
// Doing this requires a larger refactor however, and can probably be coupled with supporting > 1 installation
|
|
authURL := fmt.Sprintf("://x-access-token:%s", token)
|
|
baseRepo.CloneURL = strings.Replace(baseRepo.CloneURL, "://:", authURL, 1)
|
|
baseRepo.SanitizedCloneURL = strings.Replace(baseRepo.SanitizedCloneURL, "://:", "://x-access-token:", 1)
|
|
headRepo.CloneURL = strings.Replace(headRepo.CloneURL, "://:", authURL, 1)
|
|
headRepo.SanitizedCloneURL = strings.Replace(baseRepo.SanitizedCloneURL, "://:", "://x-access-token:", 1)
|
|
|
|
return g.WorkingDir.Clone(log, headRepo, p, workspace, path)
|
|
}
|