puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/face/facts.rb

@@ -9,17 +9,12 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
   description <<-'EOT'
     This subcommand manages facts, which are collections of normalized system
     information used by Puppet. It can read facts directly from the local system
-    (with the default `facter` terminus), look up facts reported by other
-    systems, and submit facts to the puppet master.
-
-    When used with the `rest` terminus, this subcommand is essentially a front-end
-    to the inventory service REST API. See the inventory service documentation at
-    <http://docs.puppetlabs.com/guides/inventory_service.html> for more detail.
+    (with the default `facter` terminus).
   EOT
 
   find = get_action(:find)
   find.summary "Retrieve a node's facts."
-  find.arguments "<node_certname>"
+  find.arguments "[<node_certname>]"
   find.returns <<-'EOT'
     A hash containing some metadata and (under the "values" key) the set
     of facts for the requested node. When used from the Ruby API: A
@@ -34,48 +29,10 @@ Puppet::Indirector::Face.define(:facts, '0.0.1') do
   find.examples <<-'EOT'
     Get facts from the local system:
 
-    $ puppet facts find x
-
-    Ask the puppet master for facts for an arbitrary node:
-
-    $ puppet facts find somenode.puppetlabs.lan --terminus rest
-
-    Query a DB-backed inventory directly (bypassing the REST API):
-
-    $ puppet facts find somenode.puppetlabs.lan --terminus inventory_active_record --run_mode master
+    $ puppet facts find
   EOT
+  find.default = true
 
-  get_action(:destroy).summary "Invalid for this subcommand."
-  get_action(:search).summary "Invalid for this subcommand."
-
-  action(:upload) do
-    summary "Upload local facts to the puppet master."
-    description <<-'EOT'
-      Reads facts from the local system using the `facter` terminus, then
-      saves the returned facts using the rest terminus.
-    EOT
-    returns "Nothing."
-    notes <<-'EOT'
-      This action requires that the puppet master's `auth.conf` file
-      allow save access to the `facts` REST terminus. Puppet agent does
-      not use this facility, and it is turned off by default. See
-      <http://docs.puppetlabs.com/guides/rest_auth_conf.html> for more details.
-    EOT
-    examples <<-'EOT'
-      Upload facts:
-
-      $ puppet facts upload
-    EOT
-
-    render_as :yaml
-
-    when_invoked do |options|
-      Puppet::Node::Facts.indirection.terminus_class = :facter
-      facts = Puppet::Node::Facts.indirection.find(Puppet[:certname])
-      Puppet::Node::Facts.indirection.terminus_class = :rest
-      Puppet::Node::Facts.indirection.save(facts)
-      Puppet.notice "Uploaded facts for '#{Puppet[:certname]}'"
-      nil
-    end
-  end
+  deactivate_action(:destroy)
+  deactivate_action(:search)
 end

data/lib/puppet/face/file.rb

@@ -40,8 +40,8 @@ Puppet::Indirector::Face.define(:file, '0.0.1') do
     $ puppet file find md5/9aedba7f413c97dc65895b1cd9421f2c --render-as s
   EOT
 
-  get_action(:search).summary "Invalid for this subcommand."
-  get_action(:destroy).summary "Invalid for this subcommand."
+  deactivate_action(:search)
+  deactivate_action(:destroy)
 
   set_indirection_name :file_bucket_file
 end

data/lib/puppet/face/file/download.rb

@@ -29,8 +29,7 @@ Puppet::Face.define(:file, '0.0.1') do
         pathname = Puppet::FileSystem.pathname(content.full_path())
         file = Puppet::FileBucket::File.new(pathname)
       else
-        tester = Object.new
-        tester.extend(Puppet::Util::Checksums)
+        tester = Puppet::Util::Checksums
 
         type    = tester.sumtype(sum)
         sumdata = tester.sumdata(sum)

data/lib/puppet/face/help.rb

@@ -162,9 +162,8 @@ Detail: "#{detail.message}"
           return md[1]
         end
       end
-    rescue Exception
-      # Damn, but I hate this: we just ignore errors here, no matter what
-      # class they are.  Meh.
+    rescue StandardError
+      result << [ "! #{appname}", "! Subcommand unavailable due to error. Check error logs." ]
     end
     return ''
   end

