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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MTNhOWY2Mjg1OTE0MWU0NDA3YWFjYzE0NTAxZjExZGE3NmFiZmNlMg==
4
+ YzNiZTVjZDU2MDBkMTIyNGZjZGE3YmQwZTNmZGRiN2YyNmM4ZmMxNQ==
5
5
  data.tar.gz: !binary |-
6
- MjllYzYwOGY4MmZjNjc1OTU1OTQ2ZGY4NzI3YTgwZDRhNGQ1ZGRlZg==
6
+ MWZkODRhYWQzOTczOWU4NGQ4ZDNjZjVjOWJmNmIzZDIxZTIzNGE3MQ==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MGM2NGY1ZWVkMzY0OTIxYzNiOWNmYjM0NWUwMmM1NDEwNmJmZTA0NGFkNjEw
10
- NDJmNGEzZWY3ZDlkYzllMTcwNGU0NmI2ZGU0OGVjZDZjYmY4MTJmNWQwYzgx
11
- NzIzNWJlYjczNGFiMTkyMjQ2MzlhYmJlYjA0MTE4ZTRjYmZlMjA=
9
+ YTJmNTJkOGJkOTA0ZWM2MTAzMzcxNTQxZWJhMzAyNDc4NTAwYWM1Nzk4Njhj
10
+ NTYwMjEzZGJjMjlmMDI2OTBjNWVhMjUwYzNkYjg5MWQ3NDFmMzAzYjg2M2Rh
11
+ MzU2N2IzNDk4NGJlY2IwNDg0NGJmM2Y1OTZiMmI3MTE5NGYwYTU=
12
12
  data.tar.gz: !binary |-
13
- NDk3ZWI1YThmZDg4YjA1OTk1ZjA0NTVmOTNlYTc1ZDUwOTQ2N2VjOTU5YmJj
14
- OTZjMzY3ZTMxZWY4ZmY4MTZmMjNhYzZmZWQ2YTdjYWRlMzRiOTVmNzc2ZWI0
15
- M2FjOGYxZmIxZjQ5YWE2YjA2NWY4NDVlYzg4NzNjMTk1NDhiZmM=
13
+ Y2M2NmJlMDg4ZWRkYWE0ODRjZTBiNjZmYzI4ZjhkYTc2ZWY4Yjk1MjhhNjk4
14
+ NGM1ODIxYTc2MjQ4NWU2ZWRjOGVhMWUzOTI5MWE1MTRjM2ZlYjlhYmNhZTA1
15
+ ZGMyMjUxMjViNTUwMDUwZWVkNmI1YWM2MjliYzVlMzY2MTk0NWQ=
@@ -20,11 +20,6 @@ if cmd=="setup"
20
20
  exit
21
21
  end
22
22
 
23
- if opts[:source_file].nil?
24
- Trollop::die :access_key, 'is required' if opts[:access_key].nil?
25
- Trollop::die :secret_key, 'is required' if opts[:secret_key].nil?
26
- end
27
-
28
23
  config = AwsConfig.load(opts[:config]).merge(obfuscate: ENV['OBFUSCATE'], debug: ENV['DEBUG'])
29
24
  VisualizeAws.new(config, opts).unleash(opts[:filename])
30
25
 
@@ -3,7 +3,23 @@ require 'fog/aws'
3
3
  class Ec2Provider
4
4
 
5
5
  def initialize(options)
6
- @compute = Fog::Compute.new(:provider => 'AWS', :aws_access_key_id => options[:access_key], :aws_secret_access_key => options[:secret_key], :region => options[:region])
6
+ conn_opts = {
7
+ region: options[:region]
8
+ }
9
+
10
+ if options[:access_key]
11
+ conn_opts[:aws_access_key_id] = options[:access_key]
12
+ elsif ENV['AWS_ACCESS_KEY']
13
+ conn_opts[:aws_access_key_id] = ENV['AWS_ACCESS_KEY']
14
+ end
15
+
16
+ if options[:secret_key]
17
+ conn_opts[:aws_secret_access_key] = options[:secret_key]
18
+ elsif ENV['AWS_SECRET_KEY']
19
+ conn_opts[:aws_secret_access_key] = ENV['AWS_SECRET_KEY']
20
+ end
21
+
22
+ @compute = Fog::Compute::AWS.new conn_opts
7
23
  end
8
24
 
9
25
  def security_groups
@@ -3,7 +3,7 @@ require 'spec_helper'
3
3
  describe VisualizeAws do
4
4
  before do
5
5
  @ec2 = double(Fog::Compute)
6
- allow(Fog::Compute).to receive(:new).and_return(@ec2)
6
+ allow(Fog::Compute::AWS).to receive(:new).and_return(@ec2)
7
7
  end
8
8
 
9
9
  let(:visualize_aws) { VisualizeAws.new(AwsConfig.new) }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: aws_security_viz
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3.pre.alpha.pre.64
4
+ version: 0.1.3.pre.alpha.pre.68
5
5
  platform: ruby
6
6
  authors:
7
7
  - Anay Nayak