Commit graph

3526 commits

Author SHA1 Message Date
Dominik Richter
1dafe50bd9 rename SimpleConfig / parse_config / parse_config_file options
See https://github.com/chef/inspec/issues/1709
Fixes https://github.com/chef/inspec/issues/1709

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-26 23:18:40 +02:00
Dominik Richter
71a4f0d8f0 Merge pull request #1719 from chef/dr/inspec-version
provide `inspec.version` information
2017-04-26 13:40:29 +02:00
Dominik Richter
8e5fbb9e02 provide inspec.version information
as a friendly shortcut and a native call within profiles

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-26 13:07:32 +02:00
Christoph Hartmann
075336da54 Merge pull request #1718 from chef/dr/expose-inspec
provide the `inspec` keyword
2017-04-26 13:03:30 +02:00
Dominik Richter
8b7ef09f85 provide the inspec keyword
Instead of my favorite shortcut of `os.inspec` just finally add it as a global keyword.

Preparation for https://github.com/chef/inspec/issues/1396

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-26 12:30:31 +02:00
Christoph Hartmann
bf1d2ded6d Merge pull request #1717 from chef/dr/prettyprint-inspec-backend
print and prettyprint the inspec backend class
2017-04-26 12:23:36 +02:00
Dominik Richter
50e1c76fce print and prettyprint the inspec backend class
This is always bothersome when debugging code and drilling down objects, since it will just a return a two-layer anonymous class with no help at all.
Instead print a nice name and even give a bit of information on pretty-printing (which pry does naturally)

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-26 12:04:01 +02:00
Christoph Hartmann
5212ba9580 Merge pull request #1713 from chef/dr/docs-impact
describe the value ranges of `impact`
2017-04-25 21:14:28 +02:00
Dominik Richter
a7771a4ebc describe the value ranges of impact
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-25 19:01:16 +02:00
Christoph Hartmann
49f233f2b6 Merge pull request #1711 from chef/dr/prettyprint-control-desc
pretty-print multiline control descriptions
2017-04-25 18:20:09 +02:00
Dominik Richter
c5101e5ef0 pretty-print multiline control descriptions
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-25 17:12:30 +02:00
Christoph Hartmann
8c42d3ec53 Merge pull request #1710 from chef/dr/doc-other-tools
document reference to other tools
2017-04-25 16:22:59 +02:00
Dominik Richter
6b2532224b add podcast link to docs on serverspec-inspec
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-25 15:49:56 +02:00
Dominik Richter
ec05c16797 reference docs to other tools in readme
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-25 15:44:33 +02:00
Christoph Hartmann
9252b61682 Merge pull request #1707 from chef/dr/fix-unindent
bugfix: unindent description misbehaviors
2017-04-25 13:40:53 +02:00
Dominik Richter
37a2e45cd1 bugfix: unindent description misbehaviors
Unindent has been misbehaving for control `desc`riptions by completely removing newlines. This is now fixed and the unindentation mechanism improved to behave as expected.

Removing empty lines at the beginning and end of string remains unchanged.
Tabs are not treated as multi-space indentations; supporting them as 8-space chars would require additional effort (please comment if this is important to you)

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-25 13:21:38 +02:00
Dominik Richter
5f9d1980f7 Merge pull request #1706 from chef/chris-rock/improve-docker-error-handling
handle json parse errors in docker resource
2017-04-25 12:41:28 +02:00
Christoph Hartmann
b3cdc6ba04 handle json parse errors in docker resource
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-04-25 12:02:26 +02:00
Christoph Hartmann
ea2711d213 Merge pull request #1705 from chef/dr/newlines-in-inspec-objects
inspec control.to_ruby to use newlines instead of `\n`
2017-04-25 11:20:32 +02:00
Dominik Richter
37a778173d inspec control.to_ruby to respect newlines
I.e. instead of printing them as:

```
desc "hello\nworld"
```

it would instead do:

```
desc "hello
world"
```

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-25 10:34:45 +02:00
Adam Leff
9c75b52fd4 Merge pull request #1703 from chef/adamleff/release-1.21.0
Release 1.21.0
2017-04-24 16:28:21 -04:00
Adam Leff
e352deb6ef
Release 1.21.0
Signed-off-by: Adam Leff <adam@leff.co>
2017-04-24 16:27:27 -04:00
Christoph Hartmann
218bda9c34 Docker resource (#1566)
* add docker, docker_container, and docker_image resources

Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-04-24 10:47:03 -04:00
Christoph Hartmann
8e62f6b4f7 Merge pull request #1694 from chef/dr/warn-uninitialized
bugfix: solve warn on uninitialized
2017-04-22 12:49:09 +02:00
Dominik Richter
f731cbca92 bugfix: solve warn on uninitialized
@expectation was analyzed without initializeation, leading to ruby errors. fix it

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-22 12:35:56 +02:00
Adam Leff
2eef024c0c Merge pull request #1691 from chef/adamleff/update-www-gemfile
[www] Update www Gemfile.lock
2017-04-21 13:57:31 -04:00
Adam Leff
c6e3b38e6d
[www] Update www Gemfile.lock
The Gemfile.lock in the www directory needs to be updated since
the last InSpec release. We should probably do this as part of
the normal InSpec release process.

You need to `bundle install` before releasing the web stuff,
and the www rake tasks will fail if your git repo is unclean.

Signed-off-by: Adam Leff <adam@leff.co>
2017-04-21 13:54:35 -04:00
Richard Shade
532efccf0e showing how to shellout in docs (#1689)
* showing how to shellout in docs

Signed-off-by: Richard Shade <rshade@rightscale.com>
2017-04-21 13:47:28 -04:00
Christoph Hartmann
b03ee9d0ba Merge pull request #1681 from Happycoil/add-windows-user-groups
fetch user groups while building user object
2017-04-21 11:00:49 +02:00
Tor Magnus Rakvåg
8ad02f4d04 added test for guest user
Signed-off-by: Tor Magnus Rakvåg <tm@intility.no>
2017-04-21 09:45:58 +02:00
Tor Magnus Rakvåg
740b84a387 use userinfo hash instead of hard coding
Signed-off-by: Tor Magnus Rakvåg <tm@intility.no>
2017-04-21 09:44:14 +02:00
Christoph Hartmann
09f3a41496 Merge pull request #1683 from chef/adamleff/fix-resources-docs
[www] Fix docs pages for x509_certificate and key_rsa
2017-04-21 07:33:22 +02:00
Adam Leff
cdfabd9362 Fix docs pages for x509_certificate and key_rsa
These files were not named correctly and the docs rake task
was not picking them up.

Signed-off-by: Adam Leff <adam@leff.co>
2017-04-21 07:22:12 +02:00
Adam Leff
6af8d9cc7b Merge pull request #1682 from Happycoil/fix-spelling-mistake
fix spelling mistake in powershell resource documentation
2017-04-20 13:27:09 -04:00
Tor Magnus Rakvåg
1c5b35c890 you -> your
Obvious fix.
2017-04-20 17:43:33 +02:00
Tor Magnus Rakvåg
96bb596bc4 fetch user groups while building user object
Signed-off-by: Tor Magnus Rakvåg <tm@intility.no>
2017-04-20 16:02:21 +02:00
Christoph Hartmann
950816b74c Merge pull request #1680 from chef/dr/sslshake-1.2
update sslshake to v1.2
2017-04-20 15:20:33 +02:00
Dominik Richter
e87494245a update sslshake to v1.2
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
2017-04-20 15:02:30 +02:00
Adam Leff
eb7de3ac35 Merge pull request #1676 from chef/HM-Fix-Control-WWW
Fix type-o in control code
2017-04-19 14:08:11 -04:00
hannah-radish
1e2378a391 Fix type-o in control code
source: https://twitter.com/mindful_monk/status/854692556625653762
Signed-off-by: hannah-radish <hmaddy@chef.io>
2017-04-19 10:02:04 -07:00
Tyler Ball
488ef492de Merge pull request #1663 from chef/ER-508/extending_http_resource
ER-508 Extended http resource to support no ssl verification
2017-04-18 14:25:10 -06:00
Adam Leff
0fe13fd0af Merge pull request #1668 from chef/chris-rock/fix-help-sshd-config
fix sshd config help
2017-04-18 15:04:07 -04:00
Adam Leff
6f57af7579 Merge pull request #1669 from chef/chris-rock/fix-web-reference
fix web reference url
2017-04-18 15:02:25 -04:00
Elizabeth Uselton
d376a6a881 ER-508 Extended http resource to support no ssl verification
We needed to be able to run inspec against endpoints with self signed certificates and this was the quickest way for us to get there.

Signed-off-by: Elizabeth Uselton <elizabeth.uselton@gmail.com>
2017-04-18 19:01:57 +02:00
Christoph Hartmann
7f756d4ada Merge pull request #1662 from chef/adamleff/habitat-reconfigure
Move Habitat sleep time to config file
2017-04-18 13:39:06 +02:00
Christoph Hartmann
b93aa0715b fix web reference url
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-04-18 12:04:59 +02:00
Christoph Hartmann
438a1c52ab fix sshd config help
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
2017-04-18 12:01:55 +02:00
Adam Leff
7a71719f13 Move Habitat sleep time to config file
Because the sleep_time is not written to a config file but instead
only rendered into the run hook, hab-sup doesn't restart the running
process upon any config updates. This change moves the sleep_time to
a settings config file which is read in by the run hook. This will
allow Habitat to restart the InSpec process whenever a user changes
the sleep time.

I also cleaned up the non-zero exit error message to give the user
a better indication as to why the run may have "failed."

Signed-off-by: Adam Leff <adam@leff.co>
2017-04-14 12:01:25 -04:00
Adam Leff
f09a100a4a Merge pull request #1657 from chef/adamleff/1.20.0
Release 1.20.0
2017-04-13 11:38:10 -04:00
Adam Leff
17d611c053
Release 1.20.0
Signed-off-by: Adam Leff <adam@leff.co>
2017-04-13 11:37:23 -04:00