Skip to content
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

Fixes #14158 - Add tailoring file for scans #39

Merged
merged 1 commit into from Jan 6, 2017

Conversation

xprazak2
Copy link
Contributor

Will need this to work.

@xprazak2
Copy link
Contributor Author

I added proxy plugin to foreman_infra, I think we need to add a webhook for jenkins in repo settings to enable testing on PRs.

@isimluk
Copy link
Member

isimluk commented Nov 18, 2016

I just released ruby-openscap-0.4.7. You may want to amend your gemfile to depend on 0.4.7.

@xprazak2 xprazak2 force-pushed the tailoring branch 2 times, most recently from 796d88b to ee18a81 Compare November 18, 2016 11:50
@xprazak2
Copy link
Contributor Author

I updated the dependency version, thanks @isimluk!

@@ -21,6 +21,7 @@ class Plugin < ::Proxy::Plugin
:openscap_send_log_file => File.join(APP_ROOT, 'logs/openscap-send.log'),
:contentdir => File.join(APP_ROOT, 'openscap/content'),
:reportsdir => File.join(APP_ROOT, 'openscap/reports'),
:failed_dir => File.join(APP_ROOT, 'openscap/failed')
:failed_dir => File.join(APP_ROOT, 'openscap/failed'),
:tailoringdir => File.join(APP_ROOT, 'openscap/tailoring')
Copy link
Member

Choose a reason for hiding this comment

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

Could you please rename this to tailoring_dir? I see there are others without underscore, but Ruby convention is to separate words.

@@ -97,9 +108,19 @@ class Api < ::Sinatra::Base
end
end

post "/scap_content/validator" do
Copy link
Member

Choose a reason for hiding this comment

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

I think we should keep compatibility here at least for 1 release. Could you keep /scap_content/validator that would print deprecation warning and call /scap_file/validator/scap_content? Also opening redmine issue to remove this in 0.5 would be great.

@xprazak2
Copy link
Contributor Author

I renamed tailoringdir to tailoring_dir and put back the old validation route with deprecation warning.

@ares
Copy link
Member

ares commented Nov 30, 2016

I still see tailoringdir in the code. Have you opened the tracking redmine issue?

@xprazak2
Copy link
Contributor Author

xprazak2 commented Dec 6, 2016

I opened the tracking issue and removed it from code - hopefully for good this time.

@ares
Copy link
Member

ares commented Dec 23, 2016

👍 works fine with older version of foreman_openscap and prints the deprecation warning, ready for merge

@ares
Copy link
Member

ares commented Jan 4, 2017

[test]

@ares
Copy link
Member

ares commented Jan 6, 2017

[test] master is green again

@shlomizadok
Copy link
Member

Thank you @xprazak2 !!
Thanks @ares for testing

@shlomizadok shlomizadok merged commit f60782a into theforeman:master Jan 6, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants