aws_security_viz 0.1.5.pre.alpha.pre.112 → 0.1.5.pre.alpha.pre.130

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53e3a236d712ec7522a04a41b777257eaa29910e08d0277d780d17db9d25fdc1
-  data.tar.gz: 2c5461e7fe4cd76845cd8b5481fea6551c5037e1586f5dad190ed0cfe55355e5
+  metadata.gz: 38a094e251fdddd0b80c4df4f8471cc5c186b45fd3ddd838034701def6d2b7f1
+  data.tar.gz: 3208a726e793e810e7ce581b1a677a03395a1e15579f6a0e210282ecf035cf1f
 SHA512:
-  metadata.gz: c2e98a63663d9feeaa1b9c883fc87f3ed064247d21689228b2b1ce1df2cadc35ab3928afdfccdb858cb3b95f86ed60ae15a60ebfa39575f0882d0e499ca1f91a
-  data.tar.gz: f2e91ff5aafda4b1135ae8b6c5b261621392c397e11e2f7125fb94c4d7d6817418269812110e6d766c925b02c737f080595a831c7c32f30fa76be943228b08cd
+  metadata.gz: 9639a24f8a202d66e6d793a9da86639d7fcc2ba843028c3ec2f4adebbe037a03ea877a9df987cd5b9fadaca1d4368e74b999298c3942d1b4cdcfa17873d3c1fa
+  data.tar.gz: 94591ee3242ef23e573f097d0671d568e5c9773ff21400e3c561fe78776a1298d26027d4bca23383063ff4e14d8fac35e21036b8a0c9578445e1a5a20f046f93

data/.travis.yml

@@ -3,7 +3,7 @@ language: ruby
 rvm:
 - 2.4.4
 - 2.3.4
-- 2.2.7
+- 2.6.0
 - 2.5.1
 
 script: bundle exec rspec spec --tag '~integration'

data/CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+- Replaced fog gem with aws-sdk-ec2
+- Upgrade bundler to 2.x
+- Removed unused dependencies
 
 ## [0.1.5] - 2018-10-10
 ### Added

data/aws_security_viz.gemspec

@@ -21,17 +21,15 @@ Gem::Specification.new do |s|
   s.test_files    = s.files.grep(%r{^(test|spec|features)/})
   s.require_paths = ['lib']
 
-  s.add_development_dependency 'bundler', '~> 1.15'
+  s.add_development_dependency 'bundler', '~> 2.0.1'
   s.add_development_dependency 'rake', '~> 12.0', '>= 12.0.0'
   s.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'
 
   s.add_runtime_dependency 'graphviz', '~> 1.1', '>= 1.1.0'
-  s.add_runtime_dependency 'fog-aws', '~> 2.0', '>= 2.0.1'
-  s.add_runtime_dependency 'unf', '~> 0.1.4'
-  s.add_runtime_dependency 'json', '~> 2.1', '>= 2.1.0'
   s.add_runtime_dependency 'optimist', '~> 3.0.0'
   s.add_runtime_dependency 'organic_hash', '~> 1.0', '>= 1.0.2'
   s.add_runtime_dependency 'rgl', '~> 0.5.3'
+  s.add_runtime_dependency 'aws-sdk-ec2', '~> 1.65.0'
 
   s.required_ruby_version = '>= 2.0.0'
 end

data/lib/provider/ec2.rb

@@ -1,25 +1,21 @@
-require 'fog/aws'
+require 'aws-sdk-ec2'
 
 class Ec2Provider
 
   def initialize(options)
     @options = options
     conn_opts = {
-      region: options[:region]
-    }
-
-    conn_opts[:aws_access_key_id] = options[:access_key]
-    conn_opts[:aws_secret_access_key] = options[:secret_key]
-
-    if options[:session_token]
-      conn_opts[:aws_session_token] = options[:session_token]
-    end
+      region: options[:region],
+      access_key_id: options[:access_key],
+      secret_access_key: options[:secret_key],
+      session_token: options[:session_token]
+    }.delete_if {|k,v| v.nil?}
 
-    @compute = Fog::Compute::AWS.new conn_opts
+    @client = Aws::EC2::Client.new(conn_opts)
   end
 
   def security_groups
