mssql_session resource: add port parameter #2429
Merged
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
pulling chef:master
Signed-off-by: Vern Burton <me@vernburton.com>
Signed-off-by: Vern Burton <me@vernburton.com>
…ource_fail Signed-off-by: Vern Burton <me@vernburton.com>
Signed-off-by: Vern Burton <me@vernburton.com>
… to a dedicated port test Signed-off-by: Vern Burton <me@vernburton.com>
Signed-off-by: Vern Burton <me@vernburton.com>
…ng so it would be a waste of time to enable it Signed-off-by: Vern Burton <me@vernburton.com>
Signed-off-by: Vern Burton <me@vernburton.com>
Signed-off-by: Vern Burton <me@vernburton.com>
Signed-off-by: Vern Burton <me@vernburton.com>
adamleff
suggested changes
Jan 2, 2018
lib/resources/mssql_session.rb
Outdated
| @instance = opts[:instance] | ||
|
|
||
| # check if sqlcmd is available | ||
| return skip_resource('sqlcmd is missing') if !inspec.command('sqlcmd').exist? | ||
| raise Inspec::Exceptions::ResourceFailed, 'sqlcmd is missing' unless inspec.command('sqlcmd').exist? |
There was a problem hiding this comment.
This is technically a breaking change since we mark the resource as "skipped" and not failed. In principle, I think I agree with you that we should fail, but we have to do that during a major version bump.
For now, we should change this to Inspec::Exceptions::ResourceSkipped
lib/resources/mssql_session.rb
Outdated
| # check that database is reachable | ||
| return skip_resource("Can't connect to the MS SQL Server.") if !test_connection | ||
| raise Inspec::Exceptions::ResourceFailed, "Can't connect to the MS SQL Server." unless test_connection |
There was a problem hiding this comment.
Same change as above - we need to skip the resource rather than fail it for now.
adamleff
changed the title
…elease Signed-off-by: Vern Burton <me@vernburton.com>
|
@adamleff Comments have been addressed. |
chris-rock
approved these changes
Jan 16, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fixes #2148
also adds unit testing around hostname/port/instance and mocks them to the same mssql-getdata in helper.rb
adds integration test for mssql_session based on appveyor services (https://www.appveyor.com/docs/services-databases/#sql-server-2012), however, no integration testing is done on appveyor so I removed the appveyor.yml services section in c28deda