Remove 'keyring_force_update' since not indempotent

Author: vegaaz

manifests/init.pp

@@ -351,9 +351,6 @@
 #   Absolute path to a file containing the PGP keyring used to sign this repository. Value is used to set signed-by on the source entry.
 #   See https://wiki.debian.org/DebianRepository/UseThirdParty for details.
 #
-# @param keyring_force_update
-#   Forces to update the with keyring provided gpg key.
-#
 class docker (
   Optional[String]                        $version                           = $docker::params::version,
   String                                  $ensure                            = $docker::params::ensure,
@@ -473,7 +470,6 @@
   Optional[Variant[String,Array]]         $registry_mirror                   = $docker::params::registry_mirror,
   Boolean                                 $acknowledge_unsupported_os        = false,
   Stdlib::Absolutepath                    $keyring                           = '/etc/apt/keyrings/docker.gpg',
-  Boolean                                 $keyring_force_update              = false,
 
   # Windows specific parameters
   Optional[String]                        $docker_msft_provider_version      = $docker::params::docker_msft_provider_version,

manifests/repos.pp

@@ -15,16 +15,13 @@
 # @param gpg_ensure
 #   Whether or not the gpg package is ensured by this module.
 #
-# @param keyring_force_update
-#   Forces to update the with keyring provided gpg key.
 class docker::repos (
   $location             = $docker::package_location,
   $key_source           = $docker::package_key_source,
   $key_check_source     = $docker::package_key_check_source,
   $architecture         = $facts['os']['architecture'],
   $keyring              = $docker::keyring,
   $gpg_ensure           = $docker::params::gpg_ensure,
-  $keyring_force_update = $docker::keyring_force_update,
 ) {
   ensure_packages($docker::prerequired_packages)
 
@@ -40,14 +37,6 @@
         if $gpg_ensure {
           ensure_packages(['gpg'])
         }
-        if $keyring_force_update {
-          exec { 'Remove Docker-GPG-Key':
-            path    => '/bin/',
-            cwd     => '/tmp',
-            command => "rm ${keyring}",
-          }
-          Exec['Remove Docker-GPG-Key'] -> Archive[$keyring]
-        }
 
         archive { $keyring:
           ensure          => present,

spec/classes/init_spec.rb

@@ -33,9 +33,6 @@
   'with keyring set to optional path' => {
     'keyring' => '/root/keyrings/docker.gpg',
   },
-  'with keyring set to force update' => {
-    'keyring_force_update' => true,
-  },
 }
 
 describe 'docker', type: :class do
@@ -187,7 +184,6 @@
             'use_upstream_package_source'       => defaults['use_upstream_package_source'],
             'version'                           => defaults['version'],
             'keyring'                           => defaults['keyring'],
-            'keyring_force_update'              => defaults['keyring_force_update'],
           }.merge(default_params).merge(local_params)
 
           let(:facts) do

spec/helper/get_defaults.rb

@@ -89,7 +89,6 @@ def get_defaults(_facts)
   tmp_dir_config                    = true
   version                           = :undef
   keyring                           = '/etc/apt/keyrings/docker.gpg'
-  keyring_force_update              = false
 
   if _facts[:os]['family'] == 'windows'
     compose_install_path   = "#{_facts['docker_program_files_path']}/Docker"
@@ -490,6 +489,5 @@ def get_defaults(_facts)
     'use_upstream_package_source' => use_upstream_package_source,
     'version' => version,
     'keyring' => keyring,
-    'keyring_force_update' => keyring_force_update,
   }
 end

spec/shared_examples/repos.rb

@@ -31,15 +31,6 @@
     if params['use_upstream_package_source']
       # check if debian version is atleast 11 and ubuntu version is atleast 22
       if (facts[:operatingsystem] == 'Debian' && facts[:operatingsystemrelease] =~ /1[1-9]/) || (facts[:operatingsystem] == 'Ubuntu' && facts[:operatingsystemrelease] =~ /2[2-9]/)
-        if params['keyring_force_update']
-          it {
-            is_expected.to contain_exec('Remove Docker-GPG-Key').with(
-              'path'    => '/bin/',
-              'cwd'     => '/tmp',
-              'command' => "rm #{keyring}",
-            ).that_comes_before("Archive[#{keyring}]")
-          }
-        end
         it {
           is_expected.to contain_class('archive')
           is_expected.to contain_archive(keyring)