mirror of
https://git.vectorsigma.ru/public/atlantis.git
synced 2026-08-04 05:08:43 +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>
99 lines
2.9 KiB
Go
99 lines
2.9 KiB
Go
package events_test
|
|
|
|
import (
|
|
"fmt"
|
|
"testing"
|
|
|
|
. "github.com/petergtz/pegomock"
|
|
"github.com/runatlantis/atlantis/server/events"
|
|
eventMocks "github.com/runatlantis/atlantis/server/events/mocks"
|
|
"github.com/runatlantis/atlantis/server/events/models"
|
|
"github.com/runatlantis/atlantis/server/events/vcs"
|
|
"github.com/runatlantis/atlantis/server/events/vcs/fixtures"
|
|
vcsMocks "github.com/runatlantis/atlantis/server/events/vcs/mocks"
|
|
"github.com/runatlantis/atlantis/server/logging"
|
|
. "github.com/runatlantis/atlantis/testing"
|
|
)
|
|
|
|
// Test that if we don't have any existing files, we check out the repo with a github app.
|
|
func TestClone_GithubAppNoneExisting(t *testing.T) {
|
|
// Initialize the git repo.
|
|
repoDir, cleanup := initRepo(t)
|
|
defer cleanup()
|
|
expCommit := runCmd(t, repoDir, "git", "rev-parse", "HEAD")
|
|
|
|
dataDir, cleanup2 := TempDir(t)
|
|
defer cleanup2()
|
|
|
|
wd := &events.FileWorkspace{
|
|
DataDir: dataDir,
|
|
CheckoutMerge: false,
|
|
TestingOverrideHeadCloneURL: fmt.Sprintf("file://%s", repoDir),
|
|
}
|
|
|
|
defer disableSSLVerification()()
|
|
testServer, err := fixtures.GithubAppTestServer(t)
|
|
Ok(t, err)
|
|
|
|
gwd := &events.GithubAppWorkingDir{
|
|
WorkingDir: wd,
|
|
Credentials: &vcs.GithubAppCredentials{
|
|
Key: []byte(fixtures.GithubPrivateKey),
|
|
AppID: 1,
|
|
Hostname: testServer,
|
|
},
|
|
GithubHostname: testServer,
|
|
}
|
|
|
|
logger := logging.NewNoopLogger(t)
|
|
|
|
cloneDir, _, err := gwd.Clone(logger, models.Repo{}, models.PullRequest{
|
|
BaseRepo: models.Repo{},
|
|
HeadBranch: "branch",
|
|
}, "default", ".")
|
|
Ok(t, err)
|
|
|
|
// Use rev-parse to verify at correct commit.
|
|
actCommit := runCmd(t, cloneDir, "git", "rev-parse", "HEAD")
|
|
Equals(t, expCommit, actCommit)
|
|
}
|
|
|
|
func TestClone_GithubAppSetsCorrectUrl(t *testing.T) {
|
|
workingDir := eventMocks.NewMockWorkingDir()
|
|
|
|
credentials := vcsMocks.NewMockGithubCredentials()
|
|
|
|
ghAppWorkingDir := events.GithubAppWorkingDir{
|
|
WorkingDir: workingDir,
|
|
Credentials: credentials,
|
|
GithubHostname: "some-host",
|
|
}
|
|
|
|
baseRepo, _ := models.NewRepo(
|
|
models.Github,
|
|
"runatlantis/atlantis",
|
|
"https://github.com/runatlantis/atlantis.git",
|
|
|
|
// user and token have to be blank otherwise this proxy wouldn't be invoked to begin with
|
|
"",
|
|
"",
|
|
)
|
|
|
|
logger := logging.NewNoopLogger(t)
|
|
|
|
headRepo := baseRepo
|
|
|
|
modifiedBaseRepo := baseRepo
|
|
modifiedBaseRepo.CloneURL = "https://x-access-token:token@github.com/runatlantis/atlantis.git"
|
|
modifiedBaseRepo.SanitizedCloneURL = "https://x-access-token:<redacted>@github.com/runatlantis/atlantis.git"
|
|
|
|
When(credentials.GetToken()).ThenReturn("token", nil)
|
|
When(workingDir.Clone(logger, modifiedBaseRepo, models.PullRequest{BaseRepo: modifiedBaseRepo}, "default", ".")).ThenReturn(
|
|
"", true, nil,
|
|
)
|
|
|
|
_, success, _ := ghAppWorkingDir.Clone(logger, headRepo, models.PullRequest{BaseRepo: baseRepo}, "default", ".")
|
|
|
|
Assert(t, success == true, "clone url mutation error")
|
|
}
|