data/lib/puppet/face/module/build.rb

@@ -5,9 +5,9 @@ Puppet::Face.define(:module, '1.0.0') do
       Prepares a local module for release on the Puppet Forge by building a
       ready-to-upload archive file.
 
-      This action uses the Modulefile in the module directory to set metadata
-      used by the Forge. See <http://links.puppetlabs.com/modulefile> for more
-      about writing modulefiles.
+      This action uses the metadata.json file in the module directory to set metadata
+      used by the Forge. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for more
+      about writing metadata.json files.
 
       After being built, the release archive file can be found in the module's
       `pkg` directory.
@@ -43,11 +43,11 @@ Puppet::Face.define(:module, '1.0.0') do
         pwd = Dir.pwd
         module_path = Puppet::ModuleTool.find_module_root(pwd)
         if module_path.nil?
-          raise "Unable to find metadata.json or Modulefile in module root #{pwd} or parent directories. See <http://links.puppetlabs.com/modulefile> for required file format."
+          raise "Unable to find metadata.json in module root #{pwd} or parent directories. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for required file format."
         end
       else
         unless Puppet::ModuleTool.is_module_root?(module_path)
-          raise "Unable to find metadata.json or Modulefile in module root #{module_path}. See <http://links.puppetlabs.com/modulefile> for required file format."
+          raise "Unable to find metadata.json in module root #{module_path} or parent directories. See <https://docs.puppetlabs.com/puppet/latest/reference/modules_publishing.html> for required file format."
         end
       end
 

data/lib/puppet/face/module/changes.rb

@@ -12,7 +12,7 @@ Puppet::Face.define(:module, '1.0.0') do
     examples <<-EOT
       Show modified files of an installed module:
 
-      $ puppet module changes /etc/puppet/modules/vcsrepo/
+      $ puppet module changes /etc/puppetlabs/code/modules/vcsrepo/
       warning: 1 files modified
       lib/puppet/provider/vcsrepo.rb
     EOT

data/lib/puppet/face/module/generate.rb

@@ -26,7 +26,7 @@ Puppet::Face.define(:module, '1.0.0') do
       Who wrote this module?  [puppetlabs]
       -->
 
-      What license does this module code fall under?  [Apache 2.0]
+      What license does this module code fall under?  [Apache-2.0]
       -->
 
       How would you describe this module in a single sentence?
@@ -47,7 +47,7 @@ Puppet::Face.define(:module, '1.0.0') do
         "version": "0.1.0",
         "author": "puppetlabs",
         "summary": null,
-        "license": "Apache 2.0",
+        "license": "Apache-2.0",
         "source": "",
         "project_page": null,
         "issues_url": null,
@@ -107,9 +107,9 @@ Puppet::Face.define(:module, '1.0.0') do
       begin
         # A default dependency for all newly generated modules is being
         # introduced as a substitute for the comments we used to include in the
