Fixes apt-get update to be executed before package installation

voxpupuli · Mar 30, 2023 · 5729825 · 5729825
1 parent 7a937bf
commit 5729825
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 12 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -86,12 +86,6 @@
   Boolean                                   $restart_on_config_change  = true,
   Boolean                                   $restart_on_package_change = true,
 ) inherits opensearch::params {
-  if $manage_repository {
-    contain opensearch::repository
-
-    Class['opensearch::repository'] -> Class['opensearch::install']
-  }
-
   contain opensearch::install
   contain opensearch::config
   contain opensearch::service

diff --git a/manifests/install/package.pp b/manifests/install/package.pp
@@ -31,6 +31,10 @@
     $ensure   = pick($opensearch::version, $opensearch::package_ensure)
     $provider = undef
     $source   = undef
+
+    if $opensearch::manage_repository {
+      contain opensearch::repository
+    }
   }
 
   package { 'opensearch':

diff --git a/manifests/repository/debian.pp b/manifests/repository/debian.pp
@@ -30,5 +30,9 @@
 
   include apt
 
-  Apt::Source['opensearch'] ~> Class['apt::update']
+  if $opensearch::manage_package {
+    Apt::Source['opensearch'] ~> Exec['apt_update'] -> Package['opensearch']
+  } else {
+    Apt::Source['opensearch'] ~> Exec['apt_update']
+  }
 }
diff --git a/spec/classes/init_spec.rb b/spec/classes/init_spec.rb
@@ -48,7 +48,6 @@
             include_examples 'config', parameter, facts
             include_examples 'install', parameter, facts
             include_examples 'service', parameter, facts
-            include_examples 'repository', parameter, facts if parameter['manage_repository']
           end
         end
       end

diff --git a/spec/shared_examples/install.rb b/spec/shared_examples/install.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'install' do |parameter|
+shared_examples 'install' do |parameter, facts|
   it {
     is_expected.to contain_class('opensearch::install').that_comes_before('Class[opensearch::config]')
   }
@@ -15,7 +15,7 @@
     if parameter['package_source'] == 'archive'
       include_examples 'install_archive', parameter
     else
-      include_examples 'install_package', parameter
+      include_examples 'install_package', parameter, facts
     end
   end
 end
diff --git a/spec/shared_examples/install_package.rb b/spec/shared_examples/install_package.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-shared_examples 'install_package' do |parameter|
+shared_examples 'install_package' do |parameter, facts|
   it {
     is_expected.to contain_class('opensearch::install::package')
   }
@@ -36,6 +36,8 @@
                    end
     provider = nil
     source = nil
+
+    include_examples 'repository', parameter, facts if parameter['manage_repository']
   end
 
   it {

diff --git a/spec/shared_examples/repository_debian.rb b/spec/shared_examples/repository_debian.rb
@@ -39,6 +39,6 @@
         'repos'    => 'main',
         'keyring'  => '/usr/share/keyrings/opensearch.keyring.gpg',
       }
-    ).that_notifies('Class[apt::update]')
+    ).that_notifies('Exec[apt_update]')
   }
 end