fix: Enable --skip-clone-no-changes for fork PRs (#3891) #3900
+68
−38
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-actions
bot
added
provider/azuredevops
go
|
did you ever tried this : https://www.runatlantis.io/docs/server-configuration.html#checkout-depth |
|
I did not, but I was able to confirm that hasRepoCfg is always false for fork PRs. Since that is the case a clone will always performed, which seems to contradict the docs for Can you elaborate on how |
I thought your concern was the size of the clone and not the amount of git clone invocations |
The size is not an issue if Without this change the call to Since deploying this branch yesterday, many forked PRs have skipped the cloning flow: Logs |
|
Hi @jamengual, just bumping this thread in hopes this bug fix can get merged in! |
|
@Ulminator Can you resolve the file conflict and we'll get this in the next patch release. Thanks |
GenPage
previously approved these changes
Dec 12, 2023
GenPage
added
bug
auto-merge was automatically disabled
December 18, 2023 20:11
Head branch was pushed to by a user without write access
Ulminator
force-pushed
the
skip_clone_no_changes_fork_prs
branch
from
a0ca05d to
5e40641
Compare
|
@GenPage just letting you know that I fixed the merge conflicts! |
Ulminator
force-pushed
the
skip_clone_no_changes_fork_prs
branch
from
5e40641 to
aa58a11
Compare
Ulminator
requested review from
nitrocode and
X-Guardian
and removed request for
a team
Ulminator
commented
Oct 22, 2024
| func (c *GiteaClient) GetFileContent(logger logging.SimpleLogging, pull models.PullRequest, fileName string) (bool, []byte, error) { | ||
| logger.Debug("Getting file content for %s in Gitea pull request %d", fileName, pull.Num) | ||
|
|
||
| content, resp, err := c.giteaClient.GetContents(pull.BaseRepo.Owner, pull.BaseRepo.Name, pull.HeadCommit, fileName) |
There was a problem hiding this comment.
With this change removing the models.PullRequest from the interface I opted to changing the head commit here to the branch name which seems to be supported by the docs.
https://pkg.go.dev/code.gitea.io/sdk/gitea#Client.GetContents
The name of the commit/branch/tag. Default the repository’s default branch (usually master)
|
@runatlantis/maintainers I know this has been stagnant for awhile, but I'd really like to get this merged. Since I originally wrote this PR the |
X-Guardian
requested changes
Nov 8, 2024
| @@ -347,7 +347,17 @@ func (p *DefaultProjectCommandBuilder) buildAllCommandsByCfg(ctx *command.Contex | |||
|
|
|||
| if p.SkipCloneNoChanges && p.VCSClient.SupportsSingleFileDownload(ctx.Pull.BaseRepo) { | |||
| repoCfgFile := p.GlobalCfg.RepoConfigFile(ctx.Pull.BaseRepo.ID()) | |||
| hasRepoCfg, repoCfgData, err := p.VCSClient.GetFileContent(ctx.Log, ctx.Pull, repoCfgFile) | |||
|
|
|||
There was a problem hiding this comment.
Can you add a test for this new code?
There was a problem hiding this comment.
I just added a test case, regenerated the mock_client.go file with pegomock, and fixed the issue w/ the DCO status check on my first commit.
The test also made it clear I could simplify some of the logic with just always passing the HeadRepo to GetFileContent. The prior issue being the repoCfgFile never being found when attempting to get it from the HeadBranch on the BaseRepo, but that branch not existing as it is just on the HeadRepo in the case of a forked PR.
Signed-off-by: Matt Ulmer <25484774+Ulminator@users.noreply.github.com>
Signed-off-by: Matt Ulmer <25484774+Ulminator@users.noreply.github.com>
Ulminator
force-pushed
the
skip_clone_no_changes_fork_prs
branch
from
4f2fa3d to
d209151
Compare
Signed-off-by: Matt Ulmer <25484774+Ulminator@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
what
This PR performs a check on whether the Atlantis PR is from a forked repo or not before making the call to
GetFileContentto fetch the repo level atlantis.yaml file.why
While working in a monorepo that others would fork, the disk space on the VM that Atlantis runs on was quickly filled up as every PR made would be cloned. This should not happen when the
--skip-clone-no-changesflag is used, but the logic for that currently ignores fork PRs.tests
I have deployed my branch and validated that PRs from forked repos are not cloned if the files changed in them are outside project directories.
make testpassed as well.Our workflow only uses the GitHub client so the implementation of the GitLab client has not been tested.
references