puppet 5.3.2 → 5.3.3

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 5.3.0-6-gf66f9d9\n"
+"Project-Id-Version: Puppet automation framework 5.3.2-73-g035eee5\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2017-09-26 17:02+0000\n"
-"PO-Revision-Date: 2017-09-26 17:02+0000\n"
+"POT-Creation-Date: 2017-10-25 23:09+0000\n"
+"PO-Revision-Date: 2017-10-25 23:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -23,15 +23,15 @@ msgstr ""
 msgid "Puppet %{version} requires ruby 1.9.3 or greater."
 msgstr ""
 
-#: ../lib/puppet.rb:134
+#: ../lib/puppet.rb:133
 msgid "Support for ruby version %{version} is deprecated and will be removed in a future release. See https://docs.puppet.com/puppet/latest/system_requirements.html#ruby for a list of supported ruby versions."
 msgstr ""
 
-#: ../lib/puppet.rb:181
+#: ../lib/puppet.rb:180
 msgid "Creating %{name} via Puppet.newtype is deprecated and will be removed in a future release. Use Puppet::Type.newtype instead."
 msgstr ""
 
-#: ../lib/puppet.rb:200
+#: ../lib/puppet.rb:199
 msgid "The environmentpath setting cannot be empty or nil."
 msgstr ""
 
@@ -2065,43 +2065,47 @@ msgstr ""
 msgid "Unable to find a common checksum type between agent '%{agent_type}' and master '%{master_type}'."
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:273
-msgid "Compiled %s for "
+#: ../lib/puppet/indirector/catalog/compiler.rb:275
+msgid "Compiled static catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:273
-msgid "static catalog"
+#: ../lib/puppet/indirector/catalog/compiler.rb:277
+msgid "Compiled static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:273
-msgid "catalog"
+#: ../lib/puppet/indirector/catalog/compiler.rb:281
+msgid "Compiled catalog for %{node} in environment %{environment}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:275 ../lib/puppet/indirector/catalog/compiler.rb:292
-msgid " in environment %{env}"
+#: ../lib/puppet/indirector/catalog/compiler.rb:283
+msgid "Compiled catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:291
+#: ../lib/puppet/indirector/catalog/compiler.rb:302
+msgid "Inlined resource metadata into static catalog for %{node} in environment %{environment}"
+msgstr ""
+
+#: ../lib/puppet/indirector/catalog/compiler.rb:304
 msgid "Inlined resource metadata into static catalog for %{node}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:308
+#: ../lib/puppet/indirector/catalog/compiler.rb:321
 msgid "Found node information"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:316
+#: ../lib/puppet/indirector/catalog/compiler.rb:329
 msgid "Failed when searching for node %{name}: %{detail}"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:335
+#: ../lib/puppet/indirector/catalog/compiler.rb:348
 msgid "Invalid option use_node for a remote request"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:353
+#: ../lib/puppet/indirector/catalog/compiler.rb:366
 msgid "Could not find node '%{name}'; cannot compile"
 msgstr ""
 
-#: ../lib/puppet/indirector/catalog/compiler.rb:371
+#: ../lib/puppet/indirector/catalog/compiler.rb:384
 msgid "Could not retrieve fact %{fact}"
 msgstr ""
 
@@ -4977,7 +4981,7 @@ msgstr ""
 msgid "Enumeration.enumerator is deprecated. Use Iterable.on instead"
 msgstr ""
 
-#: ../lib/puppet/pops/types/p_binary_type.rb:70
+#: ../lib/puppet/pops/types/p_binary_type.rb:77
 msgid "The given string in encoding '%{enc}' is invalid. Cannot create a Binary UTF-8 representation"
 msgstr ""
 
@@ -4993,7 +4997,7 @@ msgstr ""
 msgid "The type '%{type}' does not represent a valid set of parameters for %{subject}.new()"
 msgstr ""
 
-#: ../lib/puppet/pops/types/p_object_type.rb:604
+#: ../lib/puppet/pops/types/p_object_type.rb:610
 msgid "reference to unresolved type '%{name}'"
 msgstr ""
 
@@ -7923,11 +7927,11 @@ msgstr ""
 msgid "Failed to set file attributes"
 msgstr ""
 
-#: ../lib/puppet/util/windows/file.rb:193
+#: ../lib/puppet/util/windows/file.rb:207
 msgid "out_buffer is required"
 msgstr ""
 
-#: ../lib/puppet/util/windows/file.rb:274
+#: ../lib/puppet/util/windows/file.rb:288
 msgid "Failed to call GetLongPathName"
 msgstr ""
 

