swirl 1.4 → 1.5.0
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/swirl/ec2.rb +7 -20
- metadata +3 -2
data/lib/swirl/ec2.rb
CHANGED
@@ -19,27 +19,14 @@ module Swirl
|
|
19
19
|
include Helpers::Expander
|
20
20
|
|
21
21
|
|
22
|
-
def
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
def initialize(options={}, file="~/.swirl")
|
30
|
-
|
31
|
-
if !File.exists?(file)
|
32
|
-
account = options[:account] || :default
|
33
|
-
options = self.class.options(account, file).merge(options)
|
34
|
-
elsif ENV["AWS_ACCESS_KEY_ID"] && ENV["AWS_SECRET_ACCESS_KEY"]
|
35
|
-
options[:aws_access_key_id] = ENV["AWS_ACCESS_KEY_ID"]
|
36
|
-
options[:aws_secret_access_key] = ENV["AWS_SECRET_ACCESS_KEY"]
|
37
|
-
else
|
38
|
-
fail "Credentials not set! See Swirl's README"
|
39
|
-
end
|
22
|
+
def initialize(options)
|
23
|
+
@aws_access_key_id =
|
24
|
+
options[:aws_access_key_id] ||
|
25
|
+
raise ArgumentError, "no aws_access_key_id provided"
|
26
|
+
@aws_secret_access_key =
|
27
|
+
options[:aws_secret_access_key] ||
|
28
|
+
raise ArgumentError, "no aws_secret_access_key provided"
|
40
29
|
|
41
|
-
@aws_access_key_id = options[:aws_access_key_id]
|
42
|
-
@aws_secret_access_key = options[:aws_secret_access_key]
|
43
30
|
@hmac = HMAC::SHA256.new(@aws_secret_access_key)
|
44
31
|
@version = options[:version] || "2009-11-30"
|
45
32
|
@url = URI(options[:url] || "https://ec2.amazonaws.com")
|