From f6b9da4c48ffb61fd3962c64de378b5a093c9f13 Mon Sep 17 00:00:00 2001 From: Moritz Kraus Date: Mon, 10 Feb 2025 15:46:01 +0100 Subject: [PATCH] fix: allow plus signs in ppa From Launchpad: > At least one lowercase letter or number, followed by letters, numbers, > dots, hyphens or pluses. Keep this name short; it is used in URLs. --- manifests/ppa.pp | 2 +- spec/defines/ppa_spec.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/ppa.pp b/manifests/ppa.pp index b1a055ecae..0dd7b15fa1 100644 --- a/manifests/ppa.pp +++ b/manifests/ppa.pp @@ -40,7 +40,7 @@ } # 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}") } diff --git a/spec/defines/ppa_spec.rb b/spec/defines/ppa_spec.rb index 05718ebc34..72330e0e01 100644 --- a/spec/defines/ppa_spec.rb +++ b/spec/defines/ppa_spec.rb @@ -50,6 +50,8 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = []) 'ppa:foo/bar1.0', 'ppa:foo10/bar10', 'ppa:foo-/bar_', + 'ppa:foo/bar+', + 'ppa:foo+/bar', ].each do |value| describe 'valid resource names' do let :facts do