data/spec/fixtures/unit/provider/service/base/ps_ef.mixed_encoding

@@ -0,0 +1,3 @@
+UID        PID  PPID  C STIME TTY          TIME CMD
+root      4113 26549  0 11:07 pts/0    00:00:00 latin-1 args m�ni interesting furry animals
+root      4056 26549  0 11:06 pts/0    00:00:00 utf-8 args including the majestik møøse

data/spec/integration/file_bucket/file_spec.rb

@@ -43,12 +43,27 @@ describe Puppet::FileBucket::File do
   end
 
   describe "saving binary files" do
-    let(:binary) { "\xD1\xF2\r\n\x81NuSc\x00".force_encoding(Encoding::ASCII_8BIT) }
+    context "given multiple backups of identical files" do
+      it "does not error given content with binary external encoding" do
+        binary = "\xD1\xF2\r\n\x81NuSc\x00".force_encoding(Encoding::ASCII_8BIT)
+        bucket_file = Puppet::FileBucket::File.new(binary)
+        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+      end
 
-    it "does not error when the same contents are saved twice" do
-      bucket_file = Puppet::FileBucket::File.new(binary)
-      Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
-      Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+      it "also does not error if the content is reported with UTF-8 external encoding" do
+        # PUP-7951 - ensure accurate size comparison across encodings If binary
+        # content arrives as a string with UTF-8 default external encoding, its
+        # character count might be different than the same bytes with binary
+        # external encoding. Ensure our equality comparison does not fail due to this.
+        # As would be the case with our friend snowman:
+        # Unicode snowman \u2603 - \xE2 \x98 \x83
+        # character size 1, if interpreted as UTF-8, 3 "characters" if interpreted as binary
+        utf8 = "\u2603".force_encoding(Encoding::UTF_8)
+        bucket_file = Puppet::FileBucket::File.new(utf8)
+        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+      end
     end
   end
 end

data/spec/integration/transaction_spec.rb

@@ -1,10 +1,12 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
+require 'puppet_spec/compiler'
 
 require 'puppet/transaction'
 
 describe Puppet::Transaction do
   include PuppetSpec::Files
+  include PuppetSpec::Compiler
 
   before do
     Puppet::Util::Storage.stubs(:store)
@@ -17,11 +19,11 @@ describe Puppet::Transaction do
   end
 
   def touch_path
-    Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32" : "/usr/bin:/bin"
+    Puppet.features.microsoft_windows? ? "#{ENV['windir']}\\system32" : "/usr/bin:/bin"
   end
 
   def usr_bin_touch(path)
-    Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32/cmd.exe /c \"type NUL >> \"#{path}\"\"" : "/usr/bin/touch #{path}"
+    Puppet.features.microsoft_windows? ? "#{ENV['windir']}\\system32\\cmd.exe /c \"type NUL >> \"#{path}\"\"" : "/usr/bin/touch #{path}"
   end
 
   def touch(path)
@@ -338,6 +340,37 @@ describe Puppet::Transaction do
         expect(Puppet::FileSystem.exist?(file2)).to be_truthy
       end
     end
+
+    it "should propagate events correctly from a tagged container when running with tags" do
+      file1 = tmpfile("original_tag")
+      file2 = tmpfile("tag_propagation")
+      command1 = usr_bin_touch(file1)
+      command2 = usr_bin_touch(file2)
+      manifest = <<-"MANIFEST"
+        class foo {
+          exec { 'notify test':
+            command     => '#{command1}',
+            refreshonly => true,
+          }
+        }
+
+        class test {
+          include foo
+
+          exec { 'test':
+            command => '#{command2}',
+            notify  => Class['foo'],
+          }
+        }
+
+        include test
+      MANIFEST
+
+      Puppet[:tags] = 'test'
+      apply_compiled_manifest(manifest)
+      expect(Puppet::FileSystem.exist?(file1)).to be_truthy
+      expect(Puppet::FileSystem.exist?(file2)).to be_truthy
+    end
   end
 
   describe "skipping resources" do

data/spec/unit/forge/forge_spec.rb

@@ -62,7 +62,7 @@ describe Puppet::Forge do
 
         # ignores Puppet::Forge::Repository#read_response, provides response to fetch
         performs_an_http_request(ok_response) do |http|
-          encoded_uri = "/v3/releases?module=#{module_name}&module_groups=base%20pe"
+          encoded_uri = "/v3/releases?module=#{module_name}&sort_by=version&module_groups=base%20pe"
           http.expects(:request).with(responds_with(:path, encoded_uri))
         end
 
