Merge pull request #13 from sensei-de-loafage/aph/PUP-9307-mount-trailing-slashes

aph/pup-9307-mount-trailing-slashes

Author: ScottGarman

lib/puppet/provider/mount/parsed.rb

@@ -205,6 +205,9 @@ def pre_gen(record)
   # Every entry in fstab is :unmounted until we can prove different
   def self.prefetch_hook(target_records)
     target_records.map do |record|
+      # Eat the trailing slash(es) of mountpoints in fstab
+      # This mimics the behavior of munging the resource title
+      record[:name].gsub!(%r{^(.+?)/*$}, '\1') unless record[:name].nil?
       record[:ensure] = :unmounted if record[:record_type] == :parsed
       record
     end

spec/acceptance/tests/query_spec.rb

@@ -16,6 +16,21 @@
           fail_test "didn't find the mount #{name}" unless result.stdout =~ %r{'/#{name}':\s+ensure\s+=>\s+'unmounted'}
         end
       end
+
+      # There is a discrepancy between how `puppet resource` and `puppet apply` handle this case.
+      # With this patch, using a resource title with a trailing slash in `puppet apply` will match a mount resource without a trailing slash.
+      # However, `puppet resource mount` with a trailing slash will not match.
+      # Therefore, this test cheats by performing the munging that occurs during a manifest application
+      it 'finds an existing filesystem table entry with trailing slash' do
+        munged_name = name_w_slash.gsub(%r{^(.+?)/*$}, '\1')
+        step '(setup) add entry to filesystem table'
+        MountUtils.add_entry_to_filesystem_table(agent, name_w_slash)
+
+        step 'verify mount with puppet'
+        on(agent, puppet_resource('mount', "/#{munged_name}")) do |result|
+          fail_test "didn't find the mount #{name_w_slash}" unless result.stdout =~ %r{'/#{munged_name}':\s+ensure\s+=>\s+'unmounted'}
+        end
+      end
     end
   end
 end

spec/fixtures/unit/provider/mount/parsed/freebsd.fstab

@@ -6,3 +6,4 @@
 /dev/ad0s1d             /var            ufs     rw              2       2
 /dev/ad0s1g             /boot           ufs     rw              2       2
 /dev/acd0               /cdrom          cd9660  ro,noauto       0       0
+tmpfs                   /run/           tmpfs   rw,nosuid,nodev,seclabel,mode=755        0 0

spec/fixtures/unit/provider/mount/parsed/freebsd.mount

@@ -1,3 +1,4 @@
 /dev/ad0s1a on / (ufs, local, soft-updates)
 /dev/ad0s1d on /ghost (ufs, local, soft-updates)
 devfs on /dev (devfs, local, multilabel)
+tmpfs on /run (tmpfs, rw, nosuid, nodev, seclabel, mode=755)

spec/fixtures/unit/provider/mount/parsed/linux.fstab

@@ -9,3 +9,4 @@ proc                    /proc                   proc    defaults        0 0
 /dev/vg00/lv01          /spare                  ext3    defaults        1 2
 sysfs                   /sys                    sysfs   defaults        0 0
 LABEL=SWAP-hda6         swap                    swap    defaults        0 0
+tmpfs                   /run/                   tmpfs   rw,nosuid,nodev,seclabel,mode=755        0 0

spec/fixtures/unit/provider/mount/parsed/linux.mount

@@ -3,3 +3,4 @@ rc-svcdir on /lib64/rc/init.d type tmpfs (rw,nosuid,nodev,noexec,relatime,size=1
 sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,relatime)
 /dev/sda9 on /usr/portage type jfs (rw)
 /dev/fake on /ghost type jfs (rw)
+tmpfs on /run tmpfs (rw,nosuid,nodev,seclabel,mode=755)

spec/fixtures/unit/provider/mount/parsed/netbsd.fstab

@@ -7,3 +7,4 @@
 /dev/ad3s1b             none            swap    sw              0       0
 /dev/ad3s1e             /data           ufs     rw              2       2
 /dev/ad3s1g             /boot           ufs     rw              2       2
+tmpfs                   /run/           tmpfs   rw,nosuid,nodev,seclabel,mode=755        0 0

spec/fixtures/unit/provider/mount/parsed/netbsd.mount

@@ -6,3 +6,4 @@ devfs on /dev (devfs, local)
 /dev/ad3s1e on /data (ufs, local, soft-updates)
 /dev/ad3s1h on /ghost (ufs, local, soft-updates)
 devfs on /var/named/dev (devfs, local)
+tmpfs on /run (tmpfs, rw, nosuid, nodev, seclabel, mode=755)

spec/fixtures/unit/provider/mount/parsed/openbsd.fstab

@@ -2,3 +2,4 @@
 /dev/wd0e /home ffs rw,nodev,nosuid 1 2
 /dev/wd0d /usr ffs rw,nodev 1 2
 /dev/wd0f /boot ffs rw,nodev 1 2
+tmpfs /run/ tmpfs rw,nosuid,nodev,seclabel,mode=755  0 0

spec/fixtures/unit/provider/mount/parsed/openbsd.mount

@@ -2,3 +2,4 @@
 /dev/wd0e on /home type ffs (local, nodev, nosuid)
 /dev/wd0d on /usr type ffs (local, nodev)
 /dev/wd0g on /ghost type ffs (local, nodev)
+tmpfs on /run (tmpfs, rw, nosuid, nodev, seclabel, mode=755)