Merge pull request #18 from BackSlasher/exclude-tags

Exclude tags

README.md

@@ -48,6 +48,7 @@ Usage: piculet [options]
     -f, --file FILE
     -n, --names SG_LIST
     -x, --exclude SG_LIST
+    -t, --exclude_tag TAGS
         --ec2s VPC_IDS
         --dry-run
     -e, --export

bin/piculet

@@ -40,6 +40,7 @@ ARGV.options do |opt|
     opt.on('-f', '--file FILE')                     {|v| file                         = v           }
     opt.on('-n', '--names SG_LIST', Array)          {|v| options[:sg_names]           = v           }
     opt.on('-x', '--exclude SG_LIST', Array)        {|v| options[:exclude_sgs]        = v           }
+    opt.on('-t', '--exclude_tag TAGS', Array)       {|v| options[:exclude_tags]       = v           }
     opt.on('',   '--ec2s VPC_IDS', Array)           {|v| options[:ec2s]               = v           }
     opt.on('',   '--dry-run')                       {|v| options[:dry_run]            = true        }
     opt.on('-e', '--export')                        {|v| mode                         = :export     }

lib/piculet/client.rb

@@ -13,6 +13,16 @@ def apply(file)
       AWS.memoize { walk(file) }
     end
 
+    def should_skip(sg_name, sg)
+      # Name
+      if @options.sg_names
+        return true unless @options.sg_names.include?(sg_name)
+      end
+      return true if @options.exclude_sgs and @options.exclude_sgs.any? {|regex| sg_name =~ regex}
+      # Tag
+      return true if sg and @options.exclude_tags and @options.exclude_tags.any? {|tagname| !sg.tags[tagname].to_s.empty?}
+    end
+
     def export(options = {})
       exported = AWS.memoize do
         Exporter.export(@options.ec2, @options_hash.merge(options))
@@ -98,13 +108,7 @@ def walk_ec2(vpc, ec2_dsl, ec2_aws, collection_api)
       sg_list_dsl.each do |key, sg_dsl|
         name = key[0]
 
-        if @options.sg_names
-          next unless @options.sg_names.include?(name)
-        end
-
-        if @options.exclude_sgs
-          next if @options.exclude_sgs.any? {|regex| name =~ regex}
-        end
+        next if should_skip(name,sg_list_aws[key])
 
         sg_aws = sg_list_aws[key]
 
@@ -122,13 +126,7 @@ def walk_ec2(vpc, ec2_dsl, ec2_aws, collection_api)
       sg_list_dsl.each do |key, sg_dsl|
         name = key[0]
 
-        if @options.sg_names
-          next unless @options.sg_names.include?(name)
-        end
-
-        if @options.exclude_sgs
-          next if @options.exclude_sgs.any? {|regex| name =~ regex}
-        end
+        next if should_skip(name,sg_list_aws[key])
 
         sg_aws = sg_list_aws.delete(key)
         walk_security_group(sg_dsl, sg_aws)
@@ -137,13 +135,7 @@ def walk_ec2(vpc, ec2_dsl, ec2_aws, collection_api)
       sg_list_aws.each do |key, sg_aws|
         name = key[0]
 
-        if @options.sg_names
-          next unless @options.sg_names.include?(name)
-        end
-
-        if @options.exclude_sgs
-          next if @options.exclude_sgs.any? {|regex| name =~ regex}
-        end
+        next if should_skip(name,sg_list_aws[key])
 
         sg_aws.ingress_ip_permissions.each {|i| i.delete }
         sg_aws.egress_ip_permissions.each {|i| i.delete } if vpc
@@ -152,13 +144,7 @@ def walk_ec2(vpc, ec2_dsl, ec2_aws, collection_api)
       sg_list_aws.each do |key, sg_aws|
         name = key[0]
 
-        if @options.sg_names
-          next unless @options.sg_names.include?(name)
-        end
-
-        if @options.exclude_sgs
-          next if @options.exclude_sgs.any? {|regex| name =~ regex}
-        end
+        next if should_skip(name,sg_list_aws[key])
 
         sg_aws.delete
       end