aws_security_viz 0.1.3.pre.alpha.pre.64 → 0.1.3.pre.alpha.pre.68

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTNhOWY2Mjg1OTE0MWU0NDA3YWFjYzE0NTAxZjExZGE3NmFiZmNlMg==
+    YzNiZTVjZDU2MDBkMTIyNGZjZGE3YmQwZTNmZGRiN2YyNmM4ZmMxNQ==
   data.tar.gz: !binary |-
-    MjllYzYwOGY4MmZjNjc1OTU1OTQ2ZGY4NzI3YTgwZDRhNGQ1ZGRlZg==
+    MWZkODRhYWQzOTczOWU4NGQ4ZDNjZjVjOWJmNmIzZDIxZTIzNGE3MQ==
 SHA512:
   metadata.gz: !binary |-
-    MGM2NGY1ZWVkMzY0OTIxYzNiOWNmYjM0NWUwMmM1NDEwNmJmZTA0NGFkNjEw
-    NDJmNGEzZWY3ZDlkYzllMTcwNGU0NmI2ZGU0OGVjZDZjYmY4MTJmNWQwYzgx
-    NzIzNWJlYjczNGFiMTkyMjQ2MzlhYmJlYjA0MTE4ZTRjYmZlMjA=
+    YTJmNTJkOGJkOTA0ZWM2MTAzMzcxNTQxZWJhMzAyNDc4NTAwYWM1Nzk4Njhj
+    NTYwMjEzZGJjMjlmMDI2OTBjNWVhMjUwYzNkYjg5MWQ3NDFmMzAzYjg2M2Rh
+    MzU2N2IzNDk4NGJlY2IwNDg0NGJmM2Y1OTZiMmI3MTE5NGYwYTU=
   data.tar.gz: !binary |-
-    NDk3ZWI1YThmZDg4YjA1OTk1ZjA0NTVmOTNlYTc1ZDUwOTQ2N2VjOTU5YmJj
-    OTZjMzY3ZTMxZWY4ZmY4MTZmMjNhYzZmZWQ2YTdjYWRlMzRiOTVmNzc2ZWI0
-    M2FjOGYxZmIxZjQ5YWE2YjA2NWY4NDVlYzg4NzNjMTk1NDhiZmM=
+    Y2M2NmJlMDg4ZWRkYWE0ODRjZTBiNjZmYzI4ZjhkYTc2ZWY4Yjk1MjhhNjk4
+    NGM1ODIxYTc2MjQ4NWU2ZWRjOGVhMWUzOTI5MWE1MTRjM2ZlYjlhYmNhZTA1
+    ZGMyMjUxMjViNTUwMDUwZWVkNmI1YWM2MjliYzVlMzY2MTk0NWQ=

data/exe/aws_security_viz

@@ -20,11 +20,6 @@ if cmd=="setup"
   exit
 end
 
-if opts[:source_file].nil?
-  Trollop::die :access_key, 'is required' if opts[:access_key].nil?
-  Trollop::die :secret_key, 'is required' if opts[:secret_key].nil?
-end
-
 config = AwsConfig.load(opts[:config]).merge(obfuscate: ENV['OBFUSCATE'], debug: ENV['DEBUG'])
 VisualizeAws.new(config, opts).unleash(opts[:filename])
 

data/lib/provider/ec2.rb

@@ -3,7 +3,23 @@ require 'fog/aws'
 class Ec2Provider
 
   def initialize(options)
-    @compute = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => options[:access_key], :aws_secret_access_key => options[:secret_key], :region => options[:region])
+    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']
+    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']
+    end
+
+    @compute = Fog::Compute::AWS.new conn_opts
   end
 
   def security_groups

data/spec/visualize_aws_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe VisualizeAws do
   before do
     @ec2 = double(Fog::Compute)
-    allow(Fog::Compute).to receive(:new).and_return(@ec2)
+    allow(Fog::Compute::AWS).to receive(:new).and_return(@ec2)
   end
 
   let(:visualize_aws) { VisualizeAws.new(AwsConfig.new) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws_security_viz
 version: !ruby/object:Gem::Version
-  version: 0.1.3.pre.alpha.pre.64
+  version: 0.1.3.pre.alpha.pre.68
 platform: ruby
 authors:
 - Anay Nayak