lib/provider/ec2.rb in aws_security_viz-0.1.5.pre.alpha.pre.83 vs lib/provider/ec2.rb in aws_security_viz-0.1.5.pre.alpha.pre.84
- old
+ new
@@ -5,24 +5,11 @@
def initialize(options)
conn_opts = {
region: options[:region]
}
- if options[:access_key]
- conn_opts[:aws_access_key_id] = options[:access_key]
- elsif ENV['AWS_ACCESS_KEY']
- conn_opts[:aws_access_key_id] = ENV['AWS_ACCESS_KEY']
- elsif ENV['AWS_ACCESS_KEY_ID']
- conn_opts[:aws_access_key_id] = ENV['AWS_ACCESS_KEY_ID']
- end
-
- if options[:secret_key]
- conn_opts[:aws_secret_access_key] = options[:secret_key]
- elsif ENV['AWS_SECRET_KEY']
- conn_opts[:aws_secret_access_key] = ENV['AWS_SECRET_KEY']
- elsif ENV['AWS_SECRET_ACCESS_KEY']
- conn_opts[:aws_secret_access_key] = ENV['AWS_SECRET_ACCESS_KEY']
- end
+ conn_opts[:aws_access_key_id] = options[:access_key]
+ conn_opts[:aws_secret_access_key] = options[:secret_key]
@compute = Fog::Compute::AWS.new conn_opts
end
def security_groups