Merge pull request #1058 from puppetlabs/issue-1057

diff --combined manifests/ppa.pp
index f6cba8d38abff2d597797b7ac98f9627f9d5def0,7ea5c4ca1a08a6dca7d642a7c8c970193bbf99ad..ed7057c8539f0be47011e78197241a87cddefa48
--- 1/manifests/ppa.pp
--- 2/manifests/ppa.pp
+++ b/manifests/ppa.pp
@@@ -40,7 -40,7 +40,7 @@@ define apt::ppa 
    }
  
    # Validate the resource name
-   if $name !~ /^ppa:([a-zA-Z0-9\-_]+)\/([a-zA-z0-9\-_]+)$/ {
+   if $name !~ /^ppa:([a-zA-Z0-9\-_]+)\/([a-zA-z0-9\-_\.]+)$/ {
      fail("Invalid PPA name: ${name}")
    }
  
@@@ -67,9 -67,8 +67,9 @@@
      $trusted_gpg_d_filename = "${dash_filename_no_specialchars}.gpg"
    }
  
 -  # This is the location of our main exec script  
 -  $script_path = "/opt/puppetlabs/puppet/cache/add-apt-repository-${dash_filename_no_specialchars}-${release}.sh"
 +  # This is the location of our main exec script.
 +  $cache_path = $facts['puppet_vardir']
 +  $script_path = "${cache_path}/add-apt-repository-${dash_filename_no_specialchars}-${release}.sh"
  
    if $ensure == 'present' {
      if $package_manage {

diff --combined spec/defines/ppa_spec.rb
index 74265cde99bbc5376ec31962f70d42cf862e3bb5,8d0c4f926342a9a320f3ebca2429e966021f48b1..b8e734d09ff294b918a5a8f25a45c8551671cca1
--- 1/spec/defines/ppa_spec.rb
--- 2/spec/defines/ppa_spec.rb
+++ b/spec/defines/ppa_spec.rb
@@@ -30,7 -30,6 +30,7 @@@ describe 'apt::ppa' d
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache'
        }
      end
  
@@@ -44,6 -43,69 +44,69 @@@
      }
    end
  
+   [
+     'ppa:foo/bar',
+     'ppa:foo/bar1.0',
+     'ppa:foo10/bar10',
+     'ppa:foo-/bar_',
+   ].each do |value|
+     describe 'valid resource names' do
+       let :facts do
+         {
+           os: {
+             family: 'Debian',
+             name: 'Ubuntu',
+             release: {
+               major: '18',
+               full: '18.04',
+             },
+             distro: {
+               codename: 'trusty',
+               id: 'Ubuntu',
+             },
+           },
+         }
+       end
+ 
+       let(:title) { value }
+ 
+       it { is_expected.not_to raise_error }
+       it { is_expected.to contain_exec("add-apt-repository-#{value}") }
+     end
+   end
+ 
+   [
+     'ppa:foo!/bar',
+     'ppa:foo/bar!',
+     'ppa:foo1.0/bar',
+     'ppa:foo/bar/foobar',
+     '|| ls -la ||',
+     '|| touch /tmp/foo.txt ||',
+   ].each do |value|
+     describe 'invalid resource names' do
+       let :facts do
+         {
+           os: {
+             family: 'Debian',
+             name: 'Ubuntu',
+             release: {
+               major: '18',
+               full: '18.04',
+             },
+             distro: {
+               codename: 'trusty',
+               id: 'Ubuntu',
+             },
+           },
+         }
+       end
+ 
+       let(:title) { value }
+ 
+       it { is_expected.to raise_error(Puppet::PreformattedError, %r{Invalid PPA name: #{value}}) }
+     end
+   end
+ 
    describe 'Ubuntu 15.10 sources.list filename' do
      let :facts do
        {
@@@ -59,7 -121,6 +122,7 @@@
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache',
        }
      end
  
@@@ -98,7 -159,6 +161,7 @@@
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache',
        }
      end
  
@@@ -131,7 -191,6 +194,7 @@@
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache',
        }
      end
  
@@@ -172,7 -231,6 +235,7 @@@
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache',
        }
      end
  
@@@ -215,7 -273,6 +278,7 @@@
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache',
        }
      end
  
@@@ -256,7 -313,6 +319,7 @@@
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache',
        }
      end
  
@@@ -297,7 -353,6 +360,7 @@@
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache',
        }
      end
  
@@@ -336,7 -391,6 +399,7 @@@
              id: 'Ubuntu',
            },
          },
 +        puppet_vardir: '/opt/puppetlabs/puppet/cache',
        }
      end