Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-11-26 06:30:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add support for ENV['AWS_REGION'] (#92)

Browse source 
The `aws-sdk` will raise an error mentioning `ENV['AWS_REGION']` if you
omit `ENV['AWS_DEFAULT_REGION']`. This adds support for either via `||`.

Signed-off-by: Jerry Aldrich <jerryaldrichiii@gmail.com>
This commit is contained in:
Jerry Aldrich III 2017-10-10 19:20:25 -05:00 committed by Christoph Hartmann
parent 57578ab67d
commit 9bbb439467
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -15,7 +15,7 @@ As of now, AWS resources are implemented as an InSpec resource pack. It will shi
To run the profile, use InSpec with an environment variable for AWS credentials: To run the profile, use InSpec with an environment variable for AWS credentials:
- `AWS_DEFAULT_REGION` - `AWS_REGION`
- `AWS_ACCESS_KEY_ID` - `AWS_ACCESS_KEY_ID`
- `AWS_SECRET_ACCESS_KEY` - `AWS_SECRET_ACCESS_KEY`
@ -92,7 +92,7 @@ bundle exec rake test
### Integration tests ### Integration tests
To run the integration tests, please make sure all required environment variables like `AWS_ACCESS_KEY_ID` To run the integration tests, please make sure all required environment variables like `AWS_ACCESS_KEY_ID`
, `AWS_SECRET_ACCESS_KEY` and `AWS_DEFAULT_REGION` are set properly. (`AWS_DEFAULT_REGION` **must** be set to **us-east-1** when running the integration tests.) We use terraform to create the AWS setup and InSpec to verify the all aspects. If you want to use a specific terraform environment, set environment variable `INSPEC_TERRAFORM_ENV`. Integration tests can be executed via: , `AWS_SECRET_ACCESS_KEY` and `AWS_REGION` are set properly. (`AWS_REGION` **must** be set to **us-east-1** when running the integration tests.) We use terraform to create the AWS setup and InSpec to verify the all aspects. If you want to use a specific terraform environment, set environment variable `INSPEC_TERRAFORM_ENV`. Integration tests can be executed via:
``` ```
bundle exec rake test:integration bundle exec rake test:integration

2
libraries/aws_conn.rb
View file

@ -4,7 +4,7 @@ class AWSConnection
def initialize def initialize
require 'aws-sdk' require 'aws-sdk'
opts = { opts = {
region: ENV['AWS_DEFAULT_REGION'], region: ENV['AWS_REGION'] || ENV['AWS_DEFAULT_REGION'],
credentials: Aws::Credentials.new( credentials: Aws::Credentials.new(
ENV['AWS_ACCESS_KEY_ID'], ENV['AWS_ACCESS_KEY_ID'],
ENV['AWS_SECRET_ACCESS_KEY'], ENV['AWS_SECRET_ACCESS_KEY'],