From 9928cd49cd3d3d234b7481e79144aa86f557bf48 Mon Sep 17 00:00:00 2001 From: james-stocks Date: Mon, 25 Sep 2017 13:57:07 +0000 Subject: [PATCH] Use UTC for apt_key2 created and expiry --- lib/puppet/provider/apt_key2/apt_key2.rb | 4 ++-- spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/puppet/provider/apt_key2/apt_key2.rb b/lib/puppet/provider/apt_key2/apt_key2.rb index ff810b4..6ebdd7e 100644 --- a/lib/puppet/provider/apt_key2/apt_key2.rb +++ b/lib/puppet/provider/apt_key2/apt_key2.rb @@ -91,7 +91,7 @@ class Puppet::Provider::AptKey2::AptKey2 end fingerprint = fpr_split.last - expiry = pub_split[6].empty? ? nil : Time.at(pub_split[6].to_i) + expiry = pub_split[6].empty? ? nil : Time.at(pub_split[6].to_i).utc { ensure: 'present', @@ -102,7 +102,7 @@ class Puppet::Provider::AptKey2::AptKey2 short: fingerprint[-8..-1], # last 8 characters of fingerprint size: pub_split[2].to_i, type: key_type, - created: Time.at(pub_split[5].to_i).to_s, + created: Time.at(pub_split[5].to_i).utc.to_s, expiry: expiry.to_s, expired: (expiry && Time.now >= expiry) ? true : false, } diff --git a/spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb b/spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb index 5b4aaf4..0b108c3 100644 --- a/spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb +++ b/spec/unit/puppet/provider/apt_key2/apt_key2_spec.rb @@ -107,8 +107,8 @@ EOS short: '8AE22BA9', size: 4096, type: :rsa, - created: '2017-05-22 19:41:53 +0100', - expiry: '2025-05-20 19:41:53 +0100', + created: '2017-05-22 18:41:53 UTC', + expiry: '2025-05-20 18:41:53 UTC', expired: false }, { ensure: 'present', name: '126C0D24BD8A2942CC7DF8AC7638D0442B90D010', @@ -118,8 +118,8 @@ EOS short: '2B90D010', size: 4096, type: :rsa, - created: '2014-11-21 21:01:13 +0000', - expiry: '2022-11-19 21:01:13 +0000', + created: '2014-11-21 21:01:13 UTC', + expiry: '2022-11-19 21:01:13 UTC', expired: false }, ] end -- 2.45.2