From 24d0c7c2fa4330279f9a55d3cd862be2d9f1d3d8 Mon Sep 17 00:00:00 2001 From: sanga17 Date: Thu, 11 Jun 2020 18:32:02 +0530 Subject: [PATCH 1/4] Replaced string with regex in sub method Signed-off-by: sanga17 --- lib/chef/knife/vault_rotate_all_keys.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/chef/knife/vault_rotate_all_keys.rb b/lib/chef/knife/vault_rotate_all_keys.rb index 05c8be8..0fddc49 100644 --- a/lib/chef/knife/vault_rotate_all_keys.rb +++ b/lib/chef/knife/vault_rotate_all_keys.rb @@ -47,7 +47,7 @@ def rotate_vault_keys(vault, clean_unknown_clients) def vault_items(vault) Chef::DataBag.load(vault).keys.each_with_object([]) do |key, array| - array << key.sub("_keys", "") if key =~ /.+_keys$/ + array << key.sub(/_keys(?=[^_keys]*$)/, "") if key =~ /.+_keys$/ end end From 07db71bfc31806f02dbffa4f7382b8e55fd3c174 Mon Sep 17 00:00:00 2001 From: sanga17 Date: Fri, 12 Jun 2020 09:51:19 +0530 Subject: [PATCH 2/4] Added permalink of regex that used Signed-off-by: sanga17 --- lib/chef/knife/vault_rotate_all_keys.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/chef/knife/vault_rotate_all_keys.rb b/lib/chef/knife/vault_rotate_all_keys.rb index 0fddc49..f59e6df 100644 --- a/lib/chef/knife/vault_rotate_all_keys.rb +++ b/lib/chef/knife/vault_rotate_all_keys.rb @@ -45,6 +45,7 @@ def rotate_vault_keys(vault, clean_unknown_clients) end end + # Permalink for regex of replacing '_keys' with '': https://rubular.com/r/5cA5JNSyLfPSfY def vault_items(vault) Chef::DataBag.load(vault).keys.each_with_object([]) do |key, array| array << key.sub(/_keys(?=[^_keys]*$)/, "") if key =~ /.+_keys$/ From 3c6640ee3c34586b99393065d8d5e2b86896b89b Mon Sep 17 00:00:00 2001 From: sanga17 Date: Fri, 12 Jun 2020 09:53:57 +0530 Subject: [PATCH 3/4] Updated the cop name as it is failing while build Signed-off-by: sanga17 --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 0848887..4241837 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -5,7 +5,7 @@ AllCops: - "pkg/**/*" - "tmp/**/*" -Layout/IndentHeredoc: +Layout/HeredocIndentation: Exclude: - 'features/step_definitions/chef-repo.rb' - 'hooks/pre-commit' From 2c4ad21b3535994e8559ac55850e6db08e978a67 Mon Sep 17 00:00:00 2001 From: sanga17 Date: Fri, 24 Jul 2020 15:54:09 +0530 Subject: [PATCH 4/4] Resolved rubocop offences Signed-off-by: sanga17 --- .simplecov | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.simplecov b/.simplecov index c7e3aa5..b07de58 100644 --- a/.simplecov +++ b/.simplecov @@ -1,6 +1,6 @@ -require 'simplecov-console' +require "simplecov-console" SimpleCov.formatters = [ SimpleCov::Formatter::HTMLFormatter, - SimpleCov::Formatter::Console + SimpleCov::Formatter::Console, ] SimpleCov.start