Merge pull request #634 from AriaXLi/MODULES-11348/replace_lsbdistcodename

(MODULES-11348) Replace lsbdistcodename with os.distro.codename

Author: AriaXLi

manifests/install.pp

@@ -70,7 +70,7 @@
         if $package_version =~ /^latest$|^present$/ {
           $_package_version = $package_version
         } else {
-          $_package_version = "${package_version}-1${::lsbdistcodename}"
+          $_package_version = "${package_version}-1${facts['os']['distro']['codename']}"
         }
         $_provider = 'apt'
         $_source = undef

spec/classes/puppet_agent_osfamily_debian_spec.rb

@@ -7,6 +7,10 @@
     lsbdistcodename: 'stretch',
     os: {
       'name'    => 'Debian',
+      'distro'  => {
+        'codename' => 'stretch',
+        'id'       => 'Debian',
+      },
       'release' => {
         'full'  => '9.0',
         'major' => '9',
@@ -102,6 +106,9 @@
                       lsbdistcodename: 'focal',
                       os: {
                         'name'    => 'Ubuntu',
+                        'distro'  => {
+                          'codename' => 'focal',
+                        },
                         'release' => {
                           'full'  => '20.04',
                         },

spec/classes/puppet_agent_spec.rb

@@ -340,7 +340,7 @@ def global_facts(facts, os)
             it { is_expected.to contain_class('puppet_agent::install').that_requires('Class[puppet_agent::prepare]') }
 
             if facts[:osfamily] == 'Debian'
-              deb_package_version = package_version + '-1' + facts[:lsbdistcodename]
+              deb_package_version = package_version + '-1' + facts.dig(:os, 'distro', 'codename')
               it { is_expected.to contain_package('puppet-agent').with_ensure(deb_package_version) }
             elsif facts[:osfamily] == 'Solaris'
               if facts[:operatingsystemmajrelease] == '11'