diff --git a/REFERENCE.md b/REFERENCE.md index 7521918..c9a8275 100644 --- 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 ### `samba` @@ -107,7 +102,7 @@ Should this module manage the installation/removal of the $packages? ##### `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` ##### `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 - -### `Samba::InstallType` - -The Samba::InstallType data type. - -Alias of - -```puppet -Struct[{ - ensure => Samba::PackageState, -}] -``` - -### `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 index 4b98a90..27d2c30 100644 --- 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 index ce2475d..ec61371 100644 --- 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 index ec79dd1..be5109c 100644 --- 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 deleted file mode 100644 index 6de2175..0000000 --- a/spec/type_aliases/packagestate_spec.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'spec_helper' - -if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0 - describe 'Samba::PackageState' do - describe 'accepts package state in one of the following' do - ['present', 'absent', 'purged', 'disabled', 'installed', 'latest'].each do |value| - describe value.inspect do - it { is_expected.to allow_value(value) } - end - end - end - - describe 'rejects other values' do - [ - [], - {}, - 'ensure', - true, - 'install', - 'update', - ].each do |value| - describe value.inspect do - it { is_expected.not_to allow_value(value) } - end - end - end - end -end diff --git a/types/installtype.pp b/types/installtype.pp deleted file mode 100644 index 1381114..0000000 --- a/types/installtype.pp +++ /dev/null @@ -1,3 +0,0 @@ -type Samba::InstallType = Struct[{ - ensure => Samba::PackageState, -}] diff --git a/types/packagestate.pp b/types/packagestate.pp deleted file mode 100644 index f20022d..0000000 --- a/types/packagestate.pp +++ /dev/null @@ -1,8 +0,0 @@ -type Samba::PackageState = Enum[ - present, - absent, - purged, - disabled, - installed, - latest, -]