Refactor client handling

manifests/client.pp

@@ -2,27 +2,18 @@
 #
 # == Parameters
 #
-# $ensure:: Desired ensure state of the package. Optional. Defaults to 'true'
+# $ensure:: Desired ensure state of the package.
 #
 # $package_name:: Name of the package to install the client from. Default is
 #                 repository dependent.
 #
 class mongodb::client (
-  Variant[Boolean, String] $ensure = $mongodb::params::package_ensure_client,
-  Optional[String] $package_name   = $mongodb::params::client_package_name,
-) inherits mongodb::params {
-  $package_ensure = $ensure ? {
-    true     => 'present',
-    false    => 'purged',
-    'absent' => 'purged',
-    default  => $ensure,
-  }
-
-  if $package_name {
-    package { 'mongodb_client':
-      ensure => $package_ensure,
-      name   => $package_name,
-      tag    => 'mongodb',
-    }
+  String[1] $ensure = $mongodb::client::params::package_ensure,
+  String[1] $package_name = $mongodb::client::params::package_name,
+) inherits mongodb::client::params {
+  package { 'mongodb_client':
+    ensure => $ensure,
+    name   => $package_name,
+    tag    => 'mongodb',
   }
 }

manifests/client/params.pp

@@ -0,0 +1,14 @@
+# @api private
+class mongodb::client::params inherits mongodb::globals {
+  $package_ensure = pick($mongodb::globals::version, 'present')
+  $manage_package = pick($mongodb::globals::manage_package, $mongodb::globals::manage_package_repo, false)
+
+  if $manage_package {
+    $package_name = "mongodb-${mongodb::globals::edition}-shell"
+  } else {
+    $package_name = $::osfamily ? {
+      'Debian' => 'mongodb-clients',
+      default  => 'mongodb',
+    }
+  }
+}

manifests/globals.pp

@@ -32,6 +32,12 @@
   $manage_pidfile        = undef,
 ) {
 
+  if $use_enterprise_repo {
+    $edition = 'enterprise'
+  } else {
+    $edition = 'org'
+  }
+
   # Setup of the repo only makes sense globally, so we are doing it here.
   if $manage_package_repo {
     if $use_enterprise_repo == true and $version == undef {

manifests/mongos/params.pp

@@ -1,18 +1,12 @@
 # PRIVATE CLASS: do not use directly
 class mongodb::mongos::params inherits mongodb::globals {
-  if $mongodb::globals::use_enterprise_repo {
-    $edition = 'enterprise'
-  } else {
-    $edition = 'org'
-  }
-
   $manage_package = pick($mongodb::globals::manage_package, $mongodb::globals::manage_package_repo, false)
 
   $version = $mongodb::globals::version
 
   $package_ensure = pick($version, 'present')
   if $manage_package {
-    $package_name = "mongodb-${edition}-mongos"
+    $package_name = "mongodb-${mongodb::globals::edition}-mongos"
   } else {
     $package_name = 'mongodb-server'
   }

manifests/params.pp

@@ -31,35 +31,25 @@
 
   if $version {
     $package_ensure        = $version
-    $package_ensure_client = $version
     $package_ensure_mongos = $version
   } else {
     $package_ensure        = true
-    $package_ensure_client = true
     $package_ensure_mongos = true
   }
 
-  if $mongodb::globals::use_enterprise_repo {
-    $edition = 'enterprise'
-  } else {
-    $edition = 'org'
-  }
-
   # Amazon Linux's OS Family is 'Linux', operating system 'Amazon'.
   case $::osfamily {
     'RedHat', 'Linux', 'Suse': {
       if $manage_package {
         $user                    = pick($mongodb::globals::user, 'mongod')
         $group                   = pick($mongodb::globals::group, 'mongod')
-        $server_package_name     = pick($mongodb::globals::server_package_name, "mongodb-${edition}-server")
-        $client_package_name     = pick($mongodb::globals::client_package_name, "mongodb-${edition}-shell")
+        $server_package_name     = pick($mongodb::globals::server_package_name, "mongodb-${mongodb::globals::edition}-server")
       } else {
         # RedHat/CentOS doesn't come with a prepacked mongodb
         # so we assume that you are using EPEL repository.
         $user                    = pick($mongodb::globals::user, 'mongodb')
         $group                   = pick($mongodb::globals::group, 'mongodb')
         $server_package_name     = pick($mongodb::globals::server_package_name, 'mongodb-server')
-        $client_package_name     = pick($mongodb::globals::client_package_name, 'mongodb')
       }
 
       $service_name = pick($mongodb::globals::service_name, 'mongod')
@@ -72,13 +62,11 @@
     'Debian': {
       if $manage_package {
         $service_name            = pick($mongodb::globals::service_name, 'mongod')
-        $server_package_name     = pick($mongodb::globals::server_package_name, "mongodb-${edition}-server")
-        $client_package_name     = pick($mongodb::globals::client_package_name, "mongodb-${edition}-shell")
+        $server_package_name     = pick($mongodb::globals::server_package_name, "mongodb-${mongodb::globals::edition}-server")
         $config                  = '/etc/mongod.conf'
         $pidfilepath             = pick($mongodb::globals::pidfilepath, '/var/run/mongod.pid')
       } else {
         $server_package_name = pick($mongodb::globals::server_package_name, 'mongodb-server')
-        $client_package_name = pick($mongodb::globals::client_package_name, 'mongodb-clients')
         $service_name        = pick($mongodb::globals::service_name, 'mongodb')
         $config              = '/etc/mongodb.conf'
         $pidfilepath         = $mongodb::globals::pidfilepath

spec/classes/client_spec.rb

@@ -7,6 +7,7 @@
 
       context 'with defaults' do
         it { is_expected.to compile.with_all_deps }
+        it { is_expected.to create_package('mongodb_client').with_ensure('present') }
       end
 
       context 'with manage_package' do
@@ -15,7 +16,7 @@
         end
 
         it { is_expected.to compile.with_all_deps }
-        it { is_expected.to create_package('mongodb_client').with_ensure('present') }
+        it { is_expected.to create_package('mongodb_client').with_ensure('present').with_name('mongodb-org-shell') }
       end
     end
   end