knife-tagbulk 0.1.1 → 0.1.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTQ4ZDVkN2IzMzVmM2Y1YTY4NWZmOGNmYTA2NzEyZjUzZjUzMzJkOQ==
+    MjllMjZlZmMzZDE4MzAzOTQwYmI0MTRkNDc2YWZmM2Q5NGI1MmI5ZQ==
   data.tar.gz: !binary |-
-    ZDMzYzUyM2JjZmJhYTRjMGUzNjg5YjFkODBjM2E0MjIzMmEwYjJlNg==
+    NGE3MjFhNDJhNmI2YjY1YTdiODQwMzU3YTYzMzkwNjRiOWJhMzRkZg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    M2IzMWUzZTYyNTYzNzkwM2QxYTQ1YTI5ODhmM2E2ZGQ2MjQ4Nzk0OWFlN2Zi
-    NWI4YTU4NjQ0OTQ4NzE0YWViYjIyMWM4ZjlmYzcyM2ZjMWIxMGFiODAwYWJi
-    NzE3NmE3YTkxMTEyZDBkYzFmMzcyNmE3ZDJkN2FmMzUwZjNkZDY=
+    MWQ5NzkwYjBlMDNjZmFhOGM3MWM3N2JmNWFmN2UxZjM3YWUxYmY3MzAzZjVj
+    YjJhYTM5NmU4ZmRkMmI3N2U0ZjlmMzgyODVlZDljMGNhNzA2MWQzYzgzY2Rl
+    ODI3NDYzYmRmNGZkMDNiYzg3ZDRmMWE5M2NkNGFkNmI5MDg0M2M=
   data.tar.gz: !binary |-
-    NTI4NTU2MDJjYTdjYzQwMWM4MDI4Y2IxMjhmMzMwZDBkNTJhZjk5ZTg5YTg1
-    MmM5MjJjNDRiNjM0M2NmMjBlMjZiN2FmYjU5MDU2YTUxODQ1OTk5NTgwMjk3
-    ZmJiZDI4OWI2NDg5NDIzNDc0ZGJjYjA3ZmJiMTg3NzgyYjliY2Q=
+    ZjU4MTZhZWMzNjFiYzllYjAzOTVjZGJkMGEzMzUyYzM3Mzc1NzY2MDVmMWVh
+    OTU1OGNmNTNiYzg5OTQyMGNhZjk5ZjY0YzBiMGViNTQyZGIyZDI2ZjRlMWE4
+    M2RjYWU5ZDY4MTYxMzY3NDhlNjM2MDRhYWY4Y2Q1NWZjYmY0ODk=

data/README.md

@@ -25,11 +25,19 @@ The plugin offers 2 actions:
 Use `create` and specify a standard Chef query like `roles:webserver AND chef_environment:prod` and a set of space-separated
 tags (like `maintenance offline`) in order to tag all nodes retrieved from the search with the specified tags.
 
-* knife tag bulk delete QUERY TAG1 TAG2 ...
+* knife tag bulk delete QUERY TAG1 TAG2 ... (options)
 
 Use `delete` and specify a standard Chef query like `roles:webserver AND chef_environment:prod` and a set of space-separated
 tags (like `maintenance offline`) in order to remove those tags from all nodes retrieved from the search.
 
+There is also the possiblity to use Regular Expressions to remove tags based on them. Just specify the `-r` switch and then
+describe the tags in Regular Expression format. Since there is great posbbility that your shell may escape them though, it's
+best if you enclose them in quotes. Specifying `-y` in addition to `-r` will skip delete confirmation.
+
+An example RE-based command is formed like this:
+
+    knife tag bulk delete 'roles:web_old_infrastructure' 'version-deployed-.*' -r -V
+
 Things to notice
 ----------------
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/chef/knife/tag_bulk_create.rb

