aws_security_viz 0.1.5.pre.alpha.pre.83 → 0.1.5.pre.alpha.pre.84

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4b1d61737c3b91efbc7f61d1e3edb994273f07c5
-  data.tar.gz: 800873de48cf9bf972ed6fb45ac0cd6a1f4608d6
+  metadata.gz: b1261d0dd3e748da1ff61668dfa5baec0cd45d1d
+  data.tar.gz: 0ea97f824d455497f83a6052bf48a6f04d16c353
 SHA512:
-  metadata.gz: b1c6a2014e742fa301734efce735a70fff7b25d3d653877a5adfd82b5513d34294f892580fad579ac9b8d8217ff7f267d7350c78810b7353a68272e948b6d760
-  data.tar.gz: e23b26de9dedea99204499f1077da6d68d5ebfa25885a9200ec7e96ec440bc79976f71e1b9eb971a4b991ed705fc9229580d67822003dd94d3dc6aae83a4efc7
+  metadata.gz: 0f3d8f275c28c0ddb36dcd70556b7056d2e76a0fcb5af4e87fb39dd53a2dc0b60fc9fffdce546028012a4846cde2917d1ae292cae65826d20ededff8ce8ed998
+  data.tar.gz: 035ed2166a169accd5c713a63a3a165baa5208a75aa5236aee2c26342ed6247a4081c5d513a457e9655899c5ff0aac989f6780cf744a7a971ee047e616751811

data/exe/aws_security_viz

@@ -4,8 +4,8 @@ require 'aws_security_viz'
 require 'trollop'
 
 opts = Trollop::options do
-  opt :access_key, 'AWS access key', :type => :string
-  opt :secret_key, 'AWS secret key', :type => :string
+  opt :access_key, 'AWS access key', :default => ENV['AWS_ACCESS_KEY'] || ENV['AWS_ACCESS_KEY_ID'], :type => :string
+  opt :secret_key, 'AWS secret key', :default => ENV['AWS_SECRET_KEY'] || ENV['AWS_SECRET_ACCESS_KEY'], :type => :string
   opt :region, 'AWS region to query', :default => 'us-east-1', :type => :string
   opt :source_file, 'JSON source file containing security groups', :type => :string
   opt :filename, 'Output file name', :type => :string, :default => 'aws-security-viz.png'
@@ -29,4 +29,3 @@ rescue Exception => e
   puts "[ERROR] #{e.message}"
   exit 1
 end
-

data/lib/provider/ec2.rb

@@ -7,21 +7,8 @@ class Ec2Provider
       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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws_security_viz
 version: !ruby/object:Gem::Version
-  version: 0.1.5.pre.alpha.pre.83
+  version: 0.1.5.pre.alpha.pre.84
 platform: ruby
 authors:
 - Anay Nayak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler