From 802cabd60f3d5809af995dfc88e928f06c701a12 Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius Date: Tue, 30 May 2023 17:13:17 +0100 Subject: [PATCH 1/3] (CONT-1028) - Update Stdlib upper limit dependency --- metadata.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata.json b/metadata.json index df2caa31..998f03a8 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 8.2.0 < 9.0.0" + "version_requirement": ">= 8.2.0 < 10.0.0" }, { "name": "puppetlabs/apt", From 7ad737a5b3ae1a5e4f1f80c2b69cf288be590877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= Date: Mon, 5 Jun 2023 06:37:50 -1000 Subject: [PATCH 2/3] (CONT-1028) Remove usage of legacy validate_re() This deprecated function was removed from Puppet. The Puppet 4 type system can be used to ensure the validity of parameters with better error reporting. --- lib/puppet/parser/functions/docker_run_flags.rb | 2 +- manifests/compose.pp | 4 ++-- manifests/machine.pp | 4 ++-- manifests/repos.pp | 2 +- metadata.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/puppet/parser/functions/docker_run_flags.rb b/lib/puppet/parser/functions/docker_run_flags.rb index 0bab3976..f71ac695 100644 --- a/lib/puppet/parser/functions/docker_run_flags.rb +++ b/lib/puppet/parser/functions/docker_run_flags.rb @@ -8,7 +8,7 @@ module Puppet::Parser::Functions subject = args[0] escape_function = if self['facts'] && self['facts']['os']['family'] == 'windows' - 'powershell_escape' + 'stdlib::powershell_escape' else 'shell_escape' end diff --git a/manifests/compose.pp b/manifests/compose.pp index e92425f5..302b4539 100644 --- a/manifests/compose.pp +++ b/manifests/compose.pp @@ -37,7 +37,7 @@ Optional[String] $version = $docker::params::compose_version, Optional[String] $install_path = $docker::params::compose_install_path, Optional[String] $symlink_name = $docker::params::compose_symlink_name, - Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']] $proxy = undef, + Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']] $proxy = undef, Optional[String] $base_url = $docker::params::compose_base_url, Optional[String] $raw_url = undef, Optional[Boolean] $curl_ensure = $docker::params::curl_ensure, @@ -82,7 +82,7 @@ } } else { if $curl_ensure { - ensure_packages(['curl']) + stdlib::ensure_packages(['curl']) } exec { "Install Docker Compose ${version}": diff --git a/manifests/machine.pp b/manifests/machine.pp index 65d728a7..0f3f50c2 100644 --- a/manifests/machine.pp +++ b/manifests/machine.pp @@ -24,7 +24,7 @@ Enum[present,absent] $ensure = 'present', Optional[String] $version = $docker::params::machine_version, Optional[String] $install_path = $docker::params::machine_install_path, - Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']] $proxy = undef, + Optional[Pattern['^((http[s]?)?:\/\/)?([^:^@]+:[^:^@]+@|)([\da-z\.-]+)\.([\da-z\.]{2,6})(:[\d])?([\/\w \.-]*)*\/?$']] $proxy = undef, Optional[Variant[Stdlib::HTTPUrl, Stdlib::HTTPSUrl]] $url = undef, Optional[Boolean] $curl_ensure = $docker::params::curl_ensure, ) inherits docker::params { @@ -67,7 +67,7 @@ } } else { if $curl_ensure { - ensure_packages(['curl']) + stdlib::ensure_packages(['curl']) } exec { "Install Docker Machine ${version}": diff --git a/manifests/repos.pp b/manifests/repos.pp index 2e27614a..b6c6a7a3 100644 --- a/manifests/repos.pp +++ b/manifests/repos.pp @@ -14,7 +14,7 @@ Optional[Boolean] $key_check_source = $docker::package_key_check_source, String $architecture = $facts['os']['architecture'], ) { - ensure_packages($docker::prerequired_packages) + stdlib::ensure_packages($docker::prerequired_packages) case $facts['os']['family'] { 'Debian': { diff --git a/metadata.json b/metadata.json index 998f03a8..55e81998 100644 --- a/metadata.json +++ b/metadata.json @@ -10,7 +10,7 @@ "dependencies": [ { "name": "puppetlabs/stdlib", - "version_requirement": ">= 8.2.0 < 10.0.0" + "version_requirement": ">= 9.0.0 < 10.0.0" }, { "name": "puppetlabs/apt", From bfc342291783bd817afd6b4349a0d2399ec72b9a Mon Sep 17 00:00:00 2001 From: Lukas Audzevicius <97180854+LukasAud@users.noreply.github.com> Date: Tue, 13 Jun 2023 13:34:23 +0100 Subject: [PATCH 3/3] Update missing namespaced function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Romain Tartière --- lib/puppet/parser/functions/docker_run_flags.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/puppet/parser/functions/docker_run_flags.rb b/lib/puppet/parser/functions/docker_run_flags.rb index f71ac695..f075efd1 100644 --- a/lib/puppet/parser/functions/docker_run_flags.rb +++ b/lib/puppet/parser/functions/docker_run_flags.rb @@ -10,7 +10,7 @@ module Puppet::Parser::Functions escape_function = if self['facts'] && self['facts']['os']['family'] == 'windows' 'stdlib::powershell_escape' else - 'shell_escape' + 'stdlib::shell_escape' end call_function(escape_function, subject)