knife 18.2.7 → 18.3.0

data/lib/chef/knife/data_bag_create.rb

@@ -1,81 +1,81 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Seth Falcon (<seth@chef.io>)
-# Copyright:: Copyright (c) Chef Software 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_relative "../knife"
-require_relative "data_bag_secret_options"
-
-class Chef
-  class Knife
-    class DataBagCreate < Knife
-      include DataBagSecretOptions
-
-      deps do
-        require "chef/data_bag" unless defined?(Chef::DataBag)
-        require "chef/encrypted_data_bag_item" unless defined?(Chef::EncryptedDataBagItem)
-      end
-
-      banner "knife data bag create BAG [ITEM] (options)"
-      category "data bag"
-
-      def run
-        @data_bag_name, @data_bag_item_name = @name_args
-
-        if @data_bag_name.nil?
-          show_usage
-          ui.fatal("You must specify a data bag name")
-          exit 1
-        end
-
-        begin
-          Chef::DataBag.validate_name!(@data_bag_name)
-        rescue Chef::Exceptions::InvalidDataBagName => e
-          ui.fatal(e.message)
-          exit(1)
-        end
-
-        # Verify if the data bag exists
-        begin
-          rest.get("data/#{@data_bag_name}")
-          ui.info("Data bag #{@data_bag_name} already exists")
-        rescue Net::HTTPClientException => e
-          raise unless /^404/.match?(e.to_s)
-
-          # if it doesn't exists, try to create it
-          rest.post("data", { "name" => @data_bag_name })
-          ui.info("Created data_bag[#{@data_bag_name}]")
-        end
-
-        # if an item is specified, create it, as well
-        if @data_bag_item_name
-          create_object({ "id" => @data_bag_item_name }, "data_bag_item[#{@data_bag_item_name}]") do |output|
-            item = Chef::DataBagItem.from_hash(
-              if encryption_secret_provided?
-                Chef::EncryptedDataBagItem.encrypt_data_bag_item(output, read_secret)
-              else
-                output
-              end
-            )
-            item.data_bag(@data_bag_name)
-            rest.post("data/#{@data_bag_name}", item)
-          end
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright (c) Chef Software 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_relative "../knife"
+require_relative "data_bag_secret_options"
+
+class Chef
+  class Knife
+    class DataBagCreate < Knife
+      include DataBagSecretOptions
+
+      deps do
+        require "chef/data_bag" unless defined?(Chef::DataBag)
+        require "chef/encrypted_data_bag_item" unless defined?(Chef::EncryptedDataBagItem)
+      end
+
+      banner "knife data bag create BAG [ITEM] (options)"
+      category "data bag"
+
+      def run
+        @data_bag_name, @data_bag_item_name = @name_args
+
+        if @data_bag_name.nil?
+          show_usage
+          ui.fatal("You must specify a data bag name")
+          exit 1
+        end
+
+        begin
+          Chef::DataBag.validate_name!(@data_bag_name)
+        rescue Chef::Exceptions::InvalidDataBagName => e
+          ui.fatal(e.message)
+          exit(1)
+        end
+
+        # Verify if the data bag exists
+        begin
+          rest.get("data/#{@data_bag_name}")
+          ui.info("Data bag #{@data_bag_name} already exists")
+        rescue Net::HTTPClientException => e
+          raise unless /^404/.match?(e.to_s)
+
+          # if it doesn't exists, try to create it
+          rest.post("data", { "name" => @data_bag_name })
+          ui.info("Created data_bag[#{@data_bag_name}]")
+        end
+
+        # if an item is specified, create it, as well
+        if @data_bag_item_name
+          create_object({ "id" => @data_bag_item_name }, "data_bag_item[#{@data_bag_item_name}]") do |output|
+            item = Chef::DataBagItem.from_hash(
+              if encryption_secret_provided?
+                Chef::EncryptedDataBagItem.encrypt_data_bag_item(output, read_secret)
+              else
+                output
+              end
+            )
+            item.data_bag(@data_bag_name)
+            rest.post("data/#{@data_bag_name}", item)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/data_bag_delete.rb

