From 39d6a5c930d25f7c0261851b4e066ead8e714cbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Romain=20Tarti=C3=A8re?= <romain@blogreen.org>
Date: Thu, 13 Jan 2022 13:30:13 -1000
Subject: [PATCH] (maint) Drop the legacy chocolatey::params class

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.
---
 data/common.yaml          |  3 ++-
 manifests/init.pp         | 17 ++++++++---------
 manifests/params.pp       | 17 -----------------
 spec/classes/init_spec.rb |  1 -
 4 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 manifests/params.pp

diff --git a/data/common.yaml b/data/common.yaml
index 2fbf0ffd..c0ae1e7d 100644
--- a/data/common.yaml
+++ b/data/common.yaml
@@ -1 +1,2 @@
---- {}
+---
+chocolatey::install_location: C:\ProgramData\chocolatey
diff --git a/manifests/init.pp b/manifests/init.pp
index 0b47be44..94d727ca 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -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': }
 
diff --git a/manifests/params.pp b/manifests/params.pp
deleted file mode 100644
index 85d6d118..00000000
--- a/manifests/params.pp
+++ /dev/null
@@ -1,17 +0,0 @@
-# @summary Sets up default parameters
-#
-# @api private
-class chocolatey::params {
-  assert_private()
-
-  $install_location         = empty($facts['choco_install_path']) ? {
-    false   => $facts['choco_install_path'],
-    default => 'C:\ProgramData\chocolatey',
-  }
-  $download_url             = 'https://chocolatey.org/api/v2/package/chocolatey/'
-  $use_7zip                 = false
-  $seven_zip_download_url   = 'https://chocolatey.org/7za.exe'
-  $install_timeout_seconds  = 1500
-  $enable_autouninstaller   = true
-  $chocolatey_version       = $facts['chocolateyversion']
-}
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
index 6f4b7a38..70532893 100644
--- a/spec/classes/init_spec.rb
+++ b/spec/classes/init_spec.rb
@@ -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