-        # Modulefile. While introducing a default dependency is less than
-        # perfectly desirable, the cost is low, and the syntax is obtuse enough
-        # to justify its inclusion.
+        # previous module data specifications. While introducing a default
+        # dependency is less than perfectly desirable, the cost is low, and the
+        # syntax is obtuse enough to justify its inclusion.
         metadata = Puppet::ModuleTool::Metadata.new.update(
           'name' => name,
           'version' => '0.1.0',
@@ -204,7 +204,7 @@ module Puppet::ModuleTool::Generate
 
   def destination(metadata)
     return @dest if defined? @dest
-    @dest = Pathname.pwd + metadata.dashed_name
+    @dest = Pathname.pwd + metadata.name
     raise ArgumentError, "#{@dest} already exists." if @dest.exist?
     return @dest
   end

data/lib/puppet/face/module/install.rb

@@ -20,63 +20,63 @@ Puppet::Face.define(:module, '1.0.0') do
       Install a module:
 
       $ puppet module install puppetlabs-vcsrepo
-      Preparing to install into /etc/puppet/modules ...
+      Preparing to install into /etc/puppetlabs/code/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /etc/puppet/modules
+      /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module to a specific environment:
 
       $ puppet module install puppetlabs-vcsrepo --environment development
-      Preparing to install into /etc/puppet/environments/development/modules ...
+      Preparing to install into /etc/puppetlabs/code/environments/development/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /etc/puppet/environments/development/modules
+      /etc/puppetlabs/code/environments/development/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a specific module version:
 
       $ puppet module install puppetlabs-vcsrepo -v 0.0.4
-      Preparing to install into /etc/puppet/modules ...
+      Preparing to install into /etc/puppetlabs/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /etc/puppet/modules
+      /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module into a specific directory:
 
-      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppet/modules
-      Preparing to install into /usr/share/puppet/modules ...
+      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules
+      Preparing to install into /opt/puppetlabs/puppet/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /usr/share/puppet/modules
+      /opt/puppetlabs/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module into a specific directory and check for dependencies in other directories:
 
-      $ puppet module install puppetlabs-vcsrepo --target-dir=/usr/share/puppet/modules --modulepath /etc/puppet/modules
-      Preparing to install into /usr/share/puppet/modules ...
+      $ puppet module install puppetlabs-vcsrepo --target-dir=/opt/puppetlabs/puppet/modules --modulepath /etc/puppetlabs/code/modules
+      Preparing to install into /opt/puppetlabs/puppet/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /usr/share/puppet/modules
+      /opt/puppetlabs/puppet/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module from a release archive:
 
       $ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz
-      Preparing to install into /etc/puppet/modules ...
+      Preparing to install into /etc/puppetlabs/code/modules ...
       Downloading from http://forgeapi.puppetlabs.com ...
       Installing -- do not interrupt ...
-      /etc/puppet/modules
+      /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
       Install a module from a release archive and ignore dependencies:
 
       $ puppet module install puppetlabs-vcsrepo-0.0.4.tar.gz --ignore-dependencies
-      Preparing to install into /etc/puppet/modules ...
+      Preparing to install into /etc/puppetlabs/code/modules ...
       Installing -- do not interrupt ...
-      /etc/puppet/modules
+      /etc/puppetlabs/code/modules
       └── puppetlabs-vcsrepo (v0.0.4)
 
     EOT

data/lib/puppet/face/module/list.rb

@@ -21,40 +21,40 @@ Puppet::Face.define(:module, '1.0.0') do
       List installed modules:
 
       $ puppet module list
-        /etc/puppet/modules
+        /etc/puppetlabs/code/modules
         ├── bodepd-create_resources (v0.0.1)
         ├── puppetlabs-bacula (v0.0.2)
         ├── puppetlabs-mysql (v0.0.1)
         ├── puppetlabs-sqlite (v0.0.1)
         └── puppetlabs-stdlib (v2.2.1)
-        /usr/share/puppet/modules (no modules installed)
+        /opt/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules in a tree view:
 
       $ puppet module list --tree
-        /etc/puppet/modules
+        /etc/puppetlabs/code/modules
         └─┬ puppetlabs-bacula (v0.0.2)
           ├── puppetlabs-stdlib (v2.2.1)
           ├─┬ puppetlabs-mysql (v0.0.1)
           │ └── bodepd-create_resources (v0.0.1)
           └── puppetlabs-sqlite (v0.0.1)
-        /usr/share/puppet/modules (no modules installed)
+        /opt/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules from a specified environment:
 
       $ puppet module list --environment production
-        /etc/puppet/modules
+        /etc/puppetlabs/code/modules
         ├── bodepd-create_resources (v0.0.1)
         ├── puppetlabs-bacula (v0.0.2)
         ├── puppetlabs-mysql (v0.0.1)
         ├── puppetlabs-sqlite (v0.0.1)
         └── puppetlabs-stdlib (v2.2.1)
-        /usr/share/puppet/modules (no modules installed)
+        /opt/puppetlabs/puppet/modules (no modules installed)
 
       List installed modules from a specified modulepath:
 
-      $ puppet module list --modulepath /usr/share/puppet/modules
-        /usr/share/puppet/modules (no modules installed)
+      $ puppet module list --modulepath /opt/puppetlabs/puppet/modules
+        /opt/puppetlabs/puppet/modules (no modules installed)
     EOT
 
     when_invoked do |options|
@@ -207,7 +207,7 @@ Puppet::Face.define(:module, '1.0.0') do
   # When the above data structure is passed to Puppet::ModuleTool.build_tree
   # you end up with something like this:
   #
-  #   /etc/puppet/modules
+  #   /etc/puppetlabs/code/modules
   #   └─┬ puppetlabs-bacula (v0.0.2)
   #     ├── puppetlabs-stdlib (v2.2.1)
   #     ├─┬ puppetlabs-mysql (v1.0.0)

data/lib/puppet/face/module/uninstall.rb

@@ -12,22 +12,22 @@ Puppet::Face.define(:module, '1.0.0') do
       Uninstall a module:
 
       $ puppet module uninstall puppetlabs-ssh
-      Removed /etc/puppet/modules/ssh (v1.0.0)
+      Removed /etc/puppetlabs/code/modules/ssh (v1.0.0)
 
       Uninstall a module from a specific directory:
 
-      $ puppet module uninstall puppetlabs-ssh --modulepath /usr/share/puppet/modules
-      Removed /usr/share/puppet/modules/ssh (v1.0.0)
+      $ puppet module uninstall puppetlabs-ssh --modulepath /opt/puppetlabs/puppet/modules
+      Removed /opt/puppetlabs/puppet/modules/ssh (v1.0.0)
 
       Uninstall a module from a specific environment:
 
       $ puppet module uninstall puppetlabs-ssh --environment development
-      Removed /etc/puppet/environments/development/modules/ssh (v1.0.0)
+      Removed /etc/puppetlabs/code/environments/development/modules/ssh (v1.0.0)
 
       Uninstall a specific version of a module:
 
       $ puppet module uninstall puppetlabs-ssh --version 2.0.0
-      Removed /etc/puppet/modules/ssh (v2.0.0)
+      Removed /etc/puppetlabs/code/modules/ssh (v2.0.0)
     EOT
 
     arguments "<name>"

data/lib/puppet/face/module/upgrade.rb

@@ -13,19 +13,19 @@ Puppet::Face.define(:module, '1.0.0') do
       upgrade an installed module to the latest version
 
       $ puppet module upgrade puppetlabs-apache
-      /etc/puppet/modules
+      /etc/puppetlabs/puppet/modules
       └── puppetlabs-apache (v1.0.0 -> v2.4.0)
 
       upgrade an installed module to a specific version
 
       $ puppet module upgrade puppetlabs-apache --version 2.1.0
-      /etc/puppet/modules
+      /etc/puppetlabs/puppet/modules
       └── puppetlabs-apache (v1.0.0 -> v2.1.0)
 
       upgrade an installed module for a specific environment
 
       $ puppet module upgrade puppetlabs-apache --environment test
-      /usr/share/puppet/environments/test/modules
+      /etc/puppetlabs/code/environments/test/modules
       └── puppetlabs-apache (v1.0.0 -> v2.4.0)
     EOT
 

data/lib/puppet/face/node.rb

@@ -10,10 +10,9 @@ Puppet::Indirector::Face.define(:node, '0.0.1') do
     node parameters (exposed in the parser as top-scope variables), and classes.
   EOT
 
-  get_action(:destroy).summary "Invalid for this subcommand."
-  get_action(:search).summary "Invalid for this subcommand."
-  get_action(:save).summary "Invalid for this subcommand."
-  get_action(:save).description "Invalid for this subcommand."
+  deactivate_action(:destroy)
+  deactivate_action(:search)
+  deactivate_action(:save)
 
   find = get_action(:find)
   find.summary "Retrieve a node object."

data/lib/puppet/face/node/clean.rb

@@ -1,16 +1,10 @@
 Puppet::Face.define(:node, '0.0.1') do
   action(:clean) do
-    option "--[no-]unexport" do
-      summary "Whether to remove this node's exported resources from other nodes"
-    end
 
-    summary "Clean up everything a puppetmaster knows about a node."
+    summary "Clean up signed certs, cached facts, node objects, and reports for a node stored by the puppetmaster"
     arguments "<host1> [<host2> ...]"
     description <<-'EOT'
-      Clean up everything a puppet master knows about a node, including certificates
-      and storeconfigs data.
-
-      The full list of info cleaned by this action is:
+      Cleans up the following information a puppet master knows about a node:
 
       <Signed certificates> - ($vardir/ssl/ca/signed/node.domain.pem)
 
@@ -20,13 +14,6 @@ Puppet::Face.define(:node, '0.0.1') do
 
       <Reports> - ($vardir/reports/node.domain)
 
-      <Stored configs> - (in database) The clean action can either remove all
-      data from a host in your storeconfigs database, or, with the
-      <--unexport> option, turn every exported resource supporting ensure to
-      absent so that any other host that collected those resources can remove
-      them. Without unexporting, a removed node's exported resources become
-      unmanaged by Puppet, and may linger as cruft unless you are purging
-      that resource type.
     EOT
 
     when_invoked do |*args|
@@ -53,16 +40,15 @@ Puppet::Face.define(:node, '0.0.1') do
       Puppet::Node.indirection.terminus_class = :yaml
       Puppet::Node.indirection.cache_class = :yaml
 
-      nodes.each { |node| cleanup(node.downcase, options[:unexport]) }
+      nodes.each { |node| cleanup(node.downcase) }
     end
   end
 
-  def cleanup(node, unexport)
+  def cleanup(node)
     clean_cert(node)
     clean_cached_facts(node)
     clean_cached_node(node)
     clean_reports(node)
-    clean_storeconfigs(node, unexport)
   end
 
   # clean signed cert for +host+
@@ -94,55 +80,6 @@ Puppet::Face.define(:node, '0.0.1') do
     Puppet.info "#{node}'s reports removed"
   end
 
-  # clean storeconfig for +node+
-  def clean_storeconfigs(node, do_unexport=false)
-    return unless Puppet[:storeconfigs] && Puppet.features.rails?
-    require 'puppet/rails'
-    Puppet::Rails.connect
-    unless rails_node = Puppet::Rails::Host.find_by_name(node)
-      Puppet.notice "No entries found for #{node} in storedconfigs."
-      return
-    end
-
-    if do_unexport
-      unexport(rails_node)
-      Puppet.notice "Force #{node}'s exported resources to absent"
-      Puppet.warning "Please wait until all other hosts have checked out their configuration before finishing the cleanup with:"
-      Puppet.warning "$ puppet node clean #{node}"
-    else
-      rails_node.destroy
-      Puppet.notice "#{node} storeconfigs removed"
-    end
-  end
-
-  def unexport(node)
-    # fetch all exported resource
-    query = {:include => {:param_values => :param_name}}
-    query[:conditions] = [ "exported=? AND host_id=?", true, node.id ]
-    Puppet::Rails::Resource.find(:all, query).each do |resource|
-      if type_is_ensurable(resource)
-        line = 0
-        param_name = Puppet::Rails::ParamName.find_or_create_by_name("ensure")
-
-        if ensure_param = resource.param_values.find(
-          :first,
-          :conditions => [ 'param_name_id = ?', param_name.id ]
-        )
-          line = ensure_param.line.to_i
-          Puppet::Rails::ParamValue.delete(ensure_param.id);
-        end
-
-        # force ensure parameter to "absent"
-        resource.param_values.create(
-          :value => "absent",
-          :line => line,
-          :param_name => param_name
-        )
-        Puppet.info("#{resource.name} has been marked as \"absent\"")
-      end
-    end
-  end
-
   def environment
     @environment ||= Puppet.lookup(:current_environment)
   end
@@ -151,7 +88,7 @@ Puppet::Face.define(:node, '0.0.1') do
     if (type = Puppet::Type.type(resource.restype)) && type.validattr?(:ensure)
       return true
     else
-      type = environment.known_resource_types.find_definition('', resource.restype)
+      type = environment.known_resource_types.find_definition(resource.restype)
       return true if type && type.arguments.keys.include?('ensure')
     end
     return false