inspec 2.1.68 → 2.1.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc06a8947f28bce46b717042d1e7f4a6d40dd05d
-  data.tar.gz: b403a15967a3c78db4022bc3a6b261c61c5b89c0
+  metadata.gz: 534b2e87a2c65b5c196e7af32599623cd4033a4d
+  data.tar.gz: 7f2a83fe85d5bf848f1d7747eecd65257ce3502e
 SHA512:
-  metadata.gz: 38b55180f6cbb5cd88ed9f8b382c17d5a3783210804d450532e422be0dfcaafb88069048c2a5382ff123bbae4bf09562e03fc3a6b39dbe6582ca15d98db8cad0
-  data.tar.gz: d5725629b0e2d53847a7d7eb7baadd8056b3e1444b8d831312186c9b6b9c702f6b02763cc9b4ad643fbd1a38bb9757325e95f09e87711800a9e57b6fbea0ad0d
+  metadata.gz: 9359c6eb7b7fd9920d25307d99d237d93e8fb3f47c66e16e86c858b1522edfba0a0e2787e9038a7eee2fbbd04a2514cac91b4486d5d3ab292f5e8b6636aba734
+  data.tar.gz: 87d990b0be675e94be9c9a327e379ab77c382fd55e82ef8cfe1eadb7f572eab309e2e4dbebb53c4c58fe53ef73918ce7dfb51d264121fcc1f8a5f456855d2f76

data/CHANGELOG.md

@@ -1,20 +1,35 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 2.1.68 -->
-## [v2.1.68](https://github.com/chef/inspec/tree/v2.1.68) (2018-05-04)
+<!-- latest_release 2.1.72 -->
+## [v2.1.72](https://github.com/chef/inspec/tree/v2.1.72) (2018-05-10)
 
