(#764) Ensure --puppet-dev checkout is always updated #792
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
glennsarti
reviewed
Oct 28, 2019
The original issue was that `pdk console --puppet-dev` didn't update the checkout before using it. This is because the CLI for `pdk console` didn't call `PDK::Util::PuppetVersion.fetch_puppet_dev`. Rather than add that, I've opted to add this call to the logic in `PDK::CLI::Util.puppet_from_opts_or_env` so that it happens automatically when setting up the environment for puppet-dev. --- First run to seed the checkout ``` $ pdk console --puppet-dev pdk (WARN): Module fixtures not found, please run pdk bundle exec rake spec_prep. [✔] Installing missing Gemfile dependencies. Ruby Version: 2.4.7 Puppet Version: 6.10.1 Puppet Debugger Version: 0.15.1 Created by: NWOps <corey@nwops.io> Type "commands" for a list of debugger commands or "help" to show the help screen. 1:>> ``` Manually switch the checkout to Puppet 6.9.0 ``` $ git -C ~/.pdk/cache/src/puppet checkout 6.9.0 Note: switching to '6.9.0'. You are in 'detached HEAD' state. You can look around, make experimental changes and commit them, and you can discard any commits you make in this state without impacting any branches by switching back to a branch. If you want to create a new branch to retain commits you create, you may do so (now or later) by using -c with the switch command. Example: git switch -c <new-branch-name> Or undo this operation with: git switch - Turn off this advice by setting config variable advice.detachedHead to false HEAD is now at c2ccdd4efe Merge pull request #7706 from gimmyxd/PUP-10016 ``` Second run, showing that the checkout has been updated to the HEAD of origin/master (at time of writing, Puppet 6.10.1) ``` $ pdk console --puppet-dev pdk (WARN): Module fixtures not found, please run pdk bundle exec rake spec_prep. [✔] Installing missing Gemfile dependencies. Ruby Version: 2.4.7 Puppet Version: 6.10.1 Puppet Debugger Version: 0.15.1 Created by: NWOps <corey@nwops.io> Type "commands" for a list of debugger commands or "help" to show the help screen. 1:>> ``` Fixes puppetlabs#764
glennsarti
approved these changes
Oct 29, 2019
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.
The original issue was that
pdk console --puppet-devdidn't update thecheckout before using it. This is because the CLI for
pdk consoledidn't call
PDK::Util::PuppetVersion.fetch_puppet_dev. Rather than addthat, I've opted to add this call to the logic in
PDK::CLI::Util.puppet_from_opts_or_envso that it happensautomatically when setting up the environment for puppet-dev.
First run to seed the checkout
Manually switch the checkout to Puppet 6.9.0
Second run, showing that the checkout has been updated to the HEAD of
origin/master (at time of writing, Puppet 6.10.1)
Fixes #764