From: david22swan <david.swan@puppet.com>
Date: Wed, 26 Apr 2023 15:43:31 +0000 (+0100)
Subject: (CONT-773) Rubocop Unsafe Auto Fixes 4-5
X-Git-Tag: v9.1.0~9^2~5
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;ds=sidebyside;h=8a7fc6272bc86965815f213436a24e093a329420;p=puppet-modules%2Fpuppetlabs-apt.git

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

- Style/GlobalStdStream
- Style/SlicingWithRange
---

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index a20672e..fb3857b 100644
--- 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 9ad21bc..546f2c1 100644
--- 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 132699a..ee141cd 100755
--- 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