@@ -1,49 +1,49 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright (c) Chef Software 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_relative "../knife"
-
-class Chef
-  class Knife
-    class DataBagDelete < Knife
-
-      deps do
-        require "chef/data_bag" unless defined?(Chef::DataBag)
-      end
-
-      banner "knife data bag delete BAG [ITEM] (options)"
-      category "data bag"
-
-      def run
-        if @name_args.length == 2
-          delete_object(Chef::DataBagItem, @name_args[1], "data_bag_item") do
-            rest.delete("data/#{@name_args[0]}/#{@name_args[1]}")
-          end
-        elsif @name_args.length == 1
-          delete_object(Chef::DataBag, @name_args[0], "data_bag") do
-            rest.delete("data/#{@name_args[0]}")
-          end
-        else
-          show_usage
-          ui.fatal("You must specify at least a data bag name")
-          exit 1
-        end
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Copyright:: Copyright (c) Chef Software 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_relative "../knife"
+
+class Chef
+  class Knife
+    class DataBagDelete < Knife
+
+      deps do
+        require "chef/data_bag" unless defined?(Chef::DataBag)
+      end
+
+      banner "knife data bag delete BAG [ITEM] (options)"
+      category "data bag"
+
+      def run
+        if @name_args.length == 2
+          delete_object(Chef::DataBagItem, @name_args[1], "data_bag_item") do
+            rest.delete("data/#{@name_args[0]}/#{@name_args[1]}")
+          end
+        elsif @name_args.length == 1
+          delete_object(Chef::DataBag, @name_args[0], "data_bag") do
+            rest.delete("data/#{@name_args[0]}")
+          end
+        else
+          show_usage
+          ui.fatal("You must specify at least a data bag name")
+          exit 1
+        end
+      end
+    end
+  end
+end

data/lib/chef/knife/data_bag_edit.rb

@@ -1,74 +1,74 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Seth Falcon (<seth@chef.io>)
-# Copyright:: Copyright (c) Chef Software 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_relative "../knife"
-require_relative "data_bag_secret_options"
-
-class Chef
-  class Knife
-    class DataBagEdit < Knife
-      include DataBagSecretOptions
-
-      deps do
-        require "chef/data_bag_item" unless defined?(Chef::DataBagItem)
-        require "chef/encrypted_data_bag_item" unless defined?(Chef::EncryptedDataBagItem)
-      end
-
-      banner "knife data bag edit BAG ITEM (options)"
-      category "data bag"
-
-      def load_item(bag, item_name)
-        item = Chef::DataBagItem.load(bag, item_name)
-        if encrypted?(item.raw_data)
-          if encryption_secret_provided_ignore_encrypt_flag?
-            [Chef::EncryptedDataBagItem.new(item, read_secret).to_hash, true]
-          else
-            ui.fatal("You cannot edit an encrypted data bag without providing the secret.")
-            exit(1)
-          end
-        else
-          [item.raw_data, false]
-        end
-      end
-
-      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, was_encrypted = load_item(@name_args[0], @name_args[1])
-        edited_item = edit_hash(item)
-
-        if was_encrypted || encryption_secret_provided?
-          ui.info("Encrypting data bag using provided secret.")
-          item_to_save = Chef::EncryptedDataBagItem.encrypt_data_bag_item(edited_item, read_secret)
-        else
-          ui.info("Saving data bag unencrypted. To encrypt it, provide an appropriate secret.")
-          item_to_save = edited_item
-        end
-
-        rest.put("data/#{@name_args[0]}/#{@name_args[1]}", item_to_save)
-        stdout.puts("Saved data_bag_item[#{@name_args[1]}]")
-        ui.output(edited_item) if config[:print_after]
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright (c) Chef Software 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_relative "../knife"
+require_relative "data_bag_secret_options"
+
+class Chef
+  class Knife
+    class DataBagEdit < Knife
+      include DataBagSecretOptions
+
+      deps do
+        require "chef/data_bag_item" unless defined?(Chef::DataBagItem)
+        require "chef/encrypted_data_bag_item" unless defined?(Chef::EncryptedDataBagItem)
+      end
+
+      banner "knife data bag edit BAG ITEM (options)"
+      category "data bag"
+
+      def load_item(bag, item_name)
+        item = Chef::DataBagItem.load(bag, item_name)
+        if encrypted?(item.raw_data)
+          if encryption_secret_provided_ignore_encrypt_flag?
+            [Chef::EncryptedDataBagItem.new(item, read_secret).to_hash, true]
+          else
+            ui.fatal("You cannot edit an encrypted data bag without providing the secret.")
+            exit(1)
+          end
+        else
+          [item.raw_data, false]
+        end
+      end
+
+      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, was_encrypted = load_item(@name_args[0], @name_args[1])
+        edited_item = edit_hash(item)
+
+        if was_encrypted || encryption_secret_provided?
+          ui.info("Encrypting data bag using provided secret.")
+          item_to_save = Chef::EncryptedDataBagItem.encrypt_data_bag_item(edited_item, read_secret)
+        else
+          ui.info("Saving data bag unencrypted. To encrypt it, provide an appropriate secret.")
+          item_to_save = edited_item
+        end
+
+        rest.put("data/#{@name_args[0]}/#{@name_args[1]}", item_to_save)
+        stdout.puts("Saved data_bag_item[#{@name_args[1]}]")
+        ui.output(edited_item) if config[:print_after]
+      end
+    end
+  end
+end

