chef 0.9.18 → 0.10.0.beta.0

data/lib/chef/knife/data_bag_delete.rb

@@ -17,13 +17,15 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class DataBagDelete < Knife
 
+      deps do
+        require 'chef/data_bag'
+      end
+
       banner "knife data bag delete BAG [ITEM] (options)"
       category "data bag"
 
@@ -38,7 +40,7 @@ class Chef
           end
         else
           show_usage
-          Chef::Log.fatal("You must specify at least a data bag name")
+          ui.fatal("You must specify at least a data bag name")
           exit 1
         end
       end

data/lib/chef/knife/data_bag_edit.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Copyright:: Copyright (c) 2009-2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,30 +18,73 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag_item'
 
 class Chef
   class Knife
     class DataBagEdit < Knife
 
+      deps do
+        require 'chef/data_bag_item'
+        require 'chef/encrypted_data_bag_item'
+      end
+
       banner "knife data bag edit BAG ITEM (options)"
       category "data bag"
 
-      def run 
-        if @name_args.length != 2
-          Chef::Log.fatal("You must supply the data bag and an item to edit!")
-          exit 42
+      option :secret,
+      :short => "-s SECRET",
+      :long  => "--secret ",
+      :description => "The secret key to use to encrypt data bag item values"
+
+      option :secret_file,
+      :long => "--secret_file SECRET_FILE",
+      :description => "A file containing the secret key to use to encrypt data bag item values"
+
+      def read_secret
+        if config[:secret]
+          config[:secret]
         else
-          object = Chef::DataBagItem.load(@name_args[0], @name_args[1])
+          Chef::EncryptedDataBagItem.load_secret(config[:secret_file])
+        end
+      end
 
-          output = edit_data(object)
+      def use_encryption
+        if config[:secret] && config[:secret_file]
+          stdout.puts "please specify only one of --secret, --secret_file"
+          exit(1)
+        end
+        config[:secret] || config[:secret_file]
+      end
 
-          rest.put_rest("data/#{@name_args[0]}/#{@name_args[1]}", output)
+      def load_item(bag, item_name)
+        item = Chef::DataBagItem.load(bag, item_name)
+        if use_encryption
+          Chef::EncryptedDataBagItem.new(item, read_secret).to_hash
+        else
+          item
+        end
+      end
 
-          Chef::Log.info("Saved data_bag_item[#{@name_args[1]}]")
+      def edit_item(item)
+        output = edit_data(item)
+        if use_encryption
+          Chef::EncryptedDataBagItem.encrypt_data_bag_item(output, read_secret)
+        else
+          output
+        end
+      end
 
-          output(format_for_display(object)) if config[:print_after]
+      def run
+        if @name_args.length != 2
+          stdout.puts "You must supply the data bag and an item to edit!"
+          stdout.puts opt_parser
+          exit 1
         end
+        item = load_item(@name_args[0], @name_args[1])
+        output = edit_item(item)
+        rest.put_rest("data/#{@name_args[0]}/#{@name_args[1]}", output)
+        stdout.puts("Saved data_bag_item[#{@name_args[1]}]")
+        output(format_for_display(object)) if config[:print_after]
       end
     end
   end

data/lib/chef/knife/data_bag_from_file.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Seth Falcon (<seth@opscode.com>)
 # Copyright:: Copyright (c) 2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -17,24 +18,63 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag'
-require 'chef/data_bag_item'
-require 'chef/json_compat'
 
 class Chef
   class Knife
     class DataBagFromFile < Knife
 
+      deps do
+        require 'chef/data_bag'
+        require 'chef/data_bag_item'
+        require 'chef/json_compat'
+        require 'chef/encrypted_data_bag_item'
+      end
+
       banner "knife data bag from file BAG FILE (options)"
       category "data bag"
 
-      def run 
-        updated = load_from_file(Chef::DataBagItem, @name_args[1], @name_args[0])
+      option :secret,
+      :short => "-s SECRET",
+      :long  => "--secret ",
+      :description => "The secret key to use to encrypt data bag item values"
+
+      option :secret_file,
+      :long => "--secret_file SECRET_FILE",
+      :description => "A file containing the secret key to use to encrypt data bag item values"
+
+      def read_secret
+        if config[:secret]
+          config[:secret]
+        else
+          Chef::EncryptedDataBagItem.load_secret(config[:secret_file])
+        end
+      end
+
+      def use_encryption
+        if config[:secret] && config[:secret_file]
+          stdout.puts "please specify only one of --secret, --secret_file"
+          exit(1)
+        end
+        config[:secret] || config[:secret_file]
+      end
+
+      def run
+        if @name_args.size != 2
+          stdout.puts opt_parser
+          exit(1)
+        end
+        item = load_from_file(Chef::DataBagItem, @name_args[1], @name_args[0])
+        item = if use_encryption
+                 secret = read_secret
+                 Chef::EncryptedDataBagItem.encrypt_data_bag_item(item, secret)
+               else
+                 item
+               end
         dbag = Chef::DataBagItem.new
         dbag.data_bag(@name_args[0])
-        dbag.raw_data = updated
+        dbag.raw_data = item
         dbag.save
