Commit graph

44 commits

Author SHA1 Message Date
Bryan McLellan
104d669df6 Add ed25519 support to the habitat package
net-ssh only has ed25519 support if the gem is installed. Because it has
native extensions we currently install it as part of the Omnibus package
via the Gemfile, and do not include it in the gemspec.

Without this using ssh keys with `inspec exec -t ssh://` errors with:

```
STDERR: /hab/pkgs/chef/inspec/4.23.16/20201102165953/lib/gems/net-ssh-6.1.0/lib/net/ssh/authentication/ed25519_loader.rb:21:in `raiseUnlessLoaded': OpenSSH keys only supported if ED25519 is available (NotImplementedError)
```

Signed-off-by: Bryan McLellan <btm@loftninjas.org>
2020-11-04 21:40:45 -05:00
Bryan McLellan
f03c627f75 Upgrade the habitat Ruby dependency to 2.6
We're using ruby 2.6.6 for omnibus via `omnibus_overrides.rb`, but the
core/ruby package is actually Ruby 2.5.

Signed-off-by: Bryan McLellan <btm@loftninjas.org>
2020-10-21 19:42:37 -04:00
James Stocks
230ca2ba03 Fix PATH for Habitat execution
plan.sh was expanding $PATH at build time when writing out the inspec bin script. This is incorrect, the variable should be expanded at runtime.

Signed-off-by: James Stocks <jstocks@chef.io>
2020-07-17 14:13:20 +01:00
Ryan Davis
45db70f673 Trying, AGAIN, to exclude symlinks from json_schemer gem.
Signed-off-by: Ryan Davis <zenspider@chef.io>
2020-02-13 12:44:12 -08:00
Ryan Davis
f0b9dde4af I don't think we're ready for StrictMode.
Signed-off-by: Ryan Davis <zenspider@chef.io>
2020-02-13 12:42:41 -08:00
Ryan Davis
3c9c2b4b1f Get stricter about error handling in powershell.
Still doesn't do anything about subcmds failing. Those have to be
manually checked.

Signed-off-by: Ryan Davis <zenspider@chef.io>
2020-02-11 15:46:03 -08:00
Keka Ichinose
72ecdde8c4
Merge pull request #4878 from inspec/mj/habver
With the release version 1.5.0 of habitat, lets not worry about <0.85
2020-02-11 13:07:34 -08:00
Ryan Davis
b1fd3bcf85 Change windows hab builds to hopefully be more obvious when they fail.
Also change the appbundle order to lowest build/dep first.

Signed-off-by: Ryan Davis <zenspider@chef.io>
2020-02-10 18:34:00 -08:00
Ryan Davis
87b39d1f7f Removed Remove-StudioPathFrom from habitat/plan.ps1.
We don't have backslashes in our Gemfile so I'm not sure what it was
doing in the first place... AND, apparently the file wasn't there.

Signed-off-by: Ryan Davis <zenspider@chef.io>
2020-01-30 17:19:11 -08:00
Miah Johnson
82529cc859 With the release version 1.5.0 of habitat, lets not worry about <0.85
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2020-01-30 16:41:07 -08:00
Ryan Davis
beda815524 I *think* this will fix habitat.
Signed-off-by: Ryan Davis <zenspider@chef.io>
2020-01-30 16:19:05 -08:00
John Snow
7362a8db6d Remove the references to the core/cacerts so customers can specify it
Signed-off-by: John Snow <thelunaticscripter@outlook.com>
2020-01-23 12:49:26 -05:00
Miah Johnson
c3354a9f5b incorporate changes from chef hab plan
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-11-01 11:10:49 -07:00
Miah Johnson
ff7891132a Cleanup plan before merge
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
0589e2edc9 hooked on phonics worked for me!
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
d3cfb38dc2 Invoke-Check is used for testing..
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
d7487ed70a Execute the correct rake task
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
4544ff30aa Add a very simple test for Windows Habitat builds.
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
8b9bb3983a Shouldn't have a cache of git-ref'd gems as we dont have any.
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
0ca4e66bc6 Add vendor/bin to pkg directories, should let us get appbundler.
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
76cf8aafea We have no gems using a git reference. This stacktraces during build.
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
aa87212e9f Basically cargo-copy https://github.com/chef/chef/blob/habiwindochef/habitat/plan.ps1
Thanks @robbkidd =)

Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
1b41dfb12e wip?
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
e9cca66b1c basics
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
Miah Johnson
01bea50c43 copy paste plan.sh -> plan.ps1 and change for Powershell
Signed-off-by: Miah Johnson <miah@chia-pet.org>
2019-10-16 21:01:19 -07:00
tyler-ball
60125d890b Habitat should install inspec-bin and activate inspec from that
Signed-off-by: tyler-ball <tball@chef.io>
2019-04-29 15:47:26 -06:00
Jay Mundrawala
257c8d7e39 Make gems not world writable
Signed-off-by: Jay Mundrawala <jay@thechamberofunderstanding.com>
2019-01-18 10:53:32 -06:00
Will Fisher
3008c98061 habitat packaging: Fix inspec wrapper linking to /bin/bash instead of the bash hab package (#3671)
Signed-off-by: Will Fisher <wfisher@chef.io>
2018-12-20 13:29:51 -05:00
Jerry Aldrich
4eb5f0eeb6 Remove Habitat package run time dependencies from Habitat plan (#3645)
* Remove Hab pkg deps in favor of OS binaries

This removes the runtime dependencies on Hab pkgs and instead modifies
the `PATH` environment variable to use the OS binaries where the InSpec
Habitat package is installed.

It should be noted that this is counter to what Habitat intends in most
cases. In general, it is preferable to use only Habitat packages as
runtime dependencies to get all the benefits that Habitat provides.

We elected not to do this for the InSpec Habitat package since the list
of binaries that would need to be installed to support all InSpec
resources would be prohibitively expensive (both in disk space and
network requirements). If you wish to use Habitat packaged binaries with
this package you can use `hab pkg install origin/my-binary --binlink`.

Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>

* Modify Habitat install example to use `--binlink`

Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>

* Add `core/git` runtime dep (used for fetching)

Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>
2018-12-06 10:16:56 -05:00
Jared Quick
b8b9a379a3
Update hab plan for hab 0.56+ (#3241)
Signed-off-by: Jared Quick <jquick@chef.io>
2018-07-20 12:59:15 -04:00
Jared Quick
c01ec12947
Update hab to use psql client. (#3234)
Signed-off-by: Jared Quick <jquick@chef.io>
2018-07-18 16:55:19 -04:00
pete higgins
045671703e Add git dependency to habitat plan. (#3037)
Signed-off-by: Pete Higgins <pete@peterhiggins.org>
2018-05-10 14:49:44 -04:00
Jerry Aldrich
700d042422 Update Habitat plan (#3000)
This updates the included Habitat plan to do the following:
  - Include binaries needed for certain resources (Example: `curl`)
  - Use `gem install/build` instead of Bundler
  - Use a wrapper binary to ensure GEM_HOME and GEM_PATH are correct
  - Perform build/install steps in a cache directory instead of `/src`

Many thanks to @miah @tduffield

Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>
2018-04-27 10:57:13 -04:00
Adam Leff
01b65db6c7 Habitat build works for all versions, eliminates rake (#2301)
The Habitat plan has been modified to support building from the repo
rather than relying on a gem being pushed to RubyGems. This allows
us to build current packages at every merge rather than only pushing to
Habitat Builder when we promote to stable.

This change also enables Expeditor to perform builds for us and removes
the dependency on the rake task as it is no longer needed.

Signed-off-by: Adam Leff <adam@leff.co>
2017-11-14 05:01:51 +01:00
Nathan L Smith
8ede5556ba Use RubyGems version for habitat plan
In #1820 we made it so inspec would install the checked out source
version rather than the version from RubyGems.

This actually didn't work (though it wasn't apparent in a development
environment) because it used a relative path to bin/inspec that pointed
at /src/bin/inspec, which only exists if you're in a Habitat studio
started from the InSpec repo.

Revert back to getting the gem from RubyGems to avoid this problem and
have a working package.

Signed-off-by: Nathan L Smith <smith@chef.io>
2017-06-01 16:26:26 -05:00
Nathan L Smith
6324a6d289 Improvements to Habitat plan
These are kind of all over the place, but should improve things:

* Use the new `pkg_version` mechanism to set the version, and fail if
  the VERSION file is not present
* Use inspec.io for the upstream url
* Remove pkg_source and it's associated callbacks; they aren't required
  any more
* Alphabetize the deps list
* Remove duplicate coreutils from build deps
* Move environment variable setting to `do_prepare`
* Delete all binstubs in bin that aren't inspec
* Put the generated Gemfile in $CACHE_PATH so it doesn't stomp on the
  developer's Gemfile
* Insert the SSL_CERT_FILE env var in the binstub (Fixes #1582)
* Use install instead of cp to drop off Gemfile.lock
* Build using `path: '$SRC_PATH'` instead of `'= $pkg_version'` in the Gemfile
* Disable `do_strip` to decrease build time and because we don't need it

Works for me on Habitat 0.23.

Since all the "building" is done now in `do_install`, it would be
possible to define a `do_check` that runs `inspec exec` on profiles to
verify inspec is working by running inspec.

Signed-off-by: Nathan L Smith <smith@chef.io>
2017-05-29 15:41:26 -04: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
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
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
Ryan Hass
56364caeaa Add core/hab to pkg_deps in hab plan.
Runtime of `hab pkg exec chef/inspec` changes the path for the inspec
runtime to match that of the inspec hab package. This makes it so tests
which need to execute things like `hab pkg path myorigin/mypath` in the
can profile/test can successfully execute the command.

Signed-off-by: Ryan Hass <rhass@users.noreply.github.com>
2017-04-27 17:17:54 -07:00
Adam Leff
73d46f9c49
Replace Nokogiri with REXML in the JUnit formatter
In #1454, we welcomed a newly-revamped JUnit formatter which has
a dependency on Nokogiri. Unfortunately, this had led us to problems
getting InSpec included in Chef omnibus builds (see chef/chef#5937)
because Chef is using Ruby 2.4.1 and the Nokogiri maintainers have
not yet released a windows binary gem that supports Ruby 2.4.x.
This has led to breaking builds in Chef's CI platform and would
block the acceptance of chef/chef#5937.

This change replaces Nokogiri use with REXML instead. While REXML
can be slower than Nokogiri, it does not require native extensions
and is supported on all Chef platforms.

Signed-off-by: Adam Leff <adam@leff.co>
2017-04-03 14:51:48 -04:00
Adam Leff
4dae0bead8 Fix Habitat plan for nokogiri support
Nokogiri is failing to build in the habitat artifact due to the lack
of libxml2 and libxslt. This brings them in as dependencies and also
properly configures bundler to use them.

Signed-off-by: Adam Leff <adam@leff.co>
2017-03-21 17:51:59 -04:00
Adam Leff
3e0369046e Add Rake to Habitat build Gemfile
The `rainbow` gem requires `rake` to build native extensions, and rake
is a development dependency for InSpec, not a runtime dependency.

This change adds the `rake` gem to the Habitat build Gemfile so we
can successfully build a Habitat artifact.

Signed-off-by: Adam Leff <adam@leff.co>
2017-03-01 18:10:53 +01:00
Dave Parfitt
5231a0dc43 move Inspec Habitat package to chef/inspec.
NOTE: The existing `core/inspec` package (version 0.27.0) cannot be removed
from the public Habitat depot.
2016-10-12 15:03:24 -04:00