-#### Merged Pull Requests
-- Fix the A2 vendoring with depends on the A2 server [#3022](https://github.com/chef/inspec/pull/3022) ([jquick](https://github.com/jquick))
+#### New Resources
+- Skeletal aws_ec2_instances resource [#3023](https://github.com/chef/inspec/pull/3023) ([clintoncwolfe](https://github.com/clintoncwolfe))
 <!-- latest_release -->
 
-<!-- release_rollup since=2.1.67 -->
-### Changes since 2.1.67 release
+<!-- release_rollup since=2.1.68 -->
+### Changes since 2.1.68 release
+
+#### New Resources
+- Skeletal aws_ec2_instances resource [#3023](https://github.com/chef/inspec/pull/3023) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.1.72 -->
+
+#### Enhancements
+- Add git dependency to habitat plan. [#3037](https://github.com/chef/inspec/pull/3037) ([phiggins](https://github.com/phiggins)) <!-- 2.1.71 -->
+
+#### Bug Fixes
+- Allow the depends key to be exposed in json profiles report [#3033](https://github.com/chef/inspec/pull/3033) ([jquick](https://github.com/jquick)) <!-- 2.1.70 -->
 
 #### Merged Pull Requests
-- Fix the A2 vendoring with depends on the A2 server [#3022](https://github.com/chef/inspec/pull/3022) ([jquick](https://github.com/jquick)) <!-- 2.1.68 -->
+- Fix typo in os_env_spec [#3028](https://github.com/chef/inspec/pull/3028) ([Happycoil](https://github.com/Happycoil)) <!-- 2.1.69 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v2.1.68](https://github.com/chef/inspec/tree/v2.1.68) (2018-05-04)
+
+#### Merged Pull Requests
+- Fix the A2 vendoring with depends on the A2 server [#3022](https://github.com/chef/inspec/pull/3022) ([jquick](https://github.com/jquick))
+<!-- latest_stable_release -->
+
 ## [v2.1.67](https://github.com/chef/inspec/tree/v2.1.67) (2018-05-03)
 
 #### New Features
@@ -32,7 +47,6 @@
 - Update Habitat plan [#3000](https://github.com/chef/inspec/pull/3000) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 - cmp should recognise a string being a negative int [#3007](https://github.com/chef/inspec/pull/3007) ([james-stocks](https://github.com/james-stocks))
 - Add inspec-core gem to expeditor release [#3018](https://github.com/chef/inspec/pull/3018) ([jquick](https://github.com/jquick))
-<!-- latest_stable_release -->
 
 ## [v2.1.59](https://github.com/chef/inspec/tree/v2.1.59) (2018-04-26)
 

data/docs/resources/aws_ec2_instances.md.erb

@@ -0,0 +1,79 @@
+---
+title: About the aws_ec2_instances Resource
+platform: aws
+---
+
+# aws\_ec2\_instances
+
+Use the `aws_ec2_instances` InSpec audit resource to test properties of some or all AWS EC2 instances. To audit a single EC2 instance, use `aws_ec2_instance` (singular).
+
+EC2 instances are the basic unit of computing within AWS.  An instance is a virtual machine that contains a running OS, and may be created or destroyed by code.
+
+Each EC2 instance is uniquely identified by its ID.
+
+<br>
+
+## Syntax
+
+An `aws_ec2_instances` resource block collects a group of EC2 Instances and then tests that group.
+
+    # Ensure you have exactly 3 instances
+    describe aws_ec2_instances do
+      its('instance_ids.count') { should cmp 3 }
+    end
+
+    # Use the InSpec resource to enumerate IDs, then test in-depth using `aws_ec2_instance`.
+    aws_ec2_instances.instance_ids.each do |instance_id|
+      describe aws_ec2_instance(instance_id) do
+        its('key_name') { should cmp 'admin-ssh-key' }
+      end 
+    end
+
+<br>
+
+## Examples
+
+As this is the initial release of `aws_ec2_instances`, its limited functionality precludes examples.
+
+<br>
+
+## Filter Criteria
+
+This resource currently does not support any filter criteria; it will always fetch all instances in the region.
+
+## Properties
+
+### entries
+
+Provides access to the raw results of the query, which can be treated as an array of hashes. This can be useful for checking counts and other advanced operations.
+
+    # Allow at most 100 EC2 Instances on the account
+    describe aws_ec2_instances do
+      its('entries.count') { should be <= 100}
+    end
+
+
+### instance_ids
+
+Provides a list of the instance ids that were found in the query.
+
+    describe aws_ec2_instances do
+      its('instance_ids') { should include('i-12345678') }
+      its('instance_ids.count') { should cmp 3) }
+    end
+
+<br>
+
+## Matchers
+
+For a full list of available matchers, please visit our [Universal Matchers page](https://www.inspec.io/docs/reference/matchers/). 
+
+### exist
+
+The control will pass if the filter returns at least one result. Use `should_not` if you expect zero matches.
+
+    # Verify that at least one EC2 Instance exists.
+    describe aws_ec2_instances
+      it { should exist }
+    end   
+

data/lib/inspec/reporters/json.rb

@@ -105,6 +105,7 @@ module Inspec::Reporters
           copyright_email: p[:copyright_email],
           supports: p[:supports],
           attributes: p[:attributes],
+          depends: p[:depends],
           groups: profile_groups(p),
           controls: profile_controls(p),
         }

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '2.1.68'
+  VERSION = '2.1.72'
 end

data/lib/resource_support/aws.rb

@@ -19,6 +19,7 @@ require 'resources/aws/aws_cloudwatch_log_metric_filter'
 require 'resources/aws/aws_config_delivery_channel'
 require 'resources/aws/aws_config_recorder'
 require 'resources/aws/aws_ec2_instance'
+require 'resources/aws/aws_ec2_instances'
 require 'resources/aws/aws_iam_access_key'
 require 'resources/aws/aws_iam_access_keys'
 require 'resources/aws/aws_iam_group'

data/lib/resources/aws/aws_ec2_instances.rb

@@ -0,0 +1,64 @@
+class AwsEc2Instances < Inspec.resource(1)
+  name 'aws_ec2_instances'
+  desc 'Verifies settings for AWS EC2 Instances in bulk'
+  example '
+    describe aws_ec2_instances do
+      it { should exist }
+    end
+  '
+  supports platform: 'aws'
+
+  include AwsPluralResourceMixin
+  def validate_params(resource_params)
+    unless resource_params.empty?
+      raise ArgumentError, 'aws_ec2_instances does not accept resource parameters.'
+    end
+    resource_params
+  end
+
+  # Underlying FilterTable implementation.
+  filter = FilterTable.create
+  filter.add_accessor(:entries)
+        .add(:exists?) { |x| !x.entries.empty? }
+        .add(:instance_ids, field: :instance_id)
+  filter.connect(self, :table)
+
+  def to_s
+    'EC2 Instances'
+  end
+
+  def fetch_from_api
+    backend = BackendFactory.create(inspec_runner)
+    @table = []
+    pagination_opts = {}
+    loop do
+      api_result = backend.describe_instances(pagination_opts)
+      @table += unpack_describe_instances_response(api_result.reservations)
+      break unless api_result.next_token
+      pagination_opts = { next_token: api_result.next_token }
+    end
+  end
+
+  def unpack_describe_instances_response(reservations)
+    instance_rows = []
+    reservations.each do |res|
+      instance_rows += res.instances.map do |instance_struct|
+        {
+          instance_id: instance_struct.instance_id,
+        }
+      end
+    end
+    instance_rows
+  end
+
+  class Backend
+    class AwsClientApi < AwsBackendBase
+      BackendFactory.set_default_backend(self)
+      self.aws_client_class = Aws::EC2::Client
+
+      def describe_instances(query)
+        aws_service_client.describe_instances(query)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec
 version: !ruby/object:Gem::Version
-  version: 2.1.68
+  version: 2.1.72
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train
@@ -316,6 +316,7 @@ files:
 - docs/resources/aws_config_delivery_channel.md.erb
 - docs/resources/aws_config_recorder.md.erb
 - docs/resources/aws_ec2_instance.md.erb
+- docs/resources/aws_ec2_instances.md.erb
 - docs/resources/aws_iam_access_key.md.erb
 - docs/resources/aws_iam_access_keys.md.erb
 - docs/resources/aws_iam_group.md.erb
@@ -638,6 +639,7 @@ files:
 - lib/resources/aws/aws_config_delivery_channel.rb
 - lib/resources/aws/aws_config_recorder.rb
 - lib/resources/aws/aws_ec2_instance.rb
+- lib/resources/aws/aws_ec2_instances.rb
 - lib/resources/aws/aws_iam_access_key.rb
 - lib/resources/aws/aws_iam_access_keys.rb
 - lib/resources/aws/aws_iam_group.rb