@@ -40,38 +40,26 @@ class Chef
         end
 
         escaped_query = URI.escape(@query,Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-        q = Chef::Search::Query.new
+        query = Chef::Search::Query.new
         node_items = []
         node_count = 0
         begin
-          res = q.search(:node, escaped_query)
-          node_items = res.first.map { |node| node.name }
+          res = query.search(:node, escaped_query)
+          node_items = res.first.map { |node| node.name }.sort
           node_count = res.last
-          ui.info(
-            ui.color("\u2192  ", [:bold, :green]) +
-            ui.color(node_count.to_s, [:bold, :yellow]) +
-            ui.color(' node(s) found.', [:bold, :white])
-          )
+          nodes_found(node_count)
           if node_count > 0
             node_items.each do |node_name|              
               node = Chef::Node.load(node_name)
+              if (node.tags & @tags).size == @tags.size
+                tags_already_present(node_name, @tags)
+                next
+              end
               @tags.each { |tag| (node.tags << tag).uniq! }
               node.save
-              ui.info(
-                ui.color("\u2714  ", [:bold, :green]) +
-                ui.color("Successfully applied tag(s) ", [:bold, :white]) + 
-                ui.color("[#{@tags.join(', ')}]", [:bold, :yellow]) + 
-                ui.color(" to node ", [:bold, :white]) +
-                ui.color("[#{node_name}]", [:bold, :yellow])
-              )
+              tags_successfully_added(node_name, @tags)
               if config[:verbosity] > 0
-                ui.info(
-                  ui.color("\u2192  ", [:bold, :green]) +
-                  ui.color('Node ', [:bold, :white]) +
-                  ui.color("[#{node_name}]", [:bold, :yellow]) +
-                  ui.color(' is now tagged with ', [:bold, :white]) +
-                  ui.color("[#{node.tags.join(', ')}]", [:bold, :yellow])
-                )
+                verbose_node_tag_information(node_name, node.tags)
               end
             end
           end
@@ -82,6 +70,45 @@ class Chef
         end      
       end
 
+      def nodes_found(node_count)
+        ui.info(
+          ui.color("\u2192  ", [:bold, :green]) +
+          ui.color(node_count.to_s, [:bold, :yellow]) +
+          ui.color(' node(s) found.', [:bold, :white])
+        )      
+      end
+
+      def tags_already_present(node_name, tags)
+        ui.info(
+          ui.color("\u2714  ", [:bold, :green]) +
+          ui.color('Node ', [:bold, :white]) +
+          ui.color("[#{node_name}]", [:bold, :yellow]) +
+          ui.color(' is already tagged with ', [:bold, :white]) +
+          ui.color("[#{tags.join(', ')}]", [:bold, :yellow]) +
+          ui.color(". Skipping...", [:bold, :white])
+        )      
+      end
+
+      def tags_successfully_added(node_name, tags)
+        ui.info(
+          ui.color("\u2714  ", [:bold, :green]) +
+          ui.color("Successfully added tag(s) ", [:bold, :white]) + 
+          ui.color("[#{tags.join(', ')}]", [:bold, :yellow]) + 
+          ui.color(" to node ", [:bold, :white]) +
+          ui.color("[#{node_name}]", [:bold, :yellow])
+        )
+      end
+
+      def verbose_node_tag_information(node_name, tags)
+        ui.info(
+          ui.color("\u2192  ", [:bold, :green]) +
+          ui.color('Node ', [:bold, :white]) +
+          ui.color("[#{node_name}]", [:bold, :yellow]) +
+          ui.color(' is now tagged with ', [:bold, :white]) +
+          ui.color("[#{tags.join(', ')}]", [:bold, :yellow])
+        )
+      end
+
     end
   end
 end

data/lib/chef/knife/tag_bulk_delete.rb

@@ -26,9 +26,23 @@ class Chef
         require 'chef/search/query'
       end
 
-      banner 'knife tag bulk delete QUERY TAG ...'
+      banner 'knife tag bulk delete QUERY TAG ... (options)'
       category 'tag'
 
+      option :regex,
+        :short => '-r',
+        :long => '--regex-match',
+        :description => 'Specify a tag regular expression to match to instead of exact tags to delete',
+        :boolean => true,
+        :default => false
+
+      option :yes,
+        :short => '-y',
+        :long => '--yes',
+        :description => 'Do not prompt for delete confirmation when specifying a tag regular expression match',
+        :boolean => true,
+        :default => false
+
       def run
         @query = @name_args.shift
         @tags = @name_args
@@ -40,38 +54,49 @@ class Chef
         end
 
         escaped_query = URI.escape(@query,Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-        q = Chef::Search::Query.new
+        query = Chef::Search::Query.new
         node_items = []
         node_count = 0
         begin
-          res = q.search(:node, escaped_query)
-          node_items = res.first.map { |node| node.name }
+          res = query.search(:node, escaped_query)
+          node_items = res.first.map{ |node| node.name }.sort
           node_count = res.last
-          ui.info(
-            ui.color("\u2192  ", [:bold, :green]) +
-            ui.color(node_count.to_s, [:bold, :yellow]) +
-            ui.color(' node(s) found.', [:bold, :white])
-          )
+          nodes_found(node_count)
           if node_count > 0
-            node_items.each do |node_name|              
+            if config[:regex]
+              unless config[:yes]
+                confirm = ui.ask_question(
+                  ui.color("\u2192  Deleting tags based on regulard expressions is a potentially dangerous operation. Are you sure you want to continue? ", [:bold, :red]),
+                  {:default => 'Y'}
+                )
+                if not confirm.match(/[Yy][Ee]?[Ss]?/)
+                  ui.fatal('Did not confirm destructive operation. Exiting...')
+                  exit 1
+                end
+              end
+              rtags = @tags.map { |rtag| Regexp.new(rtag) }
+            end
+            node_items.each do |node_name|
               node = Chef::Node.load(node_name)
-              @tags.each { |tag| node.tags.delete(tag) }
+              tags_to_remove = Array.new              
+              if config[:regex]                
+                tags_to_remove = node.tags.map do |ntag|
+                  rtags.map do |utag|
+                    break ntag if ntag.match(utag)
+                  end
+                end.flatten.compact.uniq
+              else
+                tags_to_remove = @tags
+              end
+              if (node.tags & tags_to_remove).size == 0
+                tags_not_present(node_name, @tags)
+                next
+              end
+              tags_to_remove.each { |tag| node.tags.delete(tag) }
               node.save
-              ui.info(
-                ui.color("\u2714  ", [:bold, :green]) +
-                ui.color("Successfully deleted tag(s) ", [:bold, :white]) + 
-                ui.color("[#{@tags.join(', ')}]", [:bold, :yellow]) + 
-                ui.color(" from node ", [:bold, :white]) +
-                ui.color("[#{node_name}]", [:bold, :yellow])
-              )
+              tags_successfully_deleted(node_name, tags_to_remove)
               if config[:verbosity] > 0
-                ui.info(
-                  ui.color("\u2192  ", [:bold, :green]) +
-                  ui.color('Node ', [:bold, :white]) +
-                  ui.color("[#{node_name}]", [:bold, :yellow]) +
-                  ui.color(' is now tagged with ', [:bold, :white]) +
-                  ui.color("[#{node.tags.join(', ')}]", [:bold, :yellow])
-                )
+                verbose_node_tag_information(node_name, node.tags)
               end
             end
           end
@@ -79,9 +104,50 @@ class Chef
           msg = Chef::JSONCompat.from_json(e.response.body)['error'].first
           ui.fatal("An error occurred: #{msg}")
           exit 1
+        rescue RegexpError => e
+          ui.fatal("Invalid Regular expression given: #{e.message}")
         end      
       end
 
+      def nodes_found(node_count)
+        ui.info(
+          ui.color("\u2192  ", [:bold, :green]) +
+          ui.color(node_count.to_s, [:bold, :yellow]) +
+          ui.color(' node(s) found.', [:bold, :white])
+        )      
+      end
+
+      def tags_not_present(node_name, tags)
+        ui.info(
+          ui.color("\u2714  ", [:bold, :green]) +
+          ui.color("Tag(s) ", [:bold, :white]) + 
+          ui.color("[#{tags.join(', ')}]", [:bold, :yellow]) + 
+          ui.color(" not present on node ", [:bold, :white]) +
+          ui.color("[#{node_name}]", [:bold, :yellow]) +
+          ui.color(". Skipping...", [:bold, :white])
+        )      
+      end
+
+      def tags_successfully_deleted(node_name, tags)
+        ui.info(
+          ui.color("\u2714  ", [:bold, :green]) +
+          ui.color("Successfully deleted tag(s) ", [:bold, :white]) + 
+          ui.color("[#{tags.join(', ')}]", [:bold, :yellow]) + 
+          ui.color(" from node ", [:bold, :white]) +
+          ui.color("[#{node_name}]", [:bold, :yellow])
+        )        
+      end
+
+      def verbose_node_tag_information(node_name, tags)
+        ui.info(
+          ui.color("\u2192  ", [:bold, :green]) +
+          ui.color('Node ', [:bold, :white]) +
+          ui.color("[#{node_name}]", [:bold, :yellow]) +
+          ui.color(' is now tagged with ', [:bold, :white]) +
+          ui.color("[#{tags.join(', ')}]", [:bold, :yellow])
+        )
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-tagbulk
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Panagiotis Papadomitsos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef