Commit graph

2623 commits

Author SHA1 Message Date
Christoph Hartmann
80fd288f44 Merge pull request #1020 from chef/chris-rock/iis_direct_matcher
allow direct access to iis configuration parameters
2016-09-07 11:34:47 +02:00
Christoph Hartmann
1bd55f8cc4 allow direct access to iis configuration parameters 2016-09-07 11:19:34 +02:00
Christoph Hartmann
1268a28ea9 Merge pull request #1027 from chef/ap/ssl-improvements
ssl resource fix and speed improvement
2016-09-07 11:09:52 +02:00
Alex Pop
f65ceeb900 handled hostname differently for WinRM::Connection
parallelize protocol checks to speed up the scan
2016-09-07 11:04:01 +02:00
Christoph Hartmann
123ddd2a6c 0.33.1 2016-09-07 10:50:48 +02:00
Christoph Hartmann
9f980cff99 Merge pull request #1023 from chef/ssd/remove-prepare_load_path
Remove SourceReader::Inspec#prepare_load_path
2016-09-07 10:43:45 +02:00
Steven Danna
210dbc9425 Remove SourceReader::Inspec#prepare_load_path
We already monkeypatch require so that it is redirected through the
require_loader.  All of the tests pass with this removal.  We might
cause some breakage with this removal that we aren't testing, but given
that we are mucking with `require` it seems preferable to have one
mechanism by which we do that and solve any bugs with that single path.

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-07 10:35:58 +02:00
Christoph Hartmann
bd64428458 Merge pull request #1026 from chef/ssd/attribute-fix-1
Pass attributes from command line into profile context
2016-09-07 10:34:56 +02:00
Steven Danna
74e712854e Pass attributes from command line into profile context
We broke attributes with the dependency work. Minimally fix them. TODO:
Maximally fix them.

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-07 10:29:47 +02:00
Christoph Hartmann
163e32ae7a Merge pull request #1022 from chef/dr/demo
add demo yml contents
2016-09-06 14:00:07 +02:00
Dominik Richter
6b07f3337a add demo yml contents
Closes https://github.com/chef/inspec/issues/954
2016-09-06 13:30:06 +02:00
Christoph Hartmann
59989d7f83 0.33.0 2016-09-05 17:43:19 +02:00
Christoph Hartmann
ec2e994dae Merge pull request #1017 from chef/chris-rock/cli-report-show-errors
always display error message
2016-09-05 17:34:30 +02:00
Christoph Hartmann
0a34ffef5a always display error message 2016-09-05 17:23:14 +02:00
Christoph Hartmann
8b90af58f3 Merge pull request #1019 from chef/ap/raise-invalid-uri
Raise error when an invalid URI is received
2016-09-05 16:49:14 +02:00
Alex Pop
8dcd71374b Raise error when an invalid URI is received 2016-09-05 14:44:01 +01:00
Christoph Hartmann
782e4daa00 Merge pull request #1018 from chef/chris-rock/winrm-v2
use winrm v2
2016-09-05 13:54:44 +02:00
Christoph Hartmann
2dbcbb6cb1 update train and kitchen-inspec version to support winrm v2 2016-09-05 13:36:48 +02:00
Christoph Hartmann
73f93c2756 fix powershell based unit tests 2016-09-05 13:36:48 +02:00
Christoph Hartmann
c3c648eeb9 fix integration tests for usage with winrm v2 2016-09-05 13:36:48 +02:00
Dominik Richter
482a48cedc Merge pull request #1007 from chef/chris-rock/suse-11
improve suse 11 support for service resource
2016-09-05 10:30:08 +01:00
Christoph Hartmann
3ddcb4c418 fix integration tests for suse 11 2016-09-05 11:22:52 +02:00
Christoph Hartmann
3346d7e1a9 support /etc/init.d directory for run level configuration 2016-09-05 11:08:21 +02:00
Christoph Hartmann
0084873df8 add suse 11 to chef images 2016-09-05 11:08:21 +02:00
Christoph Hartmann
90a8584d10 Merge pull request #994 from chef/ssd/resource-isolation
Initial attempt at isolating resources between dependencies
2016-09-05 11:07:29 +02:00
Steven Danna
30a23b1b85
Minor code-review change to ControlEvalContext
- Add comment describing describe
- Fixup to_s output to be more accurate

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-05 09:28:50 +01:00
Steven Danna
9bb65bd60c Use per-profile execution contexts for library loading
Previously, libraries were loaded by instance_eval'ing them against
the same execution context used for control files.  All resources were
registered against a single global registry when the `name` dsl method
was invoked.  To obtain seperation of resources, we would mutate the
instance variable holding the globale registry and then change it back
at the end.

Now, we instance_eval library files inside an anonymous class.  This
class has its own version of `Inspec.resource` that returns another
class with the resource DSL method and the profile-specific resource
registry.
2016-09-04 20:55:20 +02:00
Steven Danna
5fdf659df1 Load all dependent libraries, even if include_context isn't called
The goal of these changes is to ensure that the libraries from
dependencies are loaded even if their controls are never included.  To
facilitate this, we break up the loading into seperate steps, and move
the loading code into the Profile which has acceess to the dependency
information.

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-04 20:55:20 +02:00
Steven Danna
384ccb610c Initial attempt at isolating resources between dependencies
Previously, all resources were loaded into a single resource registry.
Now, each profile context has a resource registry, when a profile's
library is loaded into the profile context, we update the
profile-context-specific resource registry.  This local registry is
then used to populate the execution context that the rules are
evaluated in.

Signed-off-by: Steven Danna <steve@chef.io>
2016-09-04 20:55:20 +02:00
Christoph Hartmann
a116406b4e Merge pull request #1014 from jeremymv2/fix_apache_conf
Fix apache conf
2016-09-04 20:18:16 +02:00
Jeremy J. Miller
898fe125f2 keep os logic in apache resource 2016-09-04 13:27:14 -04:00
Christoph Hartmann
5bfc234500 Merge pull request #1008 from chef/vj/fix-cli-inherited-profiles
fix cli inherited profiles
2016-09-04 18:51:15 +02:00
Victoria Jeffrey
0667c334e9 fix inherited profile cli report for realz this time 2016-09-04 18:28:01 +02:00
Victoria Jeffrey
99ce09c4ac fix inherited profile cli report 2016-09-04 18:28:01 +02:00
Christoph Hartmann
f418e873df Merge pull request #1012 from chef/ap/mysql-os-fix
Fix os exception in mysql resource
2016-09-04 16:51:19 +02:00
Jeremy J. Miller
d5b2e4bf53 removed testing artifact 2016-09-02 22:04:06 -04:00
Jeremy J. Miller
03cb244e84 removed superflous Listen 80 2016-09-02 22:02:47 -04:00
Jeremy J. Miller
c0d105671e better description for tests 2016-09-02 22:00:12 -04:00
Jeremy J. Miller
1b92d15d8f added unit tests 2016-09-02 21:55:28 -04:00
Jeremy J. Miller
5774dacfea use inspec.os.debian? 2016-09-02 13:57:35 -04:00
Jeremy J. Miller
3919d33ccb fixing apache_conf.conf_dir 2016-09-02 13:44:16 -04:00
Alex Pop
f1b1794ee5 fix os exception 2016-09-02 15:24:50 +01:00
Christoph Hartmann
0ca497e333 Merge pull request #1004 from chef/vj/fix-cli-report
vj/fix cli report
2016-09-02 07:45:32 +01:00
Victoria Jeffrey
5d5aa6354d fix and add test 2016-09-01 20:39:52 -04:00
Victoria Jeffrey
a779d1813d print exception msg for tests in anonymous describe block 2016-09-01 20:39:52 -04:00
Victoria Jeffrey
662de80d1d include status icon in printed tests even when only one 2016-09-01 20:39:52 -04:00
Victoria Jeffrey
1d15e8bc4b only print no tests executed when no tests have been executed 2016-09-01 20:39:52 -04:00
Christoph Hartmann
8616abfe1a Merge pull request #989 from chef/vj/inspec-demo
inspec demo
2016-09-01 23:52:05 +01:00
Christoph Hartmann
9340bc97a7 add generated files for tutorial in gitignore 2016-09-01 22:33:41 +01:00
Victoria Jeffrey
24c30e0603 handle next and prev commands 2016-09-01 22:33:41 +01:00