Drop unused privkey, pubkey and key_bundle types & providers

lib/puppet/provider/katello_ssl_tool.rb

@@ -86,64 +86,4 @@ def ca_details
       end
     end
   end
-
-  class CertFile < Puppet::Provider
-
-    initvars
-
-    commands :openssl => 'openssl'
-
-    def exists?
-      return false unless File.exist?(resource[:path])
-      return false unless File.exist?(source_path)
-      expected_content_processed == current_content
-    end
-
-    def create
-      File.open(resource[:path], "w", mode) { |f| f << expected_content_processed }
-    end
-
-    def destroy
-      FileUtils.rm_f(resource[:path])
-    end
-
-    protected
-
-    def expected_content_processed
-      content = expected_content
-      if resource[:force_rsa]
-        content.gsub!(/(BEGIN|END) (PRIVATE KEY)/, '\1 RSA \2')
-      end
-      content
-    end
-
-    def expected_content
-      File.read(source_path)
-    end
-
-    def current_content
-      File.read(resource[:path])
-    end
-
-    # what path to copy from
-    def source_path
-      raise NotImplementedError
-    end
-
-    def mode
-      0644
-    end
-
-    def cert_details
-      return @cert_details if defined? @cert_details
-      if cert_resource = resource.catalog.resource(@resource[:key_pair].to_s)
-        name = cert_resource.to_hash[:name]
-        @cert_details = details(name)
-      else
-        raise 'Cert or Ca was not specified'
-      end
-    end
-
-  end
-
 end

lib/puppet_x/certs/common.rb

@@ -67,74 +67,6 @@ module Common
           [self[:password_file]].compact
         end
       end
-
-      FILE_COMMON_PARAMS = Proc.new do
-        ensurable
-
-        newparam(:path, :namevar => true) do
-          isrequired
-        end
-
-        newparam(:password_file)
-
-        # ensure RSA string is present in -----(BEGIN/END) (RSA )?PRIVATE KEY-----
-        newparam(:force_rsa)
-
-        # make ensure present default
-        define_method(:managed?) { true }
-
-        newparam(:key_pair) do
-          isrequired
-
-          validate do |value|
-            param_resource = resource.catalog.resource(value.to_s)
-
-            if param_resource
-              param_resource_type = if param_resource.is_a?(Puppet::Resource)
-                                      param_resource.resource_type
-                                    else
-                                      param_resource.to_resource.resource_type
-                                    end
-
-              unless ['Puppet::Type::Ca', 'Puppet::Type::Cert'].include?(param_resource_type.to_s)
-                raise ArgumentError, "Expected Ca or Cert resource, got #{param_resource_type} #{param_resource.inspect}"
-              end
-            end
-          end
-        end
-
-        define_method(:autorequire_cert) do |type|
-          if @parameters.has_key?(:key_pair)
-            key_pair = catalog.resource(@parameters[:key_pair].value.to_s)
-            key_pair.to_hash[:name] if key_pair && key_pair.type == type
-          end
-        end
-
-        autorequire(:cert) do
-          autorequire_cert('Cert')
-        end
-
-        autorequire(:ca) do
-          autorequire_cert('Ca')
-        end
-
-        # Autorequire the nearest ancestor directory found in the catalog.
-        # Copied from Puppet's lib/puppet/type/file.rb
-        autorequire(:file) do
-          req = []
-          req << self[:password_file] if self[:password_file]
-          path = Pathname.new(self[:path])
-          if !path.root?
-            # Start at our parent, to avoid autorequiring ourself
-            parents = path.parent.enum_for(:ascend)
-            found = parents.find { |p| catalog.resource(:file, p.to_s) }
-            if found
-              req << found.to_s
-            end
-          end
-          req
-        end
-      end
     end
   end
 end