puppet 6.27.0 → 7.0.0

data/lib/puppet/application/lookup.rb

@@ -7,7 +7,6 @@ class Puppet::Application::Lookup < Puppet::Application
 
   RUN_HELP = _("Run 'puppet lookup --help' for more details").freeze
   DEEP_MERGE_OPTIONS = '--knock-out-prefix, --sort-merged-arrays, and --merge-hash-arrays'.freeze
-  TRUSTED_INFORMATION_FACTS = ["hostname", "domain", "fqdn", "clientcert"].freeze
 
   run_mode :server
 
@@ -55,7 +54,11 @@ class Puppet::Application::Lookup < Puppet::Application
   end
 
   option('--facts FACT_FILE') do |arg|
-    options[:fact_file] = arg
+    if %w{.yaml .yml .json}.include?(arg.match(/\.[^.]*$/)[0])
+      options[:fact_file] = arg
+    else
+      raise _("The --fact file only accepts yaml and json files.\n%{run_help}") % { run_help: RUN_HELP }
+    end
   end
 
   def app_defaults
@@ -134,9 +137,7 @@ DESCRIPTION
 The lookup command is a CLI for Puppet's 'lookup()' function. It searches your
 Hiera data and returns a value for the requested lookup key, so you can test and
 explore your data. It is a modern replacement for the 'hiera' command.
-Lookup uses the setting for global hiera.yaml from puppet's config,
-and the environment to find the environment level hiera.yaml as well as the
-resulting modulepath for the environment (for hiera.yaml files in modules).
+
 Hiera usually relies on a node's facts to locate the relevant data sources. By
 default, 'puppet lookup' uses facts from the node you run the command on, but
 you can get data for any other node with the '--node <NAME>' option. If
@@ -185,8 +186,7 @@ OPTIONS
 * --environment <ENV>
   Like with most Puppet commands, you can specify an environment on the command
   line. This is important for lookup because different environments can have
-  different Hiera data. This environment will be always be the one used regardless
-  of any other factors.
+  different Hiera data.
 
 * --merge first|unique|hash|deep:
   Specify the merge behavior, overriding any merge behavior from the data's
@@ -237,13 +237,6 @@ EXAMPLE
   To look up 'key_name' using the Puppet Server node's facts:
   $ puppet lookup key_name
 
-  To look up 'key_name' using the Puppet Server node's arbitrary variables from a manifest, and 
-  classify the node if applicable:
-  $ puppet lookup key_name --compile
-
-  To look up 'key_name' using the Puppet Server node's facts, overridden by facts given in a file:
-  $ puppet lookup key_name --facts fact_file.yaml
-
   To look up 'key_name' with agent.local's facts:
   $ puppet lookup --node agent.local key_name
 
@@ -348,62 +341,31 @@ Copyright (c) 2015 Puppet Inc., LLC Licensed under the Apache 2.0 License
       Puppet.settings[:facts_terminus] = 'facter'
     end
 
+    unless node.is_a?(Puppet::Node) # to allow unit tests to pass a node instance
+      ni = Puppet::Node.indirection
+      tc = ni.terminus_class
+      if tc == :plain || options[:compile]
+        node = ni.find(node)
+      else
+        ni.terminus_class = :plain
+        node = ni.find(node)
+        ni.terminus_class = tc
+      end
+    end
+
     fact_file = options[:fact_file]
 
     if fact_file
-      if fact_file.end_with?('.json')
-        given_facts = Puppet::Util::Json.load_file(fact_file)
-      elsif fact_file.end_with?('.yml', '.yaml')
-        given_facts = Puppet::Util::Yaml.safe_load_file(fact_file)
+      if fact_file.end_with?("json")
+        given_facts = Puppet::Util::Json.load(Puppet::FileSystem.read(fact_file, :encoding => 'utf-8'))
       else
-        given_facts = Puppet::Util::Json.load_file_if_valid(fact_file)
-        given_facts = Puppet::Util::Yaml.safe_load_file_if_valid(fact_file) unless given_facts
+        given_facts = Puppet::Util::Yaml.safe_load_file(fact_file)
       end
 
       unless given_facts.instance_of?(Hash)
