(CONT-773) Rubocop Unsafe Auto Fixes 4-5

- Style/GlobalStdStream
- Style/SlicingWithRange

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a20672eb0000298e8a271ff8df87780173a7a37a..fb3857b0362552813b571d3c34576ff433c26ef8 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -128,19 +128,7 @@ Security/Open:
   Exclude:
     - 'lib/puppet/provider/apt_key/apt_key.rb'
 
-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/GlobalStdStream:
-  Exclude:
-    - 'tasks/init.rb'
-
 # Offense count: 1
 Style/MixinUsage:
   Exclude:
     - 'spec/spec_helper.rb'
-
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-Style/SlicingWithRange:
-  Exclude:
-    - 'lib/puppet/provider/apt_key/apt_key.rb'

diff --git a/lib/puppet/provider/apt_key/apt_key.rb b/lib/puppet/provider/apt_key/apt_key.rb
index 9ad21bcc6e6f51d5873230c867475fd122fa47cb..546f2c154b50ea49f5fe0ce02026d6bc2e643672 100644 (file)
--- a/lib/puppet/provider/apt_key/apt_key.rb
+++ b/lib/puppet/provider/apt_key/apt_key.rb
@@ -92,8 +92,8 @@ Puppet::Type.type(:apt_key).provide(:apt_key) do
     fingerprint = fpr_split.last
     return_hash = {
       key_fingerprint: fingerprint,
-      key_long: fingerprint[-16..-1], # last 16 characters of fingerprint
-      key_short: fingerprint[-8..-1], # last 8 characters of fingerprint
+      key_long: fingerprint[-16..], # last 16 characters of fingerprint
+      key_short: fingerprint[-8..], # last 8 characters of fingerprint
       key_size: pub_split[2],
       key_type: nil,
       key_created: Time.at(pub_split[5].to_i),

diff --git a/tasks/init.rb b/tasks/init.rb
index 132699ad01077fff1cf8debc3f8c42a8f15e197d..ee141cdb691dcc8dd5513b50f3cabb8f0dbffdd1 100755 (executable)
--- a/tasks/init.rb
+++ b/tasks/init.rb
@@ -21,7 +21,7 @@ def apt_get(action)
   { status: stdout.strip }
 end
 
-params = JSON.parse(STDIN.read)
+params = JSON.parse($stdin.read)
 action = params['action']
 
 begin