feat: Add recursive directory check for --restrict-file-list #4972
+6
−2
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
ibalat
requested review from
GenPage,
lukemassa and
nitrocode
and removed request for
a team
Fabianoshz
reviewed
Oct 1, 2024
| @@ -629,8 +629,10 @@ func (p *DefaultProjectCommandBuilder) buildProjectPlanCommand(ctx *command.Cont | |||
| foundDir := false | |||
|
|
|||
| for _, f := range modifiedFiles { | |||
| if filepath.Dir(f) == cmd.RepoRelDir { | |||
| // Check if the file is in the directory or any subdirectory of the target | |||
| if strings.HasPrefix(filepath.Dir(f), cmd.RepoRelDir) { | |||
There was a problem hiding this comment.
Personally I would hide this behind a flag to make sure people that want to be very strict can still do so.
There was a problem hiding this comment.
so should we bind this logic to another parameter like --restrict-file-list-recursive ?
There was a problem hiding this comment.
@ibalat, yeah, that looks like a good flag to me. Just be aware that I can review this, but I'm not sure I'm the best person to give a final word if this should be accepted.
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.
This change enhances the file change detection logic in Atlantis to support recursive directory checks for --restrict-file-list parameter. Previously, only direct changes to specified directories were considered for plan and apply. With this update, changes in subdirectories are also detected, ensuring resources that depend on configuration files in nested directories are properly applied.
What:
Why:
In cases where Terraform resources in a directory (e.g., clusters/dev) depend on configuration files from subdirectories (e.g., clusters/dev/configs/dashboards/application), changes to those subdirectories were not triggering the necessary plan and apply commands. This fix resolves that issue, improving the workflow when working with nested configurations.
references
ISSUE #4971