Merge pull request #2312 from oanatmaria/FACT-2962

(FACT-2962) Add all supported time units for ttls

lib/facter/framework/config/fact_groups.rb

@@ -7,10 +7,15 @@ class FactGroups
     attr_accessor :groups_ttls
     attr_reader :groups, :block_list, :facts_ttls
 
-    STRING_TO_SECONDS = { 'seconds' => 1, 'second' => 1,
-                          'minutes' => 60, 'minute' => 60,
-                          'hours' => 3600, 'hour' => 3600,
-                          'days' => 3600 * 24, 'day' => 3600 * 24 }.freeze
+    STRING_TO_SECONDS = { 'ns' => 1.fdiv(1_000_000_000), 'nanos' => 1.fdiv(1_000_000_000),
+                          'nanoseconds' => 1.fdiv(1_000_000_000),
+                          'us' => 1.fdiv(1_000_000), 'micros' => 1.fdiv(1_000_000), 'microseconds' => 1.fdiv(1_000_000),
+                          '' => 1.fdiv(1000), 'ms' => 1.fdiv(1000), 'milis' => 1.fdiv(1000),
+                          'milliseconds' => 1.fdiv(1000),
+                          's' => 1, 'seconds' => 1,
+                          'm' => 60, 'minutes' => 60,
+                          'h' => 3600, 'hours' => 3600,
+                          'd' => 3600 * 24, 'days' => 3600 * 24 }.freeze
 
     def initialize
       @groups = Facter::Config::FACT_GROUPS.dup
@@ -106,14 +111,22 @@ def load_groups
 
     def ttls_to_seconds(ttls)
       duration, unit = ttls.split(' ', 2)
+      unit = '' if duration && !unit
+      unit = append_s(unit)
       seconds = STRING_TO_SECONDS[unit]
       if seconds
-        duration.to_i * seconds
+        (duration.to_i * seconds).to_i
       else
         log = Log.new(self)
-        log.error("Could not parse time unit #{unit} (try second(s), minute(s), hour(s) or day(s))")
+        log.error("Could not parse time unit #{unit} (try #{STRING_TO_SECONDS.keys.reject(&:empty?).join(', ')})")
         nil
       end
     end
+
+    def append_s(unit)
+      return unit + 's' if unit.length > 2 && unit[-1] != 's'
+
+      unit
+    end
   end
 end

spec/framework/config/fact_groups_spec.rb

@@ -114,6 +114,22 @@
       expect(fg.get_group_ttls('memory')).to be_nil
     end
 
+    context 'when ttls has short names for units' do
+      let(:ttls) { ['operating system' => '10000000000000 ns', 'memory' => '10000', 'hostname' => '30 h'] }
+
+      it 'returns os ttl in seconds' do
+        expect(fg.get_group_ttls('operating system')).to eq(10_000)
+      end
+
+      it 'returns memory ttl in seconds' do
+        expect(fg.get_group_ttls('memory')).to eq(10)
+      end
+
+      it 'returns hostname ttl in seconds' do
+        expect(fg.get_group_ttls('hostname')).to eq(108_000)
+      end
+    end
+
     context 'when ttls has hour instead of hour' do
       let(:ttls) { ['operating system' => '1 hour', 'memory' => '1 day', 'hostname' => '30 invalid_unit'] }
       let(:logger) { instance_spy(Facter::Log) }
@@ -124,8 +140,8 @@
 
       it 'logs an error message' do
         fg.get_group_ttls('hostname')
-        expect(logger).to have_received(:error).with('Could not parse time unit invalid_unit'\
-                                                      ' (try second(s), minute(s), hour(s) or day(s))').twice
+        expect(logger).to have_received(:error).with('Could not parse time unit invalid_units '\
+                                "(try #{Facter::FactGroups::STRING_TO_SECONDS.keys.reject(&:empty?).join(', ')})").twice
       end
 
       it 'returns os ttl in seconds' do