Merge remote-tracking branch 'origin/master'

Author: LevonBecker

CHANGELOG.md

@@ -1,5 +1,8 @@
 # CHANGE LOG
 
+## 1.0.5 - 04/17/2017 - Levon Becker
+* Switch attribute/arg for inside_aws to discovery method.
+
 ## 1.0.4 - 04/06/2017 - Levon Becker
 * Added aws profile test
 * Changed proxy to look for profile.d/proxy.sh instead of /etc/environment setup

README.md

@@ -1,6 +1,6 @@
 # InSpec Bonus Bits Base Cookbook Profile
 [![CircleCI](https://circleci.com/gh/bonusbits/inspec_bonusbits_base.svg?style=shield)](https://circleci.com/gh/bonusbits/inspec_bonusbits_base)
-[![Join the chat at https://gitter.im/bonusbits/inspec_bonusbits_base](https://badges.gitter.im/bonusbits/inspec_bonusbits_base.svg)](https://gitter.im/bonusbits/inspec_bonusbits_base?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Join the chat at https://gitter.im/bonusbits](https://badges.gitter.im/bonusbits/bonusbits.svg)](https://gitter.im/bonusbits?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 Used to run integration tests for when using the [bonusbits_base](https://github.com/bonusbits/bonusbits_base) Chef Cookbook. 
 

circle.yml

@@ -1,22 +1,14 @@
-machine:
-  ruby:
-    version: '2.3.1'
-  timezone:
-    America/Los_Angeles
-
-dependencies:
-  override:
-  - bundle check --path=vendor/bundle || bundle install --path=vendor/bundle --jobs=4 --retry=3:
-      timeout: 900
-
-test:
-  override:
-  - bundle exec rake circleci:
-      parallel: false
-      timeout: 900
-
+version: 2
+jobs:
+  build:
+    working_directory: ~/circulate
+    docker:
+      - image: chef/chefdk:1.2.22
+    steps:
+      - checkout
+      - run:
+          name: Run CircleCI Rake Task
+          command: /opt/chefdk/embedded/bin/rake circleci --trace
 notify:
   webhooks:
-    # A list of hook hashes, containing the url field
-    # gitter hook
-    - url: https://webhooks.gitter.im/e/1de88ab20a320bd6d440
+    - url: https://webhooks.gitter.im/e/cf84bd37a43b066fb883

controls/aws.rb

@@ -1,4 +1,6 @@
-inside_aws = attribute('inside_aws', default: false, description: 'Inside AWS').to_s.eql?('true') ? true : false
+require_relative '../helpers/os_queries'
+
+inside_aws = ec2?
 configure_aws_profile = attribute('configure_aws_profile', default: true, description: 'Configure Proxy').to_s.eql?('true') ? true : false
 
 debug = attribute('debug', default: false, description: 'Enable Debugging').to_s.eql?('true') ? true : false

controls/cloudwatch_logs.rb

@@ -1,4 +1,6 @@
-inside_aws = attribute('inside_aws', default: false, description: 'Inside AWS').to_s.eql?('true') ? true : false
+require_relative '../helpers/os_queries'
+
+inside_aws = ec2?
 configure_cloudwatch_logs = attribute('configure_cloudwatch_logs', default: true, description: 'Configure CloudWatch Logs').to_s.eql?('true') ? true : false
 
 debug = attribute('debug', default: false, description: 'Enable Debugging').to_s.eql?('true') ? true : false

controls/node_info.rb

@@ -1,3 +1,5 @@
+require_relative '../helpers/os_queries'
+
 configure_node_info = attribute('configure_node_info', default: true, description: 'Configure Node Info').to_s.eql?('true') ? true : false
 
 debug = attribute('debug', default: false, description: 'Enable Debugging').to_s.eql?('true') ? true : false

controls/proxy.rb

@@ -1,3 +1,5 @@
+require_relative '../helpers/os_queries'
+
 configure_proxy = attribute('configure_proxy', default: false, description: 'Configure Proxy').to_s.eql?('true') ? true : false
 
 debug = attribute('debug', default: false, description: 'Enable Debugging').to_s.eql?('true') ? true : false

controls/sudoers.rb

@@ -1,3 +1,5 @@
+require_relative '../helpers/os_queries'
+
 configure_sudoers = attribute('configure_sudoers', default: false, description: 'Configure Sudoers').to_s.eql?('true') ? true : false
 
 debug = attribute('debug', default: false, description: 'Enable Debugging').to_s.eql?('true') ? true : false

controls/yum_cron.rb

@@ -1,4 +1,5 @@
 require_relative '../helpers/os_queries'
+
 configure_yum_cron = attribute('configure_yum_cron', default: true, description: 'Configure Yum Cron').to_s.eql?('true') ? true : false
 
 debug = attribute('debug', default: false, description: 'Enable Debugging').to_s.eql?('true') ? true : false

helpers/os_queries.rb

@@ -39,3 +39,8 @@ def release?(test_version)
 def docker?
   File.exist?('/.dockerenv')
 end
+
+def ec2?
+  # TODO: Add some improved logic for other OSs and ECS Containers?
+  File.directory?('/home/ec2-user')
+end