mappru 0.1.8 → 0.1.9.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 7779e15de4d4095b4a32d16b4f36170f5409321b105d9e9620173cc60b2f1950
-  data.tar.gz: 56f68baede3e08984cb6cf2957e5390b46262333eec977f2ce9104bfeb03ec0a
+SHA1:
+  metadata.gz: 44003fe735f676f54f72364497431dc196c0fe11
+  data.tar.gz: c7267f893fb5afdcae72469130be865659cdb413
 SHA512:
-  metadata.gz: 13bdbcfb2130da63d416000e35f97cfa09a69e7e761803e8416323e18c1171550fa61f50dc9ff993465457543419e51fc866839c1d4790b7e73bd94ba59a7b97
-  data.tar.gz: e0f12906096c6e2f85f1743bf79d8742b4181c4b8ad3fa709393afcf1cecdfc3162061a18d5599d921d123cde4de45939f1718849bc47c45fb64ef4c35a5fa0e
+  metadata.gz: 6b228674aa0c06b181efbb45521234d519deac3c9fcad9ac2dcb68eb35b23a46703264b0f8d8f73b07d40448a5ec75aec642901fae12cd750e634a65bd5dcce1
+  data.tar.gz: c40db89940470e5db2dabec180fda41e32b97653b4362ba5edc5e1b02e90820f999819eb84cdc95941a699745d6d1a1f9d21961e60ad6b862eb86b7b294c02ed

data/lib/mappru.rb

@@ -1,4 +1,4 @@
-require 'aws-sdk'
+require 'aws-sdk-ec2'
 require 'diffy'
 require 'hash_modern_inspect'
 require 'hashie'

data/lib/mappru/driver.rb

@@ -4,7 +4,6 @@ class Mappru::Driver
 
   def initialize(client, options = {})
     @client = client
-    @resource = Aws::EC2::Resource.new(client: @client)
     @options = options
   end
 
@@ -12,11 +11,10 @@ class Mappru::Driver
     log(:info, "Create Route Table `#{vpc_id}` > `#{name}`", color: :cyan)
 
     unless @options[:dry_run]
-      vpc = @resource.vpc(vpc_id)
-      rt = vpc.create_route_table
+      route_table_id = @client.create_route_table(vpc_id: vpc_id).route_table.route_table_id
       name_tag = {key: 'Name', value: name}
-      rt.create_tags(tags: [name_tag])
-      rt_id_by_vpc_rt_name[vpc_id][name] = rt.id
+      @client.create_tags(resources: [route_table_id], tags: [name_tag])
+      rt_id_by_vpc_rt_name[vpc_id][name] = route_table_id
     end
 
     {routes: [], subnets: []}
@@ -83,7 +81,7 @@ class Mappru::Driver
     return @rt_ids if @rt_ids
 
     @rt_ids = {}
-    route_tables = @resource.route_tables
+    route_tables = @client.describe_route_tables().flat_map(&:route_tables)
 
     route_tables.each do |rt|
       vpc_id = rt.vpc_id
@@ -93,7 +91,7 @@ class Mappru::Driver
       next unless name
 
       @rt_ids[vpc_id] ||= {}
-      @rt_ids[vpc_id][name] = rt.id
+      @rt_ids[vpc_id][name] = rt.route_table_id
     end
 
     @rt_ids
@@ -103,7 +101,7 @@ class Mappru::Driver
     return @assoc_ids if @assoc_ids
 
     @assoc_ids = {}
-    associations = @resource.route_tables.map(&:associations).flat_map(&:to_a)
+    associations = @client.describe_route_tables().flat_map(&:route_tables).map(&:associations).flat_map(&:to_a)
 
     associations.each do |assoc|
       if assoc.subnet_id

data/lib/mappru/exporter.rb

@@ -8,15 +8,13 @@ class Mappru::Exporter
 
   def initialize(client, options = {})
     @client = client
-    @resource = Aws::EC2::Resource.new(client: @client)
     @options = options
   end
 
   def export
     result = {}
-    @resource
 
-    route_tables = @resource.route_tables
+    route_tables = @client.describe_route_tables().flat_map(&:route_tables)
 
     route_tables.each do |rt|
       vpc_id = rt.vpc_id
@@ -48,14 +46,13 @@ class Mappru::Exporter
 
   def export_route_table(rt)
     result = {
-      route_table_id: rt.id,
+      route_table_id: rt.route_table_id,
       routes: [],
       subnets: export_subnets(rt.associations),
     }
 
-    # route -> (Array<Route>, nil)
-    # http://docs.aws.amazon.com/sdkforruby/api/Aws/EC2/RouteTable.html#routes-instance_method
-    sorted_routes = rt.routes.reject(&:nil?).sort_by do |route|
+    # TODO: support VPC endpoint
+    sorted_routes = rt.routes.select(&:destination_cidr_block).sort_by do |route|
       IPAddr.new(route.destination_cidr_block).to_i
     end
 

data/lib/mappru/version.rb

@@ -1,3 +1,3 @@
 module Mappru
-  VERSION = '0.1.8'
+  VERSION = '0.1.9.beta'
 end

data/mappru.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'aws-sdk', '~> 2'
+  spec.add_dependency 'aws-sdk-ec2'
   spec.add_dependency 'diffy'
   spec.add_dependency 'hash_modern_inspect'
   spec.add_dependency 'hashie'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: mappru
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9.beta
 platform: ruby
 authors:
 - winebarrel
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-19 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
@@ -185,12 +185,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Mappru is a tool to manage VPC Route Table.