From b7d3ccfb37fabe497b5e2bb2f1fea47995cf1a96 Mon Sep 17 00:00:00 2001
From: Alexander Fisher <alex@linfratech.co.uk>
Date: Sun, 23 Dec 2018 13:32:58 +0000
Subject: [PATCH] (MODULES-8404) - Relax `Stdlib::Filesource` type

The previous regex only supported the special `modules` `puppet:///`
mount point.  Custom mount points should also be accepted.

https://puppet.com/docs/puppet/5.5/file_serving.html#whats-a-mount-point-in-a-puppet-uri
---
 spec/type_aliases/filesource_spec.rb | 29 +++++++++++++++++++++++-----
 types/filesource.pp                  |  2 +-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/spec/type_aliases/filesource_spec.rb b/spec/type_aliases/filesource_spec.rb
index 767852cc1..1eea8e782 100644
--- a/spec/type_aliases/filesource_spec.rb
+++ b/spec/type_aliases/filesource_spec.rb
@@ -3,9 +3,30 @@
 if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
   describe 'Stdlib::Filesource' do
     describe 'valid handling' do
-      ['https://hello.com', 'https://notcreative.org', 'https://canstillaccepthttps.co.uk', 'http://anhttp.com', 'http://runningoutofideas.gov', 'file:///hello/bla', 'file:///foo/bar.log',
-       'puppet:///modules/foo/bar.log', 'puppet://pm.example.com/modules/foo/bar.log', 'puppet://192.0.2.1/modules/foo/bar.log', '/usr2/username/bin:/usr/local/bin:/usr/bin:.', 'C:/', 'C:\\',
-       'C:\\WINDOWS\\System32', 'C:/windows/system32', 'X:/foo/bar', 'X:\\foo\\bar', '\\\\host\\windows', '//host/windows', '/var/tmp', '/var/opt/../lib/puppet'].each do |value|
+      [
+        'https://hello.com',
+        'https://notcreative.org',
+        'https://canstillaccepthttps.co.uk',
+        'http://anhttp.com',
+        'http://runningoutofideas.gov',
+        'file:///hello/bla',
+        'file:///foo/bar.log',
+        'puppet:///modules/foo/bar.log',
+        'puppet://pm.example.com/modules/foo/bar.log',
+        'puppet://192.0.2.1/modules/foo/bar.log',
+        '/usr2/username/bin:/usr/local/bin:/usr/bin:.',
+        'C:/',
+        'C:\\',
+        'C:\\WINDOWS\\System32',
+        'C:/windows/system32',
+        'X:/foo/bar',
+        'X:\\foo\\bar',
+        '\\\\host\\windows',
+        '//host/windows',
+        '/var/tmp',
+        '/var/opt/../lib/puppet',
+        'puppet:///a_custom_mount_point/foo/bar/foobar.conf',
+      ].each do |value|
         describe value.inspect do
           it { is_expected.to allow_value(value) }
         end
@@ -25,8 +46,6 @@
           '\\Users/hc/wksp/stdlib',
           'C:noslashes',
           '\\var\\tmp',
-          'puppet:///foo/bar.log',
-          'puppet:///pm.example.com/modules/foo/bar.log',
           'puppet://bob@pm.example.com/modules/foo/bar.log',
         ].each do |value|
           describe value.inspect do
diff --git a/types/filesource.pp b/types/filesource.pp
index d480ed0c6..408dcb96f 100644
--- a/types/filesource.pp
+++ b/types/filesource.pp
@@ -4,6 +4,6 @@
   Stdlib::HTTPUrl,
   Pattern[
     /^file:\/\/\/([^\/\0]+(\/)?)+$/,
-    /^puppet:\/\/(([\w-]+\.?)+)?\/modules\/([^\/\0]+(\/)?)+$/,
+    /^puppet:\/\/(([\w-]+\.?)+)?\/([^\/\0]+(\/)?)+$/,
   ],
 ]