-        raise _("Incorrectly formatted data in %{fact_file} given via the --facts flag (only accepts yaml and json files)") % { fact_file: fact_file }
-      end
-
-      if TRUSTED_INFORMATION_FACTS.any? { |key| given_facts.key? key }
-        unless TRUSTED_INFORMATION_FACTS.all? { |key| given_facts.key? key }
-          raise _("When overriding any of the %{trusted_facts_list} facts with %{fact_file} "\
-            "given via the --facts flag, they must all be overridden.") % { fact_file: fact_file ,trusted_facts_list: TRUSTED_INFORMATION_FACTS.join(',')}
-        end
+        raise _("Incorrect formatted data in %{fact_file} given via the --facts flag") % { fact_file: fact_file }
       end
-    end
-
-    unless node.is_a?(Puppet::Node) # to allow unit tests to pass a node instance
-      facts = retrieve_node_facts(node, given_facts)
-      ni = Puppet::Node.indirection
-      tc = ni.terminus_class
-      if options[:compile] && !Puppet.settings.set_by_cli?('environment')
-        if tc == :plain
-          node = ni.find(node, facts: facts)
-        else
-          begin
-            service = Puppet.runtime[:http]
-            session = service.create_session
-            cert = session.route_to(:ca)
-
-            _, x509 = cert.get_certificate(node)
-            cert = OpenSSL::X509::Certificate.new(x509)
-            Puppet::SSL::Oids.register_puppet_oids
-            trusted = Puppet::Context::TrustedInformation.remote(true, facts.values['certname'] || node, Puppet::SSL::Certificate.from_instance(cert))
-            Puppet.override(trusted_information: trusted) do
-              node = ni.find(node, facts: facts)
-            end
-          rescue
-            Puppet.warning _("CA is not available, the operation will continue without using trusted facts.")
-            node = ni.find(node, facts: facts)
-          end
-        end
-      else
-        ni.terminus_class = :plain
-        node = ni.find(node, facts: facts, environment: Puppet[:environment])
-        ni.terminus_class = tc
-      end
-    else
-      node.add_extra_facts(given_facts) if given_facts
+      node.add_extra_facts(given_facts)
     end
 
     Puppet[:code] = 'undef' unless options[:compile]
@@ -416,16 +378,4 @@ Copyright (c) 2015 Puppet Inc., LLC Licensed under the Apache 2.0 License
       compiler.compile { |catalog| yield(compiler.topscope); catalog }
     end
   end
-
-  def retrieve_node_facts(node, given_facts)
-    facts = Puppet::Node::Facts.indirection.find(node, :environment => Puppet.lookup(:current_environment))
-
-    facts = Puppet::Node::Facts.new(node, {}) if facts.nil?
-    facts.add_extra_values(given_facts) if given_facts
-
-    if facts.values.empty?
-      raise _("No facts available for target node: %{node}") % { node: node}
-    end
-    facts
-  end
 end

data/lib/puppet/application/resource.rb

@@ -1,7 +1,6 @@
 require 'puppet/application'
 
 class Puppet::Application::Resource < Puppet::Application
-  environment_mode :not_required
 
   attr_accessor :host, :extra_params
 
@@ -15,9 +14,8 @@ class Puppet::Application::Resource < Puppet::Application
   option("--to_yaml","-y")
 
   option("--types", "-t") do |arg|
-    env = Puppet.lookup(:environments).get(Puppet[:environment]) || create_default_environment
     types = []
-    Puppet::Type.typeloader.loadall(env)
+    Puppet::Type.loadall
     Puppet::Type.eachtype do |t|
       next if t.name == :component
       types << t.name.to_s
@@ -103,8 +101,7 @@ configuration options can also be generated by running puppet with
   Print extra information.
 
 * --to_yaml:
-  Output found resources in yaml format, suitable to use with Hiera and
-  create_resources.
+  Output found resources in yaml format, suitable to use with Hiera and create_resources.
 
 EXAMPLE
 -------
@@ -136,9 +133,7 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
   end
 
   def main
-    # If the specified environment does not exist locally, fall back to the default (production) environment
-    env = Puppet.lookup(:environments).get(Puppet[:environment]) || create_default_environment
-
+    env = Puppet.lookup(:environments).get(Puppet[:environment])
     Puppet.override(:current_environment => env, :loaders => Puppet::Pops::Loaders.new(env)) do
       type, name, params = parse_args(command_line.args)
 
