encrypt_create.rb in chef-vault-2.2.0

- old
+ new
@@ -11,91 +11,42 @@
 # 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'
-require 'chef-vault'
+require 'chef/knife/vault_base'
+require 'chef/knife/vault_create'
 
-class EncryptCreate < Chef::Knife
-  deps do
-    require 'chef/search/query'
-    require File.expand_path('../mixin/compat', __FILE__)
-    require File.expand_path('../mixin/helper', __FILE__)
-    include ChefVault::Mixin::KnifeCompat
-    include ChefVault::Mixin::Helper
-  end
+class Chef
+  class Knife
+    class EncryptCreate < VaultCreate
 
-  banner "knife encrypt create VAULT ITEM VALUES "\
-        "--mode MODE --search SEARCH --admins ADMINS --json FILE --file FILE"
+      include Knife::VaultBase
 
-  option :mode,
-    :short => '-M MODE',
-    :long => '--mode MODE',
-    :description => 'Chef mode to run in default - solo'
+      banner "knife encrypt create VAULT ITEM VALUES (options)"
 
-  option :search,
-    :short => '-S SEARCH',
-    :long => '--search SEARCH',
-    :description => 'Chef SOLR search for clients'
+      option :search,
+        :short => '-S SEARCH',
+        :long => '--search SEARCH',
+        :description => 'Chef SOLR search for clients'
 
-  option :admins,
-    :short => '-A ADMINS',
-    :long => '--admins ADMINS',
-    :description => 'Chef users to be added as admins'
+      option :admins,
+        :short => '-A ADMINS',
+        :long => '--admins ADMINS',
+        :description => 'Chef users to be added as admins'
 
-  option :json,
-    :short => '-J FILE',
-    :long => '--json FILE',
-    :description => 'File containing JSON data to encrypt'
+      option :json,
+        :short => '-J FILE',
+        :long => '--json FILE',
+        :description => 'File containing JSON data to encrypt'
 
-  option :file,
-    :long => '--file FILE',
-    :description => 'File to be added to vault item as file-content'
+      option :file,
+        :long => '--file FILE',
+        :description => 'File to be added to vault item as file-content'
 
-  def run
-    vault = @name_args[0]
-    item = @name_args[1]
-    values = @name_args[2]
-    search = config[:search]
-    admins = config[:admins]
-    json_file = config[:json]
-    file = config[:file]
-
-    set_mode(config[:mode])
-
-    if vault && item && (values || json_file || file) && (search || admins)
-      begin
-        vault_item = ChefVault::Item.load(vault, item)
-        raise ChefVault::Exceptions::ItemAlreadyExists,
-              "#{vault_item.data_bag}/#{vault_item.id} already exists, "\
-              "use 'knife encrypt remove' and "\
-              "'knife encrypt update' to make changes."
-      rescue ChefVault::Exceptions::KeysNotFound,
-             ChefVault::Exceptions::ItemNotFound
-        vault_item = ChefVault::Item.new(vault, item)
-
-        merge_values(values, json_file).each do |key, value|
-          vault_item[key] = value
-        end
-
-        if file
-          vault_item["file-name"] = File.basename(file)
-          vault_item["file-content"] = File.open(file){ |file| file.read() }
-        end
-
-        vault_item.clients(search) if search
-        vault_item.admins(admins) if admins
-
-        vault_item.save
+      def run
+        puts "DEPRECATION WARNING: knife encrypt is deprecated. Please use knife vault instead."
+        super
       end
-    else
-      show_usage
     end
   end
-
-  def show_usage
-    super
-    exit 1
-  end
 end
-