-        Chef::Log.info("Updated data_bag_item[#{@name_args[1]}]")
+        ui.info("Updated data_bag_item[#{@name_args[1]}]")
       end
     end
   end

data/lib/chef/knife/data_bag_list.rb

@@ -17,12 +17,15 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag'
 
 class Chef
   class Knife
     class DataBagList < Knife
 
+      deps do
+        require 'chef/data_bag'
+      end
+
       banner "knife data bag list (options)"
       category "data bag"
 

data/lib/chef/knife/data_bag_show.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
-# Copyright:: Copyright (c) 2009 Opscode, Inc.
+# Author:: Seth Falcon (<seth@opscode.com>)
+# Copyright:: Copyright (c) 2009-2010 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,21 +18,60 @@
 #
 
 require 'chef/knife'
-require 'chef/data_bag'
 
 class Chef
   class Knife
     class DataBagShow < Knife
 
+      deps do
+        require 'chef/data_bag'
+        require 'chef/encrypted_data_bag_item'
+      end
+
       banner "knife data bag show BAG [ITEM] (options)"
       category "data bag"
 
+      option :secret,
+      :short => "-s SECRET",
+      :long  => "--secret ",
+      :description => "The secret key to use to decrypt data bag item values"
+
+      option :secret_file,
+      :long => "--secret_file SECRET_FILE",
+      :description => "A file containing the secret key to use to decrypt data bag item values"
+
+      def read_secret
+        if config[:secret]
+          config[:secret]
+        else
+          Chef::EncryptedDataBagItem.load_secret(config[:secret_file])
+        end
+      end
+
+      def use_encryption
+        if config[:secret] && config[:secret_file]
+          stdout.puts "please specify only one of --secret, --secret_file"
+          exit(1)
+        end
+        config[:secret] || config[:secret_file]
+      end
+
       def run
         display = case @name_args.length
                   when 2
-                    format_for_display(Chef::DataBagItem.load(@name_args[0], @name_args[1]))
-                  else
+                    if use_encryption
+                      raw = Chef::EncryptedDataBagItem.load(@name_args[0],
+                                                            @name_args[1],
+                                                            read_secret)
+                      format_for_display(raw.to_hash)
+                    else
+                      format_for_display(Chef::DataBagItem.load(@name_args[0], @name_args[1]))
+                    end
+                  when 1
                     format_list_for_display(Chef::DataBag.load(@name_args[0]))
+                  else
+                    stdout.puts opt_parser
+                    exit(1)
                   end
         output(display)
       end

data/lib/chef/knife/environment_create.rb

@@ -0,0 +1,53 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+class Chef
+  class Knife
+    class EnvironmentCreate < Knife
+
+      deps do
+        require 'chef/environment'
+        require 'chef/json_compat'
+      end
+
+      banner "knife environment create ENVIRONMENT (options)"
+
+      option :description,
+        :short => "-d DESCRIPTION",
+        :long => "--description DESCRIPTION",
+        :description => "The environment description"
+
+      def run
+        env_name = @name_args[0]
+
+        if env_name.nil?
+          show_usage
+          ui.fatal("You must specify an environment name")
+          exit 1
+        end
+
+        env = Chef::Environment.new
+        env.name(env_name)
+        env.description(config[:description]) if config[:description]
+        create_object(env)
+      end
+    end
+  end
+end

data/lib/chef/knife/environment_delete.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+class Chef
+  class Knife
+    class EnvironmentDelete < Knife
+
+      deps do
+        require 'chef/environment'
+        require 'chef/json_compat'
+      end
+
+      banner "knife environment delete ENVIRONMENT (options)"
+
+      def run
+        env_name = @name_args[0]
+
+        if env_name.nil?
+          show_usage
+          ui.fatal("You must specify an environment name")
+          exit 1
+        end
+
+        delete_object(Chef::Environment, env_name)
+      end
+    end
+  end
+end

data/lib/chef/knife/environment_edit.rb

@@ -0,0 +1,45 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife'
+
+class Chef
+  class Knife
+    class EnvironmentEdit < Knife
+
+      deps do
+        require 'chef/environment'
+        require 'chef/json_compat'
+      end
+
+      banner "knife environment edit ENVIRONMENT (options)"
+
+      def run
+        env_name = @name_args[0]
+
+        if env_name.nil?
+          show_usage
+          ui.fatal("You must specify an environment name")
+          exit 1
+        end
+
+        edit_object(Chef::Environment, env_name)
+      end
+    end
+  end
+end

data/lib/chef/knife/environment_from_file.rb

@@ -0,0 +1,39 @@
+#
+# Author:: Stephen Delano (<stephen@opscode.com>)
+# Copyright:: Copyright (c) 2010 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class Chef
+  class Knife
+    class EnvironmentFromFile < Knife
+
+      banner "knife environment from file FILE (options)"
+
+      def run
+        if @name_args[0].nil?
+          show_usage
+          ui.fatal("You must specify a file to load")
+          exit 1
+        end
+
+        updated = load_from_file(Chef::Environment, @name_args[0])
+        updated.save
+        output(format_for_display(updated)) if config[:print_after]
+        ui.warn("Updated Environment #{updated.name}!")
+      end
+    end
+  end
+end