-    @compute.security_groups.reject { |sg|
+    @client.describe_security_groups.security_groups.reject { |sg|
       @options[:vpc_id] && sg.vpc_id != @options[:vpc_id]
     }.collect { |sg|
       Ec2::SecurityGroup.new(sg)
@@ -35,6 +31,10 @@ module Ec2
       @sg = sg
     end
 
+    def name
+      @sg.group_name
+    end
+
     def ip_permissions
       @sg.ip_permissions.collect { |ip|
         Ec2::IpPermission.new(ip)
@@ -54,25 +54,25 @@ module Ec2
     end
 
     def protocol
-      @ip['ipProtocol']
+      @ip['ip_protocol']
     end
 
     def from
-      @ip['fromPort']
+      @ip['from_port']
     end
 
     def to
-      @ip['toPort']
+      @ip['to_port']
     end
 
     def ip_ranges
-      @ip['ipRanges'].collect {|gp|
+      @ip['ip_ranges'].collect {|gp|
         Ec2::IpPermissionRange.new(gp)
       }
     end
 
     def groups
-      @ip['groups'].collect {|gp|
+      @ip['user_id_group_pairs'].collect {|gp|
         Ec2::IpPermissionGroup.new(gp)
       }
     end
@@ -84,7 +84,7 @@ module Ec2
     end
 
     def cidr_ip
-      @range['cidrIp']
+      @range['cidr_ip']
     end
 
     def to_str
@@ -98,7 +98,7 @@ module Ec2
     end
 
     def name
-      @gp['groupName'] || @gp['groupId']
+      @gp['group_name'] || @gp['group_id']
     end
   end
 

data/spec/spec_helper.rb

@@ -7,18 +7,23 @@ require File.expand_path(File.dirname(__FILE__) + "/../config/boot")
 Dir[File.dirname(__FILE__) + "/support/**/*.rb"].each {|f| require f}
 
 def group name, *ingress
-  group = double("Group")
-  allow(group).to receive(:ip_permissions).and_return(ingress)
-  allow(group).to receive(:ip_permissions_egress).and_return([])
-  allow(group).to receive(:name).and_return(name)
-  allow(group).to receive(:group_id).and_return('some group')
-  group
+  {group_name: name, group_id: 'some group', ip_permissions: ingress, ip_permissions_egress: []}
 end
 
 def group_ingress port, name
-  {"groups"=>[{"userId"=>"userId", "groupId"=>"sg-groupId", "groupName"=>name}], "ipRanges"=>[], "ipProtocol"=>"tcp", "fromPort"=>port, "toPort"=>port}
+  {user_id_group_pairs:[{user_id: "userId", group_id: "sg-groupId", group_name: name}], ip_ranges:[], ip_protocol: "tcp", from_port: port, to_port: port}
 end
 
 def cidr_ingress port, cidr_ip
-  {"groups"=>[], "ipRanges"=>[{"cidrIp"=> cidr_ip}], "ipProtocol"=>"tcp", "fromPort"=>port, "toPort"=>port}
+  {ip_ranges:[{cidr_ip: cidr_ip}], ip_protocol: "tcp", from_port: port, to_port: port}
 end
+
+def stub_security_groups groups
+  Aws.config[:ec2] = {
+    stub_responses: {
+        describe_security_groups: {
+          security_groups: groups
+      }
+    }
+  }
+end

data/spec/visualize_aws_spec.rb

@@ -17,16 +17,11 @@ class DummyRenderer
 end
 
 describe VisualizeAws do
-  before do
-    @ec2 = double(Fog::Compute)
-    allow(Fog::Compute::AWS).to receive(:new).and_return(@ec2)
-  end
-
   let(:visualize_aws) { VisualizeAws.new(AwsConfig.new) }
   let(:renderer) { DummyRenderer.new }
 
-  it 'should add nodes, edges for each security group' do
-    expect(@ec2).to receive(:security_groups).and_return([group('Remote ssh', group_ingress('22', 'My machine')), group('My machine')])
+  it 'should add nodes, edges for each security group' do   
+    stub_security_groups([group('Remote ssh', group_ingress(22, 'My machine')), group('My machine')])
     graph = visualize_aws.build
 
     expect(graph.output(renderer)).to contain_exactly(
@@ -38,7 +33,7 @@ describe VisualizeAws do
 
   context 'groups' do
     it 'should add nodes for external security groups defined through ingress' do
-      expect(@ec2).to receive(:security_groups).and_return([group('Web', group_ingress('80', 'ELB'))])
+      stub_security_groups([group('Web', group_ingress(80, 'ELB'))])
       graph = visualize_aws.build
 
       expect(graph.output(renderer)).to contain_exactly(
@@ -49,11 +44,11 @@ describe VisualizeAws do
     end
 
     it 'should add an edge for each security ingress' do
-      expect(@ec2).to receive(:security_groups).and_return(
+      stub_security_groups(
           [
-              group('App', group_ingress('80', 'Web'), group_ingress('8983', 'Internal')),
-              group('Web', group_ingress('80', 'External')),
-              group('Db', group_ingress('7474', 'App'))
+              group('App', group_ingress(80, 'Web'), group_ingress(8983, 'Internal')),
+              group('Web', group_ingress(80, 'External')),
+              group('Db', group_ingress(7474, 'App'))
           ])
       graph = visualize_aws.build
 
@@ -75,10 +70,10 @@ describe VisualizeAws do
   context 'cidr' do
 
     it 'should add an edge for each cidr ingress' do
-      expect(@ec2).to receive(:security_groups).and_return(
+        stub_security_groups(
           [
-              group('Web', group_ingress('80', 'External')),
-              group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
+              group('Web', group_ingress(80, 'External')),
+              group('Db', group_ingress(7474, 'App'), cidr_ingress(22, '127.0.0.1/32'))
           ])
       graph = visualize_aws.build
 
@@ -96,10 +91,10 @@ describe VisualizeAws do
     end
 
     it 'should add map edges for cidr ingress' do
-      expect(@ec2).to receive(:security_groups).and_return(
+        stub_security_groups(
           [
-              group('Web', group_ingress('80', 'External')),
-              group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
+              group('Web', group_ingress(80, 'External')),
+              group('Db', group_ingress(7474, 'App'), cidr_ingress(22, '127.0.0.1/32'))
           ])
       mapping = {'127.0.0.1/32' => 'Work'}
       mapping = CidrGroupMapping.new([], mapping)
@@ -121,9 +116,9 @@ describe VisualizeAws do
     end
 
     it 'should group mapped duplicate edges for cidr ingress' do
-      expect(@ec2).to receive(:security_groups).and_return(
+    stub_security_groups(
           [
-              group('ssh', cidr_ingress('22', '192.168.0.1/32'), cidr_ingress('22', '127.0.0.1/32'))
+              group('ssh', cidr_ingress(22, '192.168.0.1/32'), cidr_ingress(22, '127.0.0.1/32'))
           ])
       mapping = {'127.0.0.1/32' => 'Work', '192.168.0.1/32' => 'Work'}
       mapping = CidrGroupMapping.new([], mapping)
@@ -141,10 +136,10 @@ describe VisualizeAws do
 
   context "filter" do
     it 'include cidr which do not match the pattern' do
-      expect(@ec2).to receive(:security_groups).and_return(
+        stub_security_groups(
           [
-              group('Web', cidr_ingress('22', '127.0.0.1/32')),
-              group('Db', cidr_ingress('22', '192.0.1.1/32'))
+              group('Web', cidr_ingress(22, '127.0.0.1/32')),
+              group('Db', cidr_ingress(22, '192.0.1.1/32'))
           ])
 
       opts = {:exclude => ['127.*']}
@@ -159,10 +154,10 @@ describe VisualizeAws do
     end
 
     it 'include groups which do not match the pattern' do
-      expect(@ec2).to receive(:security_groups).and_return(
+        stub_security_groups(
           [
-              group('Web', group_ingress('80', 'External')),
-              group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
+              group('Web', group_ingress(80, 'External')),
+              group('Db', group_ingress(7474, 'App'), cidr_ingress(22, '127.0.0.1/32'))
           ])
 
       opts = {:exclude => ['D.*b', 'App']}
@@ -176,10 +171,10 @@ describe VisualizeAws do
     end
 
     it 'include derived groups which do not match the pattern' do
-      expect(@ec2).to receive(:security_groups).and_return(
+        stub_security_groups(
           [
-              group('Web', group_ingress('80', 'External')),
-              group('Db', group_ingress('7474', 'App'), cidr_ingress('22', '127.0.0.1/32'))
+              group('Web', group_ingress(80, 'External')),
+              group('Db', group_ingress(7474, 'App'), cidr_ingress(22, '127.0.0.1/32'))
           ])
 
       opts = {:exclude => ['App']}

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.112
+  version: 0.1.5.pre.alpha.pre.130
 platform: ruby
 authors:
 - Anay Nayak
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-30 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,60 +84,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: fog-aws
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: unf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.4
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
@@ -186,6 +132,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.3
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.65.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.65.0
 description: Provides a quick mechanism to visualize your EC2 security groups in multiple
   formats
 email: anayak007+rubygems@gmail.com
@@ -252,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Visualize your aws security groups