Skip to content

[WIP] Fix warnings raised by URI 1.0.1 #562

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Fix warnings raised by URI 1.0.1 #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/miq_automation_engine/engine/miq_ae_engine/miq_ae_object.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class MiqAeObject
BASE_CLASS = 'object'.freeze
BASE_OBJECT = [BASE_NAMESPACE, BASE_CLASS].join(PATH_SEPARATOR)
RE_METHOD_CALL = /^[\s]*([\.\/\w]+)[\s]*(?:\((.*)\))?[\s]*$/.freeze
RE_URI_ESCAPE = Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")
RE_URI_ESCAPE = Regexp.new("[^#{URI::RFC2396_Parser::PATTERN::UNRESERVED}]")
RE_SUBST = /\$\{([^}]+)\}/.freeze
RE_COLLECT_ARRAY = /^[\s]*(?:([\.\/\w]+)[\s]*=[\s]*)?\[(.*)\](?:\.([^.]+))?/.freeze
RE_COLLECT_HASH = /^[\s]*(?:([\.\/\w]+)[\s]*=[\s]*)?\{(.*)\}(?:\.([^.]*))*/.freeze
Expand Down
3 changes: 1 addition & 2 deletions spec/miq_ae_engine_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -859,8 +859,7 @@ def before_ae_starts(_options)
expect(test_class_name).to receive(:constantize).and_return(test_class)
expect(test_class).to receive(:find_by!).with(any_args).and_return(test_class_instance)
allow(MiqAeEngine).to receive(:create_automation_attribute_key)
expect($log).to receive(:error)
.with("Error delivering {\"User::user\"=>#{user.id}, nil=>nil} for object \[TestClass.\] with state \[\] to Automate: bad URI(is not URI?): \"_ wrong_uri _\"")
expect($log).to receive(:error).with(/Error delivering.+_ wrong_uri _/)
MiqAeEngine.deliver(options)
end

Expand Down
Loading