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

Support just profile #85

Open
wants to merge 1 commit 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
11 changes: 9 additions & 2 deletions lib/cap-ec2/ec2-handler.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,16 @@ def initialize
end

def ec2_connect(region=nil)
credentials = if fetch(:ec2_profile)
Aws::SharedCredentials.new(profile_name: fetch(:ec2_profile))
else
Aws::Credentials.new(
fetch(:ec2_access_key_id),
fetch(:ec2_secret_access_key),
)
end
Aws::EC2::Client.new(
access_key_id: fetch(:ec2_access_key_id),
secret_access_key: fetch(:ec2_secret_access_key),
credentials: credentials,
region: region
)
end
Expand Down
8 changes: 0 additions & 8 deletions lib/cap-ec2/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,6 @@ def self.contact_point(instance)
end

def load_config
if fetch(:ec2_profile)
credentials = Aws::SharedCredentials.new(profile_name: fetch(:ec2_profile)).credentials
if credentials
set :ec2_access_key_id, credentials.access_key_id
set :ec2_secret_access_key, credentials.secret_access_key
end
end

config_location = File.expand_path(fetch(:ec2_config), Dir.pwd) if fetch(:ec2_config)
if config_location && File.exists?(config_location)
config = YAML.load(ERB.new(File.read(fetch(:ec2_config))))
Expand Down