Merge pull request #384 from gcoxmoz/package-version

Author: smortex

manifests/client.pp

@@ -4,6 +4,7 @@
   Stdlib::Absolutepath                          $file,
 
   # Options
+  String[1]                                     $package_version               = installed,
   Optional[String[1]]                           $base                          = undef,
   Optional[String[1]]                           $bind_policy                   = undef,
   Optional[String[1]]                           $bind_timelimit                = undef,

manifests/client/install.pp

@@ -5,6 +5,6 @@
   }
 
   package { $openldap::client::package:
-    ensure => present,
+    ensure => $openldap::client::package_version,
   }
 }

manifests/server.pp

@@ -12,7 +12,8 @@
   Boolean $escape_ldapi_ifs,
   Array[String[1]] $ldapi_ifs,
   Stdlib::Absolutepath $default_directory,
-  Boolean $manage_epel = true,
+  Boolean $manage_epel                              = true,
+  String[1] $package_version                        = installed,
   Optional[Boolean] $enable_chown                   = undef,
   Optional[Boolean] $service_hasstatus              = undef,
   Boolean $enable                                   = true,

manifests/server/install.pp

@@ -43,7 +43,7 @@
   }
 
   package { $openldap::server::package:
-    ensure       => present,
+    ensure       => $openldap::server::package_version,
     responsefile => $responsefile,
   }
 }

manifests/utils.pp

@@ -1,10 +1,11 @@
 # See README.md for details.
 class openldap::utils (
-  Optional[String[1]] $package = undef,
+  Optional[String[1]] $package         = undef,
+  String[1]           $package_version = installed,
 ) {
   if $package {
     package { $package:
-      ensure => present,
+      ensure => $package_version,
     }
   }
 }

spec/classes/openldap_client_install_spec.rb

@@ -22,16 +22,16 @@
           case facts[:os]['release']['major']
           when '22.04'
             it {
-              is_expected.to contain_package('libldap-2.5-0').with(ensure: :present)
+              is_expected.to contain_package('libldap-2.5-0').with(ensure: :installed)
             }
           else
             it {
-              is_expected.to contain_package('libldap-2.4-2').with(ensure: :present)
+              is_expected.to contain_package('libldap-2.4-2').with(ensure: :installed)
             }
           end
         when 'RedHat'
           it {
-            is_expected.to contain_package('openldap').with(ensure: :present)
+            is_expected.to contain_package('openldap').with(ensure: :installed)
           }
         end
       end
@@ -45,7 +45,20 @@
         it { is_expected.to contain_class('openldap::client::install') }
 
         it {
-          is_expected.to contain_package('foo').with(ensure: :present)
+          is_expected.to contain_package('foo').with(ensure: :installed)
+        }
+      end
+
+      context 'when overriding package version' do
+        let :pre_condition do
+          "class {'openldap::client': package => 'bar', package_version => '2.3.4-1' }"
+        end
+
+        it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_class('openldap::client::install') }
+
+        it {
+          is_expected.to contain_package('bar').with(ensure: '2.3.4-1')
         }
       end
     end

spec/classes/openldap_server_install_spec.rb

@@ -16,11 +16,11 @@
         case facts[:osfamily]
         when 'Debian'
           it {
-            is_expected.to contain_package('slapd').with(ensure: :present)
+            is_expected.to contain_package('slapd').with(ensure: :installed)
           }
         when 'RedHat'
           it {
-            is_expected.to contain_package('openldap-servers').with(ensure: :present)
+            is_expected.to contain_package('openldap-servers').with(ensure: :installed)
           }
         end
 
@@ -38,6 +38,32 @@
           it { is_expected.not_to contain_class('epel') } if (facts[:os]['family'] == 'RedHat') && (facts[:os]['release']['major'].to_s == '9')
         end
       end
+
+      context 'when overriding package name' do
+        let :pre_condition do
+          "class {'openldap::server': package => 'foo', }"
+        end
+
+        it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_class('openldap::server::install') }
+
+        it {
+          is_expected.to contain_package('foo').with(ensure: :installed)
+        }
+      end
+
+      context 'when overriding package version' do
+        let :pre_condition do
+          "class {'openldap::server': package => 'bar', package_version => '2.4.6-1', }"
+        end
+
+        it { is_expected.to compile.with_all_deps }
+        it { is_expected.to contain_class('openldap::server::install') }
+
+        it {
+          is_expected.to contain_package('bar').with(ensure: '2.4.6-1')
+        }
+      end
     end
   end
 end

spec/classes/openldap_utils_spec.rb

@@ -15,11 +15,11 @@
         case facts[:osfamily]
         when 'Debian'
           it {
-            is_expected.to contain_package('ldap-utils').with(ensure: :present)
+            is_expected.to contain_package('ldap-utils').with(ensure: :installed)
           }
         when 'RedHat'
           it {
-            is_expected.to contain_package('openldap-clients').with(ensure: :present)
+            is_expected.to contain_package('openldap-clients').with(ensure: :installed)
           }
         end
       end
@@ -32,7 +32,19 @@
         it { is_expected.to compile.with_all_deps }
 
         it {
-          is_expected.to contain_package('foo').with(ensure: :present)
+          is_expected.to contain_package('foo').with(ensure: :installed)
+        }
+      end
+
+      context 'when overriding package version' do
+        let :pre_condition do
+          "class {'openldap::utils': package => 'bar', package_version => '3.6.9-12', }"
+        end
+
+        it { is_expected.to compile.with_all_deps }
+
+        it {
+          is_expected.to contain_package('bar').with(ensure: '3.6.9-12')
         }
       end
     end