@@ -74,7 +74,7 @@ describe Puppet::Forge do
 
         # ignores Puppet::Forge::Repository#read_response, provides response to fetch
         performs_an_http_request(ok_response) do |http|
-          encoded_uri = "/v3/releases?module=puppetlabs-#{mixed_utf8_query_param_encoded}"
+          encoded_uri = "/v3/releases?module=puppetlabs-#{mixed_utf8_query_param_encoded}&sort_by=version"
           http.expects(:request).with(responds_with(:path, encoded_uri))
         end
 

data/spec/unit/forge_spec.rb

@@ -131,6 +131,111 @@ describe Puppet::Forge do
     end
   end
 
+  # See PUP-8008
+  context "when multiple module_groups are defined" do
+    let(:release_response) do
+      releases = JSON.parse(http_response)
+      releases['results'] = []
+      JSON.dump(releases)
+    end
+
+    context "with space seperator" do
+      before :each do
+        repository_responds_with(stub(:body => release_response, :code => '200')).with {|uri| uri =~ /module_groups=foo bar/}
+        Puppet[:module_groups] = "foo bar"
+      end
+
+      it "passes module_groups with search" do
+        forge.search('bacula')
+      end
+
+      it "passes module_groups with fetch" do
+        forge.fetch('puppetlabs-bacula')
+      end
+    end
+
+    context "with plus seperator" do
+      before :each do
+        repository_responds_with(stub(:body => release_response, :code => '200')).with {|uri| uri =~ /module_groups=foo bar/}
+        Puppet[:module_groups] = "foo+bar"
+      end
+
+      it "passes module_groups with search" do
+        forge.search('bacula')
+      end
+
+      it "passes module_groups with fetch" do
+        forge.fetch('puppetlabs-bacula')
+      end
+    end
+
+    # See PUP-8008
+    context "when there are multiple pages of results" do
+      before(:each) do
+        Puppet::Forge::Repository.any_instance.expects(:make_http_request).with {|uri| uri =~ /module_groups=foo bar/ && uri !=~ /offset/ }.returns(stub(:body => first_page, :code => '200'))
+
+        # Request for second page should not have module_groups already encoded
+        Puppet::Forge::Repository.any_instance.expects(:make_http_request).with {|uri| uri =~ /module_groups=foo bar/ && uri =~ /offset=1/ }.returns(stub(:body => last_page, :code => '200'))
+      end
+
+      context "with space seperator" do
+        before(:each) do
+          Puppet[:module_groups] = "foo bar"
+        end
+
+        let(:first_page) do
+          resp = JSON.parse(http_response)
+          resp['results'] = []
+          resp['pagination']['next'] = "/v3/modules?limit=1&offset=1&module_groups=foo%20bar"
+          JSON.dump(resp)
+        end
+
+        let(:last_page) do
+          resp = JSON.parse(http_response)
+          resp['results'] = []
+          resp['pagination']['current'] = "/v3/modules?limit=1&offset=1&module_groups=foo%20bar"
+          JSON.dump(resp)
+        end
+
+        it "traverses pages during search" do
+          forge.search('bacula')
+        end
+
+        it "traverses pages during fetch" do
+          forge.fetch('puppetlabs-bacula')
+        end
+      end
+
+      context "with plus seperator" do
+        before(:each) do
+          Puppet[:module_groups] = "foo+bar"
+        end
+
+        let(:first_page) do
+          resp = JSON.parse(http_response)
+          resp['results'] = []
+          resp['pagination']['next'] = "/v3/modules?limit=1&offset=1&module_groups=foo+bar"
+          JSON.dump(resp)
+        end
+
+        let(:last_page) do
+          resp = JSON.parse(http_response)
+          resp['results'] = []
+          resp['pagination']['current'] = "/v3/modules?limit=1&offset=1&module_groups=foo+bar"
+          JSON.dump(resp)
+        end
+
+        it "traverses pages during search" do
+          forge.search('bacula')
+        end
+
+        it "traverses pages during fetch" do
+          forge.fetch('puppetlabs-bacula')
+        end
+      end
+    end
+  end
+
   context "when the connection to the forge fails" do
     before :each do
       repository_responds_with(stub(:body => '{}', :code => '404', :message => "not found"))

data/spec/unit/gettext_config_spec.rb

@@ -35,22 +35,22 @@ describe Puppet::GettextConfig do
     end
   end
 
-  describe 'initialization' do
+  describe 'loading translations' do
     context 'when given a nil config path' do
       it 'should return false' do
