Jira (PUP-11440) No option to fail fast when agent-specified environment does not exist

[Josh Cooper (Jira)]

Title: Message Title

Josh Cooper commented on PUP-11440   Re: No option to fail fast when agent-specified environment does not exist In the non-strict mode case, we do want the agent run to continue and have the server redirect the agent to a valid environment. Otherwise, if you've configured all 50k agents to use a specific environment and you delete the environment from the server, then all agents will be stuck and you can't use puppet to fix itself. In the strict mode case, if we detect that the environment doesn't exist on the server prior to pluginsync, then we should abort the run, since we know there's no point in continuing. This seems to work as expected: diff --git a/lib/puppet/configurer.rb b/lib/puppet/configurer.rb index d97c73bc46..457b9eed8e 100644 --- a/lib/puppet/configurer.rb +++ b/lib/puppet/configurer.rb @@ -327,12 +327,16 @@ class Puppet::Configurer push_current_environment_and_loaders end + # store original value so it can be restored later temp_value = options[:pluginsync] # only validate server environment if pluginsync is requested - options[:pluginsync] = valid_server_environment? if options[:pluginsync] == true + options[:pluginsync] = valid_server_environment? if options[:pluginsync] + # get_facts relies on the pluginsync option query_options, facts = get_facts(options) unless query_options + + # restore value as get_facts may be called again during convergence options[:pluginsync] = temp_value query_options[:configured_environment] = configured_environment @@ -443,7 +447,11 @@ class Puppet::Configurer true rescue Puppet::HTTP::ResponseError => detail if detail.response.code == 404 - Puppet.notice(_("Environment '%{environment}' not found on server, skipping initial pluginsync.") % { environment: @environment }) + if Puppet[:strict_environment_mode] + raise Puppet::Error.new(_("Environment '%{environment}' not found on server, aborting run.") % { environment: @environment }) + else + Puppet.notice(_("Environment '%{environment}' not found on server, skipping initial pluginsync.") % { environment: @environment }) + end else Puppet.log_exception(detail, detail.message) end Which results in: $ bundle exec puppet agent -t -E fake Info: Using environment 'fake' Notice: Environment 'fake' not found on server, skipping initial pluginsync. Notice: Local environment: 'fake' doesn't match server specified environment 'production', restarting agent run with environment 'production' Info: Retrieving pluginfacts Info: Retrieving plugin Info: Retrieving locales Info: Caching catalog for localhost Info: Applying configuration version '1644480167' Notice: Applied catalog in 0.01 seconds   $ bundle exec puppet agent -t -E fake --strict_environment_mode Info: Using environment 'fake' Error: Failed to apply catalog: Environment 'fake' not found on server, aborting run. Add Comment   This message was sent by Atlassian Jira (v8.20.2#820002-sha1:829506d) -- You received this message because you are subscribed to the Google Groups "Puppet Bugs" group. To unsubscribe from this group and stop receiving emails from it, send an email to puppet-bugs+unsubscr...@googlegroups.com. To view this discussion on the web visit https://groups.google.com/d/msgid/puppet-bugs/JIRA.433415.1643667502000.13138.1644480360036%40Atlassian.JIRA.