Merge pull request #50 from bschonec/remove_custom_types

rehanone · Feb 17, 2024 · 3fdcaef · 3fdcaef
2 parents ce91f0c + 2d1eddf
commit 3fdcaef
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 69 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -18,11 +18,6 @@
 * [`samba::option`](#samba--option): Manages smb.conf options.
 * [`samba::share`](#samba--share): == Define samba::share
 
-### Data types
-
-* [`Samba::InstallType`](#Samba--InstallType)
-* [`Samba::PackageState`](#Samba--PackageState)
-
 ## Classes
 
 ### <a name="samba"></a>`samba`
@@ -107,7 +102,7 @@ Should this module manage the installation/removal of the $packages?
 
 ##### <a name="-samba--package_ensure"></a>`package_ensure`
 
-Data type: `Samba::PackageState`
+Data type: `Stdlib::Ensure::Package`
 
 The installation state of $packages.
 
@@ -489,7 +484,7 @@ Default value: `$samba::package_manage`
 
 ##### <a name="-samba--client--package_ensure"></a>`package_ensure`
 
-Data type: `Samba::PackageState`
+Data type: `Stdlib::Ensure::Package`
 
 The installation state of the Samba client package
 
@@ -864,23 +859,3 @@ The absent/present state of the key/value parameter.
 
 Default value: `present`
 
-## Data types
-
-### <a name="Samba--InstallType"></a>`Samba::InstallType`
-
-The Samba::InstallType data type.
-
-Alias of
-
-```puppet
-Struct[{
-    ensure => Samba::PackageState,
-}]
-```
-
-### <a name="Samba--PackageState"></a>`Samba::PackageState`
-
-The Samba::PackageState data type.
-
-Alias of `Enum[present, absent, purged, disabled, installed, latest]`
-
diff --git a/manifests/client.pp b/manifests/client.pp
@@ -17,7 +17,7 @@
       utils  => Array[String[1]],
   }]                  $packages       = $samba::packages,
   Boolean             $package_manage = $samba::package_manage,
-  Samba::PackageState $package_ensure = $samba::package_ensure,
+  Stdlib::Ensure::Package $package_ensure = $samba::package_ensure,
 ) {
   if $package_manage {
     package { $packages[client]:

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -152,7 +152,7 @@
       utils  => Array[String[1]],
   }]      $packages,
   Boolean $package_manage,
-  Samba::PackageState                  $package_ensure,
+  Stdlib::Ensure::Package              $package_ensure,
   String  $config_file,
   String  $config_lens,
   Variant[Enum[mask, manual], Boolean] $service_enable,

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs-stdlib",
-      "version_requirement": ">= 6.0.0 < 9.0.0"
+      "version_requirement": ">= 8.6.0 < 9.0.0"
     },
     {
       "name": "puppetlabs-augeas_core",

diff --git a/spec/type_aliases/packagestate_spec.rb b/spec/type_aliases/packagestate_spec.rb
diff --git a/types/installtype.pp b/types/installtype.pp
diff --git a/types/packagestate.pp b/types/packagestate.pp