Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-23 21:23:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
3758 commits 453 branches 1898 tags 74 MiB
Commit graph

3758 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Chisamore
798aebf672 Bump default timeouts for http resource 
This changes the default read and open timeouts to be 60 seconds which
matches the defaults for `Net::HTTP` backend which Faraday uses by
default:
https://ruby-doc.org/stdlib-2.4.1/libdoc/net/http/rdoc/Net/HTTP.html#read_timeout-attribute-method
https://ruby-doc.org/stdlib-2.4.1/libdoc/net/http/rdoc/Net/HTTP.html#open_timeout-attribute-method

The current timeout values are too small which causes tests to be
flakey.

Signed-off-by: Seth Chisamore <schisamo@chef.io>
 2017-05-29 15:07:49 -04:00
Christoph Hartmann
45afca2e98 Merge pull request #1844 from cattywampus/cattywampus/gem-not-installed 
Fix assert that a gem is not installed
 2017-05-29 15:06:36 -04:00
Dominik Richter
b1419b84bf Merge pull request #1851 from username-is-already-taken2/gb/patch_1571 
Amended the processes resource to skip on windows
 2017-05-28 10:35:29 -04:00
Christoph Hartmann
da0b98f4d2 Merge pull request #1852 from aaronlippold/dr/postgres 
bugfix: postgres relative path includes
 2017-05-27 19:35:22 -04:00
Dominik Richter
9b959b15f3 Merge pull request #1853 from chef/adamleff/raise-if-profile-url-is-bad 
Raise exception if profile target URL cannot be parsed
 2017-05-26 17:24:52 -05:00
Adam Leff
88581ae3dd
Raise exception if profile target URL cannot be parsed 
When attempting to parse the profile out of the target URL, we
were not raising an exception if we failed to do so. Such a situation
could arise if a user's inspec config.json is incorrect either due to
manual editing or failure to re-login after an upgrade past Automate
0.8.0.

This change provides a clear exception if this occurs and also adds
tests for the compliance_profile_name method.

Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-26 14:30:37 -05:00
Aaron Lippold
dbd3b5c23d bugfix: postgres relative path includes 
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: https://github.com/chef/inspec/issues/1780
Fixes: https://github.com/chef/inspec/issues/1738

Signed-off-by: Aaron Lippold <lippold@gmail.com>
 2017-05-26 14:49:24 -04:00
username-is-already-taken2
f1057ac754 Amended the process resource to skip on windows 
Signed-off-by: username-is-already-taken2 <gary.bright@niu-solutions.com>
 2017-05-26 16:33:30 +01:00
gbright
b17f0de7cf Amended to resolve issue 1839 
Signed-off-by: username-is-already-taken2 <gary.bright@niu-solutions.com>
 2017-05-25 21:02:01 +01:00
Keith Walters
215ef38ee9 Fix installed? check for gem resource 
The gem resource used to determine if a gem is installed based on the exit
status of the `gem` command, however that command will return zero
if the package was found or not. This patch checks to ensure that the
`gem list` command actually includes the gem name or is empty to
determine if the gem is in fact installed.

If the gem command returns something other than a `0` exit code, then
it'll skip the resource.

Signed-off-by: Keith Walters <keith.walters@cattywamp.us>
 2017-05-22 15:34:01 -05:00
Adam Leff
9e71c94b83 Merge pull request #1842 from chef/adamleff/release-1.25.1 
Release 1.25.1
 2017-05-19 21:23:12 -04:00
Adam Leff
e06359fc40
Release 1.25.1 
Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-19 21:22:30 -04:00
Adam Leff
91d51b371a Merge pull request #1841 from chef/fix-method 
Fixing typo on method name
 2017-05-19 21:19:27 -04:00
Adam Leff
81bfdf2d55
Fix is_automate_server_080_and_later? call 
Method name was incorrect (missing `?`) and also was missing
the required config parameter.

Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-19 21:07:58 -04:00
Seth Thomas
9f30fe1726 Fixing typo on method name 
Signed-off-by: Seth Thomas <sthomas@chef.io>
 2017-05-19 19:58:46 -04:00
Adam Leff
6c53188e85 Merge pull request #1832 from chef/chris-rock/version-error 
throw an error during inspec check if the version is not correct
 2017-05-18 09:30:33 -04:00
Christoph Hartmann
b0ab35d941
throw an error during inspec check if the version is not correct 
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
 2017-05-18 09:13:37 -04:00
Adam Leff
35dda621d7 Merge pull request #1824 from chef/adamleff/release-1.25.0 
Release InSpec 1.25.0
 2017-05-17 13:37:11 -04:00
Adam Leff
87e3c6c3a9
Release InSpec 1.25.0 
Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-17 13:36:15 -04:00
Adam Leff
60825a3ec2 Merge pull request #1822 from chef/chris-rock/version-as-json 
return version as json
 2017-05-17 09:53:49 -04:00
Adam Leff
0d91fefd6a
Added functional tests for inspec version --format json 
Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-17 09:41:38 -04:00
Christoph Hartmann
1aa223c99b return version as json 
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
 2017-05-17 15:21:40 +02:00
Christoph Hartmann
3140eeae35 Merge pull request #1819 from chef/chris-rock/compliance-plugin 
support new automate compliance backend
 2017-05-17 15:15:56 +02:00