@@ -213,35 +208,24 @@ Copyright (c) 2011 Puppet Inc., LLC Licensed under the Apache 2.0 License
     [type, name, params]
   end
 
-  def create_default_environment
-    Puppet.debug("Specified environment '#{Puppet[:environment]}' does not exist on the filesystem, defaulting to 'production'")
-    Puppet[:environment] = :production
-    basemodulepath = Puppet::Node::Environment.split_path(Puppet[:basemodulepath])
-    modulepath = Puppet[:modulepath]
-    modulepath = (modulepath.nil? || modulepath.empty?) ? basemodulepath : Puppet::Node::Environment.split_path(modulepath)
-    Puppet::Node::Environment.create(Puppet[:environment], modulepath, Puppet::Node::Environment::NO_MANIFEST)
-  end
-
   def find_or_save_resources(type, name, params)
     key = local_key(type, name)
 
-    Puppet.override(stringify_rich: true) do
-      if name
-        if params.empty?
-          [ Puppet::Resource.indirection.find( key ) ]
-        else
-          resource = Puppet::Resource.new( type, name, :parameters => params )
-
-          # save returns [resource that was saved, transaction log from applying the resource]
-          save_result = Puppet::Resource.indirection.save(resource, key)
-          [ save_result.first ]
-        end
+    if name
+      if params.empty?
+        [ Puppet::Resource.indirection.find( key ) ]
       else
-        if type == "file"
-          raise _("Listing all file instances is not supported.  Please specify a file or directory, e.g. puppet resource file /etc")
-        end
-        Puppet::Resource.indirection.search( key, {} )
+        resource = Puppet::Resource.new( type, name, :parameters => params )
+
+        # save returns [resource that was saved, transaction log from applying the resource]
+        save_result = Puppet::Resource.indirection.save(resource, key)
+        [ save_result.first ]
+      end
+    else
+      if type == "file"
+        raise _("Listing all file instances is not supported.  Please specify a file or directory, e.g. puppet resource file /etc")
       end
+      Puppet::Resource.indirection.search( key, {} )
     end
   end
 end

data/lib/puppet/application/script.rb

@@ -71,8 +71,6 @@ configuration options can also be generated by running puppet with
   Where to send log messages. Choose between 'syslog' (the POSIX syslog
   service), 'eventlog' (the Windows Event Log), 'console', or the path to a log
   file. Defaults to 'console'.
-  Multiple destinations can be set using a comma separated list
-  (eg: `/path/file1,console,/path/file2`)"
 
   A path ending with '.json' will receive structured output in JSON format. The
   log file will not have an ending ']' automatically written to it due to the

data/lib/puppet/application/ssl.rb

@@ -74,9 +74,6 @@ ACTIONS
   `--localca` is specified, then also remove this host's local copy of the
   CA certificate(s) and CRL bundle. if `--target CERTNAME` is specified, then
   remove the files for the specified device on this host instead of this host.
-
- * show:
-  Print the full-text version of this host's certificate.
 HELP
   end
 
@@ -117,7 +114,6 @@ HELP
     end
 
     Puppet::SSL::Oids.register_puppet_oids
-    Puppet::SSL::Oids.load_custom_oid_file(Puppet[:trusted_oid_mapping_file])
 
     certname = Puppet[:certname]
     action = command_line.args.first
@@ -146,19 +142,11 @@ HELP
       end
       @machine.ensure_client_certificate
       Puppet.notice(_("Completed SSL initialization"))
-    when 'show'
-      show(certname)
     else
       raise Puppet::Error, _("Unknown action '%{action}'") % { action: action }
     end
   end
 
-  def show(certname)
-    password = @cert_provider.load_private_key_password
-    ssl_context = @ssl_provider.load_context(certname: certname, password: password)
-    puts ssl_context.client_cert.to_text
-  end
-
   def submit_request(ssl_context)
     key = @cert_provider.load_private_key(Puppet[:certname])
     unless key
@@ -260,7 +248,7 @@ END
     paths = {
       'private key' => Puppet[:hostprivkey],
       'public key'  => Puppet[:hostpubkey],
-      'certificate request' => File.join(Puppet[:requestdir], "#{Puppet[:certname]}.pem"),
+      'certificate request' => Puppet[:hostcsr],
       'certificate' => Puppet[:hostcert],
       'private key password file' => Puppet[:passfile]
     }