From: Michiel Brandenburg <apex@xepa.nl>
Date: Mon, 9 Jan 2023 11:14:08 +0000 (+0100)
Subject: Merge branch 'main' into xepa-patch-1
X-Git-Tag: v9.0.2~6^2~2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c6019f5a3f7587a86662a34ade2d68dc419d2f60;hp=8cea77854f2813f58d3a761aa1e1aaabf462be36;p=puppet-modules%2Fpuppetlabs-apt.git

Merge branch 'main' into xepa-patch-1
---

diff --git a/manifests/source.pp b/manifests/source.pp
index b1be300..420d19d 100644
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -143,7 +143,7 @@ define apt::source (
       'comment'          => $comment,
       'includes'         => $includes,
       'options'          => delete_undef_values({
-          'arch'              => $architecture,
+          'arch'              => $_architecture,
           'trusted'           => $allow_unsigned ? { true => 'yes', false => undef },
           'allow-insecure'    => $allow_insecure ? { true => 'yes', false => undef },
           'signed-by'         => $keyring,
diff --git a/manifests/update.pp b/manifests/update.pp
index ef37f52..a9f2486 100644
--- a/manifests/update.pp
+++ b/manifests/update.pp
@@ -5,7 +5,7 @@
 class apt::update {
   assert_private()
 
-  #TODO: to catch if $apt_update_last_success has the value of -1 here. If we
+  #TODO: to catch if apt_update_last_success has the value of -1 here. If we
   #opt to do this, a info/warn would likely be all you'd need likely to happen
   #on the first run, but if it's not run in awhile something is likely borked
   #with apt and we'd want to know about it.
@@ -18,8 +18,8 @@ class apt::update {
       #compare current date with the apt_update_last_success fact to determine
       #if we should kick apt_update.
       $daily_threshold = (Integer(Timestamp().strftime('%s')) - 86400)
-      if $apt::apt_update_last_success {
-        if $apt::apt_update_last_success + 0 < $daily_threshold {
+      if $facts['apt_update_last_success'] {
+        if $facts['apt_update_last_success'] + 0 < $daily_threshold {
           $_kick_apt = true
         } else {
           $_kick_apt = false
@@ -33,8 +33,8 @@ class apt::update {
       #compare current date with the apt_update_last_success fact to determine
       #if we should kick apt_update.
       $weekly_threshold = (Integer(Timestamp().strftime('%s')) - 604800)
-      if $apt::apt_update_last_success {
-        if ( $apt::apt_update_last_success + 0 < $weekly_threshold ) {
+      if $facts['apt_update_last_success'] {
+        if $facts['apt_update_last_success'] + 0 < $weekly_threshold {
           $_kick_apt = true
         } else {
           $_kick_apt = false
diff --git a/spec/classes/apt_update_spec.rb b/spec/classes/apt_update_spec.rb
index b3d1df5..7177455 100644
--- a/spec/classes/apt_update_spec.rb
+++ b/spec/classes/apt_update_spec.rb
@@ -24,7 +24,7 @@ describe 'apt::update', type: :class do
                 id: 'Debian',
               },
             },
-            'apt::apt_update_last_success': factval,
+            'apt_update_last_success': factval,
           }
         end
         let(:pre_condition) do
@@ -76,7 +76,7 @@ describe 'apt::update', type: :class do
               id: 'Debian',
             },
           },
-          'apt::apt_update_last_success': Time.now.to_i,
+          'apt_update_last_success': Time.now.to_i,
         }
       end
       let(:pre_condition) do
@@ -113,7 +113,7 @@ describe 'apt::update', type: :class do
                 id: 'Debian',
               },
             },
-            'apt::apt_update_last_success': factval,
+            'apt_update_last_success': factval,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => 'reluctantly' },}" }
@@ -167,7 +167,7 @@ describe 'apt::update', type: :class do
                   id: 'Debian',
                 },
               },
-              'apt::apt_update_last_success': factval,
+              'apt_update_last_success': factval,
             }
           end
           let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -193,7 +193,7 @@ describe 'apt::update', type: :class do
                 id: 'Debian',
               },
             },
-            'apt::apt_update_last_success': Time.now.to_i,
+            'apt_update_last_success': Time.now.to_i,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }
@@ -218,7 +218,7 @@ describe 'apt::update', type: :class do
                 id: 'Debian',
               },
             },
-            'apt::apt_update_last_success': nil,
+            'apt_update_last_success': nil,
           }
         end
         let(:pre_condition) { "class{ '::apt': update => {'frequency' => '#{update_frequency}',} }" }