Skip to content
This repository has been archived by the owner on Jun 28, 2019. It is now read-only.

Adds the ability to set a session token #58

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions lib/cap-ec2/ec2-handler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions lib/cap-ec2/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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?']
Expand Down
2 changes: 1 addition & 1 deletion lib/cap-ec2/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module CapEC2
VERSION = '1.0.0'
VERSION = '1.0.1'
end