data/lib/chef/knife/data_bag_from_file.rb

@@ -1,113 +1,113 @@
-#
-# Author:: Adam Jacob (<adam@chef.io>)
-# Author:: Seth Falcon (<seth@chef.io>)
-# Copyright:: Copyright (c) Chef Software 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_relative "../knife"
-require_relative "data_bag_secret_options"
-
-class Chef
-  class Knife
-    class DataBagFromFile < Knife
-      include DataBagSecretOptions
-
-      deps do
-        require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
-        require "chef/data_bag" unless defined?(Chef::DataBag)
-        require "chef/data_bag_item" unless defined?(Chef::DataBagItem)
-        require "chef/encrypted_data_bag_item" unless defined?(Chef::EncryptedDataBagItem)
-        require_relative "core/object_loader"
-      end
-
-      banner "knife data bag from file BAG FILE|FOLDER [FILE|FOLDER..] (options)"
-      category "data bag"
-
-      option :all,
-        short: "-a",
-        long: "--all",
-        description: "Upload all data bags or all items for specified data bags."
-
-      def loader
-        @loader ||= Knife::Core::ObjectLoader.new(Chef::DataBagItem, ui)
-      end
-
-      def run
-        if config[:all] == true
-          load_all_data_bags(@name_args)
-        else
-          if @name_args.size < 2
-            ui.msg(opt_parser)
-            exit(1)
-          end
-          @data_bag = @name_args.shift
-          load_data_bag_items(@data_bag, @name_args)
-        end
-      end
-
-      private
-
-      def data_bags_path
-        @data_bag_path ||= "data_bags"
-      end
-
-      def find_all_data_bags
-        loader.find_all_object_dirs("./#{data_bags_path}")
-      end
-
-      def find_all_data_bag_items(data_bag)
-        loader.find_all_objects("./#{data_bags_path}/#{data_bag}")
-      end
-
-      def load_all_data_bags(args)
-        data_bags = args.empty? ? find_all_data_bags : [args.shift]
-        data_bags.each do |data_bag|
-          load_data_bag_items(data_bag)
-        end
-      end
-
-      def load_data_bag_items(data_bag, items = nil)
-        items ||= find_all_data_bag_items(data_bag)
-        item_paths = normalize_item_paths(items)
-        item_paths.each do |item_path|
-          item = loader.load_from((data_bags_path).to_s, data_bag, item_path)
-          item = if encryption_secret_provided?
-                   Chef::EncryptedDataBagItem.encrypt_data_bag_item(item, read_secret)
-                 else
-                   item
-                 end
-          dbag = Chef::DataBagItem.new
-          dbag.data_bag(data_bag)
-          dbag.raw_data = item
-          dbag.save
-          ui.info("Updated data_bag_item[#{dbag.data_bag}::#{dbag.id}]")
-        end
-      end
-
-      def normalize_item_paths(args)
-        paths = []
-        args.each do |path|
-          if File.directory?(path)
-            paths.concat(Dir.glob(File.join(ChefConfig::PathHelper.escape_glob_dir(path), "*.json")))
-          else
-            paths << path
-          end
-        end
-        paths
-      end
-    end
-  end
-end
+#
+# Author:: Adam Jacob (<adam@chef.io>)
+# Author:: Seth Falcon (<seth@chef.io>)
+# Copyright:: Copyright (c) Chef Software 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_relative "../knife"
+require_relative "data_bag_secret_options"
+
+class Chef
+  class Knife
+    class DataBagFromFile < Knife
+      include DataBagSecretOptions
+
+      deps do
+        require "chef-config/path_helper" unless defined?(ChefConfig::PathHelper)
+        require "chef/data_bag" unless defined?(Chef::DataBag)
+        require "chef/data_bag_item" unless defined?(Chef::DataBagItem)
+        require "chef/encrypted_data_bag_item" unless defined?(Chef::EncryptedDataBagItem)
+        require_relative "core/object_loader"
+      end
+
+      banner "knife data bag from file BAG FILE|FOLDER [FILE|FOLDER..] (options)"
+      category "data bag"
+
+      option :all,
+        short: "-a",
+        long: "--all",
+        description: "Upload all data bags or all items for specified data bags."
+
+      def loader
+        @loader ||= Knife::Core::ObjectLoader.new(Chef::DataBagItem, ui)
+      end
+
+      def run
+        if config[:all] == true
+          load_all_data_bags(@name_args)
+        else
+          if @name_args.size < 2
+            ui.msg(opt_parser)
+            exit(1)
+          end
+          @data_bag = @name_args.shift
+          load_data_bag_items(@data_bag, @name_args)
+        end
+      end
+
+      private
+
+      def data_bags_path
+        @data_bag_path ||= "data_bags"
+      end
+
+      def find_all_data_bags
+        loader.find_all_object_dirs("./#{data_bags_path}")
+      end
+
+      def find_all_data_bag_items(data_bag)
+        loader.find_all_objects("./#{data_bags_path}/#{data_bag}")
+      end
+
+      def load_all_data_bags(args)
+        data_bags = args.empty? ? find_all_data_bags : [args.shift]
+        data_bags.each do |data_bag|
+          load_data_bag_items(data_bag)
+        end
+      end
+
+      def load_data_bag_items(data_bag, items = nil)
+        items ||= find_all_data_bag_items(data_bag)
+        item_paths = normalize_item_paths(items)
+        item_paths.each do |item_path|
+          item = loader.load_from((data_bags_path).to_s, data_bag, item_path)
+          item = if encryption_secret_provided?
+                   Chef::EncryptedDataBagItem.encrypt_data_bag_item(item, read_secret)
+                 else
+                   item
+                 end
+          dbag = Chef::DataBagItem.new
+          dbag.data_bag(data_bag)
+          dbag.raw_data = item
+          dbag.save
+          ui.info("Updated data_bag_item[#{dbag.data_bag}::#{dbag.id}]")
+        end
+      end
+
+      def normalize_item_paths(args)
+        paths = []
+        args.each do |path|
+          if File.directory?(path)
+            paths.concat(Dir.glob(File.join(ChefConfig::PathHelper.escape_glob_dir(path), "*.json")))
+          else
+            paths << path
+          end
+        end
+        paths
+      end
+    end
+  end
+end