cfhighlander 0.2.1.alpha.23 → 0.2.1.alpha.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a7d7d97f9d94570594d6c075bd489aa6ae3058d6ce7c096a532ea65288c9de0
-  data.tar.gz: 19df3d0459ef71885b3f9e85f7067e2bcf73d7fc9e612af579d72a0fe59f1ad3
+  metadata.gz: cc0e66ec10442d67a675f046539b949e2b2a1a2d77b777a469015c889173020d
+  data.tar.gz: de465ad3600e11b5147f8c888d6e59d908acc10a2996cfcbb300e73f6821da96
 SHA512:
-  metadata.gz: 32eefcd197e05029a8d176dffef997238aa794fdd51684d31e9099d919e0bba9fe42ec7182f87c74437d074b91c0e3d4ab261b8624c8057e33c0595f960e473b
-  data.tar.gz: c3521f255a7f6509524b2df2e8a72289d6912375fd13a98e7270c38858db4dbcb9b0d08a723cff1603102fdf621ffa11c741c2f3a65d0af22f765390f272a309
+  metadata.gz: 3a935570dbe5ccc7e506a5a1467aef5b2c1233a3a8b7e362f1b7a29283d54574f8cba53d1a91ac54a72c46c9416d0945594b59ebdfc86933814f84d9d78997e0
+  data.tar.gz: 882d53c4237694d3d3cf89f971fcbb1aa57dd0202d80dbe3ab659b8ecf054d6fda8d246460efa8968a0cbc4bf08ef0a6e3d0d48bb259166937d2305d857ad3f7

data/cfndsl_ext/sg.rb

@@ -1,3 +1,4 @@
+require 'netaddr'
 
 def sg_create_rules (x, ip_blocks={})
   rules = []
@@ -15,12 +16,38 @@ end
 
 
 def lookup_ips_for_sg (ips, ip_block_name={})
+  cidr = []
   if ip_block_name == 'stack'
     cidr = [FnJoin( "", [ "10.", Ref('StackOctet'), ".", "0.0/16" ] )]
   elsif ips.has_key? ip_block_name
-    cidr = ips[ip_block_name]
+    ips[ip_block_name].each do |ip|
+      if (ips.include?(ip) || ip_block_name == 'stack')
+        cidr += lookup_ips_for_sg(ips, ip) unless ip == ip_block_name
+      else
+        if ip == 'stack'
+          cidr << [FnJoin( "", [ "10.", Ref('StackOctet'), ".", "0.0/16" ] )]
+        elsif(isCidr(ip))
+          cidr << ip
+        else
+          STDERR.puts("WARN: ip #{ip} is not a valid CIDR. Ignoring IP")
+        end
+      end
+    end
   else
-    cidr = [ip_block_name]
+    if isCidr(ip_block_name)
+      cidr = [ip_block_name]
+    else
+      STDERR.puts("WARN: ip #{ip_block_name} is not a valid CIDR. Ignoring IP")
+    end
   end
   cidr
 end
+
+def isCidr(block)
+  begin
+    NetAddr::CIDR.create(block)
+    return block.include?('/')
+  rescue NetAddr::ValidationError
+    return false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfhighlander
 version: !ruby/object:Gem::Version
-  version: 0.2.1.alpha.23
+  version: 0.2.1.alpha.27
 platform: ruby
 authors:
 - Nikola Tosic
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-30 00:00:00.000000000 Z
+date: 2018-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -191,6 +191,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
+- !ruby/object:Gem::Dependency
+  name: netaddr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement