fix: add path to WorkingDir methods #2180
Merged
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
`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 runatlantis#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)
In addition to iterating over `workspaceDirs`, also iterate over `pathDirs`, and use both `workspace` and `path` to build `repoDir`.
|
thanks for the contribution @KevinSnyderCodes |
|
Please give it a try in the prerelease |
|
might be unrelated but I started to get following with the latest dev image I'll try using absolute paths for |
|
latest prerelease image?
…On Tue., Apr. 12, 2022, 5:15 a.m. Ed Laur, ***@***.***> wrote:
might be unrelated but I started to get following with the latest dev image
dir ".tmp/prod-production/my-service/infra" does not exist
—
Reply to this email directly, view it on GitHub
<#2180 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AAQ3ERACYZVM3HGASQHAFPTVEVSNTANCNFSM5SQZR24A>
.
You are receiving this because you modified the open/close state.Message
ID: ***@***.***>
|
|
@jamengual I did use |
|
mmm I think dev and prerelease are the same, we should delete the dev tag but just in case this is the one: docker pull ghcr.io/runatlantis/atlantis:v0.19.3-pre.20220408 |
|
@edbighead please report back your findings |
sure, I will. gonna check the 0.19.2 and prerelease versions. We use |
|
@jamengual @KevinSnyderCodes I do get the below mentioned error on It happens in the repo with repos:
- id: github.com/org/repo
apply_requirements: ["approved"]
allowed_overrides: [workflow]
allow_custom_workflows: true
pre_workflow_hooks:
- run: render --path . --output .where atlantis.yaml version: 3
projects:
- dir: .tmp/prod-production/my-service/infra
name: prod-production-my-service-infra
autoplan:
when_modified: ["../../../../apps/my-service/app.tf"]
enabled: trueError: |
jamengual
added a commit
that referenced
this pull request
May 13, 2022
This reverts commit 1a83444.
jamengual
added a commit
that referenced
this pull request
May 13, 2022
|
reverted due to : #2239 |
This was referenced Aug 26, 2022
krrrr38
pushed a commit
to krrrr38/atlantis
that referenced
this pull request
Dec 16, 2022
* 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 runatlantis#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>
krrrr38
pushed a commit
to krrrr38/atlantis
that referenced
this pull request
Dec 16, 2022
…tlantis#2253) This reverts commit 1a83444.
This was referenced Apr 18, 2023
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.
WorkingDirLockerandWorkingDirare closely related -- the former acquires a lock, which ensures that the latter can safely operate on a given file path.In #2131 we added
pathto theWorkingDirLockerlock key, but neglected to add the same toWorkingDir.pathis the directory for an Atlantis project, relative to the root of the repository.This commit adds
pathas an argument to certainWorkingDirmethods, and includespathin the file path that we use to clone the repository for a given Atlantis project.Since
pathcan include certain special characters such as/, we encodepathas base32 when using it as part of a file path. This should ensure that no special characters are used in the filesystem, and that the value can be decoded if desired (unlike hashes such as md5).Additional changes:
WorkingDirandWorkingDirLockerworking_dir_test.gopathvaluegit init, we include-b masteras additional arguments, to ensure thatmasteris our default branch (expected by the unit tests)