(maint) Pass the appropriate Puppetfile path to module loader #1203
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
mwaggett
force-pushed
the
maint/main/fix-puppetfile-path
branch
from
9729808 to
8b9830c
Compare
This commit moves the Puppetfile logging to the `R10K::ModuleLoader::Puppetfile` since that is what does the actual loading.
mwaggett
force-pushed
the
maint/main/fix-puppetfile-path
branch
from
8b9830c to
7880c0c
Compare
|
This should be good to go now. |
mwaggett
changed the title
|
This passed for me locally. |
|
well.. some iteration of it lol 👀 |
mwaggett
force-pushed
the
maint/main/fix-puppetfile-path
branch
from
1eef305 to
8d37831
Compare
|
okay that should be better 😅 |
Magisus
approved these changes
Aug 13, 2021
mwaggett
force-pushed
the
maint/main/fix-puppetfile-path
branch
from
44cd72b to
b79efdf
Compare
|
Do you want to add a unit test for the puppetfile spec that passing |
mwaggett
force-pushed
the
maint/main/fix-puppetfile-path
branch
from
b79efdf to
6de38b1
Compare
|
@justinstoller tests added 😊 |
mwaggett
force-pushed
the
maint/main/fix-puppetfile-path
branch
from
6de38b1 to
ac97fc5
Compare
Previously, we always passed the `puppetfile_name` from the `R10K::Puppetfile` class to `R10K::ModuleLoader::Puppetfile`. That was an attempt to fix a bug where relative Puppetfile paths were not getting resolved correctly by the module loader (puppetlabs@9082511). That, however, unearthed another bug: when instantiating a new instance of `R10K::Puppetfile` with the `puppetfile_path` option, that path would get completely ignored in favor of the default `puppetfile_name` value. This broke usage of the `r10k puppetfile purge` command. This commit ensures that we pass the appropriate Puppetfile path to the module loader - we pass the `puppetfile_path` if it exists, otherwise we pass the `puppetfile_name`. In order to maintain the fix for the original bug around relative Puppetfile paths, we no longer attempt to resolve the `puppetfile_path` in the `R10K::Puppetfile` class, since `R10K::ModuleLoader::Puppetfile` already handles that resolution.
Previously, we were using the remote version of the Puppetfile to test the `r10k puppetfile purge` command. This commit updates the test to use the deployed version of the Puppetfile, which is what a user would actually use.
mwaggett
force-pushed
the
maint/main/fix-puppetfile-path
branch
from
ac97fc5 to
7cd14c0
Compare
justinstoller
approved these changes
Aug 13, 2021
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.
see individual commit messages for details