Christoph Hartmann
5cc288d5df support new automate 0.8.0 
Signed-off-by: Christoph Hartmann <chris@lollyrock.com>
 2017-05-17 15:02:08 +02:00
Christoph Hartmann
8b015f521a Merge pull request #1816 from chef/dr/source 
bugfix: read source code if profile is in tgz/zip
 2017-05-16 13:32:13 +02:00
Dominik Richter
b23c197202 bugfix: read source code if profile is in tgz/zip 
Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2017-05-16 13:19:25 +02:00
Adam Leff
0a50d288fc Merge pull request #1516 from grv87/master 
Fix problem with `kitchen-inspec` link on website
 2017-05-15 22:16:15 -04:00
Adam Leff
6ebb62dc10 Merge pull request #1727 from elliott-davis/fix_postgres_resource 
Update postgresql conf resource to accept include_dir as a string as well as an array
 2017-05-15 22:03:23 -04:00
Christoph Hartmann
581d0789ff Merge pull request #1809 from chef/adamleff/add-v-to-changelog-version 
Fix version string in changelog generator
 2017-05-15 12:01:10 +02:00
Adam Leff
6c006f5425
Fix version string in changelog generator 
When I made the change to pull the version from ENV (as is used
during the bump_version rake task), I neglected to prefix it with
a "v", which causes the "full changelog" links to be incorrect.

Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-11 15:15:00 -04:00
Adam Leff
febce5e5a1
Fix Changelog version links 
The "v" was left off the links. Need to fix that in the changelog generator.

Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-11 14:55:40 -04:00
Adam Leff
3a4da4b7ca Merge pull request #1808 from chef/adamleff/release-1.24.0 
Release v1.24.0
 2017-05-11 14:46:57 -04:00
Adam Leff
162b0d8cb8
Release v1.24.0 
Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-11 14:46:20 -04:00
Adam Leff
a5e5cc0dec Merge pull request #1714 from aaronlippold/postgres-session-update 
updated the psql command so that it does not print the headers and ex…
 2017-05-11 14:34:05 -04:00
Adam Leff
7792376afd Merge pull request #1807 from echohack/ui_fix 
minor ui fix
 2017-05-11 14:32:03 -04:00
echohack
b5d0012679 minor ui fix 
Signed-off-by: echohack <echohack@users.noreply.github.com>
 2017-05-11 11:10:01 -07:00
Dominik Richter
baf66630ef Merge pull request #1805 from chef/elliott/fixup_hab_plan 
Add busybox-static to habitat plan so netstat works for port resource on linux
 2017-05-11 19:23:14 +02:00
Elliott Davis
c99853a7cc Add busybox-static to habitat plan so netstat works for port resource on linux 
Signed-off-by: Elliott Davis <edavis@chef.io>
 2017-05-11 11:16:41 -05:00
Aaron Lippold
684d81d4c2 psql doesn't print headers + extra output + cconfigurable host + docs 
Signed-off-by: Aaron Lippold <lippold@gmail.com>
 2017-05-11 08:58:55 -04:00
Dominik Richter
ef7739256c Merge pull request #1796 from chef/dr/checksum 
add sha256 checksum to json
 2017-05-11 10:10:29 +02:00
Dominik Richter
d44b751603 add sha256 checksum to json 
Fixes https://github.com/chef/inspec/issues/1658

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2017-05-11 09:52:28 +02:00
Dominik Richter
9e1ddfb422 Merge pull request #1801 from phiggins/fix-typo-in-service-doc 
Fix typo in service docs.
 2017-05-11 09:06:29 +02:00
Dominik Richter
0f8fe923a4 Merge pull request #1799 from chef/adamleff/hide-blurb 
Hide event blurb on main page
 2017-05-11 09:05:15 +02:00
Pete Higgins
489f6ff365 Fix typo s/oe/or/. 
Signed-off-by: Pete Higgins <pete@peterhiggins.org>
 2017-05-10 18:11:16 -07:00
Adam Leff
e551a7c4e8
Hide event blurb on main page 
There are no pending events other than ChefConf, so I'm hiding
the upcoming event blurb section for now.

Signed-off-by: Adam Leff <adam@leff.co>
 2017-05-10 16:57:20 -04:00
Ryan Hass
3a3ce30a85 Add core/lsof package to facilitate port detection. (#1789) 
* Add core/lsof package to facilitate port detection.

Signed-off-by: Ryan Hass <rhass@users.noreply.github.com>
 2017-05-10 12:45:46 -04:00
Adam Leff
2fef5202fa Merge pull request #1791 from elliott-davis/elliott/fixup_hab_plan 
Update hab exporter to use inspec in path over calling to hab sup
 2017-05-10 07:38:56 -04:00
Christoph Hartmann
ac5eb7a5e0 Merge pull request #1792 from chef/dr/platform-info 
add platform info to json formatter
 2017-05-10 10:51:19 +02:00
Dominik Richter
169268740d add platform info to json formatter 
As part of https://github.com/chef/inspec/issues/1661

Signed-off-by: Dominik Richter <dominik.richter@gmail.com>
 2017-05-10 10:13:18 +02:00
Elliott Davis
31645968e2 Update hab exporter to use inspec in path over calling to hab sup 
Signed-off-by: Elliott Davis <edavis@chef.io>
 2017-05-09 20:09:33 -05:00