(CONT-493) PPA validation adjustment

LukasAud · LukasAud · commit a14262bee036 · 2023-01-18T10:26:45.000Z
Prior to this commit, one of our updates (#1052) implemented a regex validation for ppa packages that were to be installed. However, this validation did not account for resource names that were dotted. This commit aims to fix this bug in our validation process so that it works as intended.
diff --git 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
@@ -78,7 +78,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])
   [
     'ppa:foo!/bar',
     'ppa:foo/bar!',
-    'ppa:foo1.0/bar',
+    'ppa:foo1,0/bar',
     'ppa:foo/bar/foobar',
     '|| ls -la ||',
     '|| touch /tmp/foo.txt ||',

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`# Validate the resource name`
`43`		`- if $name !~ /^ppa:([a-zA-Z0-9\-_]+)\/([a-zA-z0-9\-_\.]+)$/ {`
	`43`	`+ if $name !~ /^ppa:([a-zA-Z0-9\-_.]+)\/([a-zA-z0-9\-_\.]+)$/ {`
`44`	`44`	`fail("Invalid PPA name: ${name}")`
`45`	`45`	`}`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ def ppa_exec_params(user, repo, distro = 'trusty', environment = [])`
`78`	`78`	`[`
`79`	`79`	`'ppa:foo!/bar',`
`80`	`80`	`'ppa:foo/bar!',`
`81`		`- 'ppa:foo1.0/bar',`
	`81`	`+ 'ppa:foo1,0/bar',`
`82`	`82`	`'ppa:foo/bar/foobar',`
`83`	`83`	`'\|\| ls -la \|\|',`
`84`	`84`	`'\|\| touch /tmp/foo.txt \|\|',`