Skip to content

Commit

Permalink
(maint) Drop the legacy chocolatey::params class
Browse files Browse the repository at this point in the history
This class in an internal detail with low value for end users but cannot
be made private for technical reasons so appears in end-users
documentation.

Drop chocolatey::params.
  • Loading branch information
smortex committed Jan 13, 2022
1 parent 946ab0a commit 39d6a5c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 28 deletions.
3 changes: 2 additions & 1 deletion data/common.yaml
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
--- {}
---
chocolatey::install_location: C:\ProgramData\chocolatey
17 changes: 8 additions & 9 deletions manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,16 @@
# @param install_proxy Proxy server to use to use for installation of chocolatey itself or
# `undef` to not use a proxy
class chocolatey (
Stdlib::Windowspath $choco_install_location = $::chocolatey::params::install_location,
Boolean $use_7zip = $::chocolatey::params::use_7zip,
String $seven_zip_download_url = $::chocolatey::params::seven_zip_download_url,
Integer $choco_install_timeout_seconds = $::chocolatey::params::install_timeout_seconds,
Stdlib::Filesource $chocolatey_download_url = $::chocolatey::params::download_url,
Boolean $enable_autouninstaller = $::chocolatey::params::enable_autouninstaller,
Stdlib::Windowspath $choco_install_location = $facts['choco_install_path'],
Boolean $use_7zip = false,
String $seven_zip_download_url = 'https://chocolatey.org/7za.exe',
Integer $choco_install_timeout_seconds = 1500,
Stdlib::Filesource $chocolatey_download_url = 'https://chocolatey.org/api/v2/package/chocolatey/',
Boolean $enable_autouninstaller = true,
$log_output = false,
$chocolatey_version = $::chocolatey::params::chocolatey_version,
$chocolatey_version = $facts['chocolateyversion'],
$install_proxy = undef,
) inherits ::chocolatey::params {

) {
class { '::chocolatey::install': }
-> class { '::chocolatey::config': }

Expand Down
17 changes: 0 additions & 17 deletions manifests/params.pp

This file was deleted.

1 change: 0 additions & 1 deletion spec/classes/init_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
# it { is_expected.to compile }
# it { is_expected.to compile.with_all_deps }
it { is_expected.to contain_class('chocolatey') }
it { is_expected.to contain_class('chocolatey::params') }
it { is_expected.to contain_class('chocolatey::install') }
it { is_expected.to contain_class('chocolatey::config') }
end
Expand Down

0 comments on commit 39d6a5c

Please sign in to comment.