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

postgres relative path includes #1852

Merged
merged 1 commit into from May 27, 2017
Merged

Conversation

aaronlippold
Copy link
Collaborator

Postgres configuration doesnt always include absolute paths. When using relative paths it will fail!

Also: We treat the include as either a string or an array; when the first condition succeeds and you get a string and the second fails you get a array => ruby tries to add a string with an array and fails. This is now fixed as well.

Fixes: #1780
Fixes: #1738

Signed-off-by: Aaron Lippold lippold@gmail.com

Postgres configuration doesnt always include absolute paths. When using relative paths it will fail!

Also: We treat the include as either a string or an array; when the first condition succeeds and you get a string and the second fails you get a array => ruby tries to add a string with an array and fails. This is now fixed as well.

Fixes: inspec#1780
Fixes: inspec#1738

Signed-off-by: Aaron Lippold <lippold@gmail.com>
Copy link
Contributor

@arlimus arlimus left a comment

Choose a reason for hiding this comment

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

Thank you for fixing these issues!

@aaronlippold
Copy link
Collaborator Author

@arlimus You're very welcome :) lol

@aaronlippold
Copy link
Collaborator Author

Great meeting today

@aaronlippold
Copy link
Collaborator Author

Do we think that basedir should be a '@baseDir'? i.e. do we need to expose it?

@arlimus
Copy link
Contributor

arlimus commented May 26, 2017

Not really; the base-dir is always based on the file that is currently being processed; since we are tackling relative files to the config file that is being loaded, it is only a snapshot in time ;)

Copy link
Contributor

@chris-rock chris-rock left a comment

Choose a reason for hiding this comment

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

Awesome improvement @aaronlippold

@chris-rock chris-rock merged commit da0b98f into inspec:master May 27, 2017
@adamleff adamleff added the Type: Bug Feature not working as expected label May 31, 2017
@adamleff adamleff changed the title bugfix: postgres relative path includes postgres relative path includes May 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Type: Bug Feature not working as expected
Projects
None yet
Development

Successfully merging this pull request may close these issues.

postgres_conf resource and the --sudo option Issue with --shell-options
5 participants