awspec 0.80.0 → 0.80.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57966c7cb37d9173d0212f0d2a48d1b63dad257a
-  data.tar.gz: 5504e5dfcde33cbe0f13a72302e42328a048ea19
+  metadata.gz: 79351e0f4e5a1c92f7a8eff5f257148330acbbd6
+  data.tar.gz: 12789b620b3b6b9c90ffbcefa324fef5e8271883
 SHA512:
-  metadata.gz: 713a88da3b16b47c8c1a2c8ff0f3b56bb6bc28f679ee783094196f71b7f86af95d171eca8749874c2c5c7e5674d235d9c45b1a4e693479b2ba0a7df9fa9003a6
-  data.tar.gz: 4cd882a3b50dab6cc0af276665dbe3e31ee79937be54ba37e53dfa6102e95fcc01ae12bf94886364607916a073ebf4c6f85f87dd21160c47027abd3f050d0765
+  metadata.gz: 95d4a780f9ac2c05a0edb44a13e1e6de4d5cb7e308d56cdfbba50b11d4610709e48330450b30f9b9e60e60b1c6d260249e97b8410b64c48e4184ab540b192b67
+  data.tar.gz: 2191c44374acb5cd7a48d660f5c200402653e77cf38f89fd348fea60376ab8f6ede60e9e6f15846bd5a97d03058ce25e13e4a8d60422afb934c00afd37992785

data/lib/awspec/helper/finder/subnet.rb

@@ -1,23 +1,21 @@
 module Awspec::Helper
   module Finder
     module Subnet
-      def filter_type_matcher(search_key)
-        deafult = 'tag:Name'
-        case search_key
-        when /subnet-[a-zA-Z0-9]{8}/
-          return 'subnet-id'
-        when %r{[1-9][0-9]{1,2}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}//[0-9]{1,3}}
-          return 'cidrBlock'
-        else
-          return deafult
-        end
-      end
-
-      def find_subnet(search_key)
+      def find_subnet(subnet_id)
+        res = ec2_client.describe_subnets({
+                                            filters: [{ name: 'subnet-id', values: [subnet_id] }]
+                                          })
+        resource = res.subnets.single_resource(subnet_id)
+        return resource if resource
+        res = ec2_client.describe_subnets({
+                                            filters: [{ name: 'tag:Name', values: [subnet_id] }]
+                                          })
+        resource = res.subnets.single_resource(subnet_id)
+        return resource if resource
         res = ec2_client.describe_subnets({
-                                            filters: [{ name: filter_type_matcher(search_key), values: [search_key] }]
+                                            filters: [{ name: 'cidrBlock', values: [subnet_id] }]
                                           })
-        res.subnets.single_resource(search_key)
+        res.subnets.single_resource(subnet_id)
       end
 
       def select_subnet_by_vpc_id(vpc_id)

data/lib/awspec/version.rb

@@ -1,3 +1,3 @@
 module Awspec
-  VERSION = '0.80.0'
+  VERSION = '0.80.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awspec
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.80.1
 platform: ruby
 authors:
 - k1LoW
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec