Enable data collector w/o token for solo, but require explicit URL #5511
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
adamleff
approved these changes
Nov 3, 2016
danielsdeleo
force-pushed
the
allow-tokenless-chef-solo-data-collector
branch
2 times, most recently
from
0f92ed6 to
8db478a
Compare
afiune
reviewed
Nov 3, 2016
| @@ -89,7 +89,7 @@ def stop_tiny_server | |||
|
|
|||
| it "should be able to node.save with bad utf8 characters in the node data" do | |||
| file "cookbooks/x/attributes/default.rb", 'default["badutf8"] = "Elan Ruusam\xE4e"' | |||
| result = shell_out("#{chef_client} -z -r 'x::default' --disable-config", :cwd => path_to("")) | |||
| result = shell_out("#{chef_client} -z -r 'x::default' --disable-config -ldebug", :cwd => path_to("")) | |||
There was a problem hiding this comment.
Do we want the logs to be in debug mode? or this was just for testing?
There was a problem hiding this comment.
You're right, nice catch. Will fix.
|
I have a little comment but code LGTM. Lets wait for travis to pass... |
Third-party data collector implementations are supported and may not require a token for authentication. Therefore we must allow the case where the token is nil in Chef Solo mode. To reduce the chance that the data collector is accidentally enabled, only set the data collector URL to a default value in Chef Client mode. Signed-off-by: Daniel DeLeo <dan@chef.io>
danielsdeleo
force-pushed
the
allow-tokenless-chef-solo-data-collector
branch
from
8db478a to
49cc8b1
Compare
|
@chef/client-core ready for review |
lamont-granquist
approved these changes
Nov 3, 2016
mwrock
approved these changes
Nov 3, 2016
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
Third-party data collector implementations are supported and may not
require a token for authentication. Therefore we must allow the case
where the token is nil in Chef Solo mode. To reduce the chance that the
data collector is accidentally enabled, only set the data collector URL
to a default value in Chef Client mode.
Issues Resolved
Acceptance is failing in the pipeline because it tests this exact case
Check List
Signed-off-by: Daniel DeLeo dan@chef.io