-        expect(Puppet::GettextConfig.initialize(nil, :po)).to be false
+        expect(Puppet::GettextConfig.load_translations('puppet', nil, :po)).to be false
       end
     end
 
     context 'when given a valid config file location' do
       it 'should return true' do
-        expect(Puppet::GettextConfig.initialize(local_path, :po)).to be true
+        expect(Puppet::GettextConfig.load_translations('puppet', local_path, :po)).to be true
       end
     end
 
     context 'when given a bad file format' do
       it 'should raise an exception' do
-        expect { Puppet::GettextConfig.initialize(local_path, :bad_format) }.to raise_error(Puppet::Error)
+        expect { Puppet::GettextConfig.load_translations('puppet', local_path, :bad_format) }.to raise_error(Puppet::Error)
       end
     end
   end

data/spec/unit/graph/relationship_graph_spec.rb

@@ -295,6 +295,21 @@ describe Puppet::Graph::RelationshipGraph do
           completed_sentinel_of("class[A]"))
     end
 
+    it "admissible and completed sentinels should inherit the same tags" do
+      relationship_graph = compile_to_relationship_graph(<<-MANIFEST)
+        class a {
+	  tag "test_tag"
+        }
+
+        include a
+      MANIFEST
+
+      expect(vertex_called(relationship_graph, admissible_sentinel_of("class[A]")).tagged?("test_tag")).
+      to eq(true)
+      expect(vertex_called(relationship_graph, completed_sentinel_of("class[A]")).tagged?("test_tag")).
+      to eq(true)
+    end
+
     it "should remove all Component objects from the dependency graph" do
       relationship_graph = compile_to_relationship_graph(<<-MANIFEST)
         class a {

data/spec/unit/module_spec.rb

@@ -225,10 +225,10 @@ describe Puppet::Module do
         mod_dir = "#{@modpath}/#{mod_name}"
         metadata_file = "#{mod_dir}/metadata.json"
         tasks_dir = "#{mod_dir}/tasks"
-        locale_config = "#{mod_dir}/locales/config.yaml"
+        locale_dir = "#{mod_dir}/locales"
         Puppet::FileSystem.stubs(:exist?).with(metadata_file).returns true
         # Skip checking for translation config file
-        Puppet::FileSystem.stubs(:exist?).with(locale_config).returns false
+        Puppet::FileSystem.stubs(:exist?).with(locale_dir).returns false
       end
       mod = PuppetSpec::Modules.create(
         'test_gte_req',
@@ -449,28 +449,22 @@ describe Puppet::Module do
   describe "initialize_i18n" do
 
     let(:modpath) { tmpdir('modpath') }
-    let(:modname) { 'puppetlabs-i18n'}
+    let(:modname) { 'i18n' }
     let(:modroot) { "#{modpath}/#{modname}/" }
     let(:locale_dir) { "#{modroot}locales" }
-    let(:config_path) { "#{locale_dir}/config.yaml" }
     let(:mod_obj) { PuppetSpec::Modules.create( modname, modpath, :metadata => { :dependencies => [] }, :env => env ) }
 
     it "is expected to initialize an un-initialized module" do
-      expect(GettextSetup.translation_repositories.has_key? modname).to be false
+      expect(Puppet::GettextConfig.translations_loaded?("puppetlabs-#{modname}")).to be false
 
       FileUtils.mkdir_p(locale_dir)
-      config = {
-        "gettext" => {
-          "project_name" => modname
-        }
-      }
-      File.open(config_path, 'w') { |file| file.write(config.to_yaml) }
-      Puppet::FileSystem.stubs(:exist?).with(config_path).returns(true)
+      Puppet::FileSystem.stubs(:exist?).with(locale_dir).returns(true)
 
       mod_obj.initialize_i18n
 
-      expect(GettextSetup.translation_repositories.has_key? modname).to be true
+      expect(Puppet::GettextConfig.translations_loaded?("puppetlabs-#{modname}")).to be true
     end
+
     it "is expected return nil if module is intiailized" do
       expect(mod_obj.initialize_i18n).to be nil
     end
@@ -618,6 +612,7 @@ describe Puppet::Module do
 
       it "after the module is initialized" do
         Puppet::FileSystem.expects(:exist?).with(mod_tasks_dir).never
+        Puppet::GettextConfig.expects(:load_translations).returns(false)
         Puppet::Module::Task.expects(:tasks_in_module).never
         Puppet::Module.new(mod_name, @modpath, env)
       end