diff --git a/CHANGELOG.md b/CHANGELOG.md index fee0f33..3063545 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Cap-EC2 changelog +## 1.0.1 + +* Adds the ability set a session token (needed for federated AWS access) + ## 1.0.0 Cap-EC2 is pretty stable, and the rate of PRs has decreased, so I've @@ -28,7 +32,7 @@ decided to bump the version to 1.0.0. ## 0.0.15 -* Add `ec2_filter_by_status_ok?` to filter out instances that aren't returning `OK` +* Add `ec2_filter_by_status_ok?` to filter out instances that aren't returning `OK` for their EC2 status checks. [@tomconroy](https://github.com/tomconroy) ## 0.0.14 diff --git a/README.md b/README.md index 4d6ef04..cfa84a1 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,7 @@ set :ec2_stages_tag, 'Stages' set :ec2_access_key_id, nil set :ec2_secret_access_key, nil +set :ec2_session_token, nil set :ec2_region, %w{} set :ec2_contact_point, nil diff --git a/lib/cap-ec2/ec2-handler.rb b/lib/cap-ec2/ec2-handler.rb index 2d54887..61a8dae 100644 --- a/lib/cap-ec2/ec2-handler.rb +++ b/lib/cap-ec2/ec2-handler.rb @@ -16,6 +16,7 @@ def ec2_connect(region=nil) AWS::EC2.new( access_key_id: fetch(:ec2_access_key_id), secret_access_key: fetch(:ec2_secret_access_key), + session_token: fetch(:ec2_session_token), region: region ) end diff --git a/lib/cap-ec2/utils.rb b/lib/cap-ec2/utils.rb index 9a18d9a..14cfe99 100644 --- a/lib/cap-ec2/utils.rb +++ b/lib/cap-ec2/utils.rb @@ -46,6 +46,7 @@ def load_config set :ec2_access_key_id, config['access_key_id'] if config['access_key_id'] set :ec2_secret_access_key, config['secret_access_key'] if config['secret_access_key'] + set :ec2_session_token, config['session_token'] if config['session_token'] set :ec2_region, config['regions'] if config['regions'] set :ec2_filter_by_status_ok?, config['filter_by_status_ok?'] if config['filter_by_status_ok?'] diff --git a/lib/cap-ec2/version.rb b/lib/cap-ec2/version.rb index f09ea84..4271969 100644 --- a/lib/cap-ec2/version.rb +++ b/lib/cap-ec2/version.rb @@ -1,3 +1,3 @@ module CapEC2 - VERSION = '1.0.0' + VERSION = '1.0.1' end