Skip to content

Split arguments added for ENC#112

Merged
kpaulisse merged 2 commits intogithub:masterfrom
waldiTM:puppet-arguments-enc
May 10, 2017
Merged

Split arguments added for ENC#112
kpaulisse merged 2 commits intogithub:masterfrom
waldiTM:puppet-arguments-enc

Conversation

@waldiTM
Copy link
Copy Markdown

@waldiTM waldiTM commented May 10, 2017

Overview

The arguments for puppet invocations are not longer explicitely split on
white-spaces. This means that only one argument is added for ENC, while
this should be two (--node_terminus and --external_nodes). Just
properly split the arguments.

Checklist

  • Make sure that all of the tests pass, and fix any that don't. Just run rake in your checkout directory, or review the CI job triggered whenever you push to a pull request.
  • Make sure that there is 100% test coverage by running rake coverage:spec or ignoring untestable sections of code with # :nocov comments. If you need help getting to 100% coverage please ask; however, don't just submit code with no tests.
  • If you have added a new command line option, we would greatly appreciate a corresponding integration test that exercises it from start to finish. This is optional but recommended.
  • If you have added any new gem dependencies, make sure those gems are licensed under the MIT or Apache 2.0 license. We cannot add any dependencies on gems licensed under GPL.
  • If you have added any new gem dependencies, make sure you've checked in a copy of the .gem file into the vendor/cache directory.

/cc [related issues] [teams and individuals, making sure to mention why you're CC-ing them]

The arguments for puppet invocations are not longer explicitely split on
white-spaces.  This means that only one argument is added for ENC, while
this should be two (--node_terminus and --external_nodes).  Just
properly split the arguments.
if @options[:enc]
raise Errno::ENOENT, "Did not find ENC as expected at #{@options[:enc]}" unless File.file?(@options[:enc])
cmdline << "--node_terminus=exec --external_nodes=#{Shellwords.escape(@options[:enc])}"
cmdline << "--node_terminus=exec"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Our rubocop rules will flag this as needing single quotes (mostly trying to keep the codebase consistent, and chose to use format similar to Puppet). If you could fix that up, this looks fine to me and I'll merge. Thanks!

@kpaulisse kpaulisse merged commit 5379ab6 into github:master May 10, 2017
@kpaulisse
Copy link
Copy Markdown
Contributor

@waldiTM Thanks!

@waldiTM waldiTM deleted the puppet-arguments-enc branch May 11, 2017 08:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants