Skip to content

Commit 3ef81f8

Browse files
committed
Use a stricter data type on gluster::volumes
1 parent 0a88afa commit 3ef81f8

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

manifests/init.pp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
$server_package = $gluster::params::server_package,
4949
$use_exported_resources = $gluster::params::export_resources,
5050
$version = $gluster::params::version,
51-
Optional[Hash] $volumes = undef,
51+
Hash[String, Any] $volumes = {},
5252
) inherits ::gluster::params {
5353

5454
class { 'gluster::install':
@@ -76,8 +76,10 @@
7676
Gluster::Peer <<| pool == $pool |>>
7777
}
7878

79-
if $volumes {
80-
create_resources( ::gluster::volume, $volumes )
79+
$volumes.each |$volume, $options| {
80+
gluster::volume { $volume:
81+
* => $options,
82+
}
8183
}
8284
}
8385
}

spec/classes/init_spec.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,7 @@
179179
end
180180

181181
it 'fails' do
182-
expect do
183-
is_expected.to contain_gluster__volume('data1')
184-
end.to raise_error(Puppet::Error, %r{})
182+
is_expected.to compile.and_raise_error(%r{Expected value of type Hash, got Array})
185183
end
186184
end
187185
end

0 commit comments

Comments
 (0)