New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixing #184 #186

Merged
merged 4 commits into from Jan 4, 2017

Conversation

Projects
None yet
4 participants
@jeremymv2
Contributor

jeremymv2 commented Dec 16, 2016

Description

This allows chef-server-visibility collector + chef-server fetcher to work as desired.

Issues Resolved

#184

Check List

Signed-off-by: Jeremy J. Miller jm@chef.io

fixing #184
Signed-off-by: Jeremy J. Miller <jm@chef.io>

@binamov binamov added the in progress label Dec 16, 2016

@jeremymv2

This comment has been minimized.

Contributor

jeremymv2 commented Dec 16, 2016

Still need to add unit tests for files/default/vendor/chef-server/fetcher.rb to help prevent regression.

jeremymv2 added some commits Dec 16, 2016

fixing rubo
Signed-off-by: Jeremy J. Miller <jm@chef.io>
unit tests
Signed-off-by: Jeremy J. Miller <jm@chef.io>
@jeremymv2

This comment has been minimized.

Contributor

jeremymv2 commented Dec 17, 2016

unit tests added

@jeremymv2

This comment has been minimized.

Contributor

jeremymv2 commented Dec 17, 2016

@alexpop Are you able to help with these travis-ci build errors perhaps?

>>>>>> ------Exception-------
>>>>>> Class: Kitchen::ActionFailed
>>>>>> Message: 1 actions failed.
>>>>>>     Failed to complete #create action: [unable to sign request without credentials set] on default-amzn
>>>>>> ----------------------
>>>>>> Please see .kitchen/logs/kitchen.log for more details
>>>>>> Also try running `kitchen diagnose --all` for configuration
rename variable for clarity
Signed-off-by: Jeremy J. Miller <jm@chef.io>
@alexpop

This comment has been minimized.

Collaborator

alexpop commented Dec 21, 2016

Looks like external PRs are not getting the encrypted ENV variables needed for the kitchen-ec2 testing:
travis-ci/travis-ci#1938

Will need to give you access to the repo @jeremymv2 so that you can create branches and submit PRs like that.

In the meantime, I'm testing this locally on my machine.

else
'/compliance'
end
return '/compliance' unless chef_server_visibility? && Chef.node.attributes['audit']['fetcher'] != 'chef-server'

This comment has been minimized.

@alexpop

alexpop Dec 21, 2016

Collaborator

This method is getting harder to understand.
I pinged Victoria as well and would like to keep it as if-then-else:

def self.url_prefix
  if chef_server_visibility? && Chef.node.attributes['audit']['fetcher'] != 'chef-server'
    ''
  else
    '/compliance'
  end
end
@alexpop

This comment has been minimized.

Collaborator

alexpop commented Dec 21, 2016

I tested it and the kitchen-ec2 tests pass. Can you please squash the commits?

Thanks a lot for the contribution!

@alexpop

alexpop approved these changes Jan 4, 2017

Let's get it this in and focus on style changes later

@chris-rock

This comment has been minimized.

Collaborator

chris-rock commented Jan 4, 2017

Thank you @jeremymv2 and @alexpop

@chris-rock chris-rock merged commit ab29962 into chef-cookbooks:master Jan 4, 2017

1 of 2 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
DCO This commit has a DCO Signed-off-by
Details

@chris-rock chris-rock removed the in progress label Jan 4, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment