knife-tidy 2.1.2 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbadbfe49e6402c189f63e8e0290eeb93d409f89f4220ef9ad6bdc96b0b455f
-  data.tar.gz: ee7f3392eac804aeec3490c33c1e02d9d22d1bd038f3a1eb8222fd9d9c660dd9
+  metadata.gz: 6df7a5c7edcbf10d78ed4f4702b68e231b3f016308280b979bdd84928af0362e
+  data.tar.gz: ae670780d34592914ddf4eba0ba67e3a4fd5a54fe49a0d8a4a9425e5c92aa1c0
 SHA512:
-  metadata.gz: e78b266e0482121cd3d551a9d683cd79b85aae16bb31d53260c2c73a7ceae1080052cd582957b55a23099c7799ed8312e0a5fcde1b920640497af04872894ab7
-  data.tar.gz: b1e97749b9ed73fe512b76a45291541b070eb730ded2f86dc4de1f355258e319017338e183c53a0dd2b4671f98a513ba4a5ca69053e6dc834359f396e15257ee
+  metadata.gz: 41fc026a4bb68574ee10ddceb69414868ae4b031f995b6a0e11b86574f579215576b7763c906739c63132d2bf62f886a645dc0b2791bd71683f3ed441d4f7932
+  data.tar.gz: 5e3e481f0e98d4bc141773ef92e6bf0c457678790fac6b7e36acf20e5d2da6365c8d0f8f23ce734fc118b217a73a6b994d7c3bfa79837b4540d8816e02d58227

data/lib/chef/knife/tidy_server_report.rb

@@ -19,8 +19,8 @@ class Chef
 
       option :keep_versions,
         long: "--keep-versions MIN",
-        default: 0,
-        description: "Keep a minimum of this many versions of each cookbook (default: 0)"
+        default: 1,
+        description: "Keep a minimum of this many versions of each cookbook (default: 1)"
 
       def run
         ensure_reports_dir!
@@ -82,8 +82,6 @@ class Chef
             end
           end
 
-          used_cookbooks = keep_cookbook_versions(cb_list, keep_versions)
-
           Chef::Log.debug("Used cookbook list before checking environments: #{used_cookbooks}")
           pins = environment_constraints(org)
           used_cookbooks = check_environment_pins(used_cookbooks, pins, cb_list)
@@ -98,7 +96,7 @@ class Chef
           stale_nodes_hash = { 'threshold_days': node_threshold, 'org_total_node_count': nodes.count, 'count': stale_nodes.count, 'list': stale_nodes }
           stale_orgs.push(org) if stale_nodes.count == nodes.count
 
-          tidy.write_new_file(unused_cookbooks(used_cookbooks, cb_list), ::File.join(tidy.reports_dir, "#{org}_unused_cookbooks.json"), backup = false)
+          tidy.write_new_file(unused_cookbooks(used_cookbooks, cb_list, keep_versions), ::File.join(tidy.reports_dir, "#{org}_unused_cookbooks.json"), backup = false)
           tidy.write_new_file(version_count, ::File.join(tidy.reports_dir, "#{org}_cookbook_count.json"), backup = false)
           tidy.write_new_file(stale_nodes_hash, ::File.join(tidy.reports_dir, "#{org}_stale_nodes.json"), backup = false)
 
@@ -162,15 +160,6 @@ class Chef
         cb_list
       end
 
-      def keep_cookbook_versions(cb_list, min)
-        retain = {}
-        cb_list.each do |name, versions|
-          keep = versions.sort { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }.last(min)
-          retain[name] = keep
-        end
-        retain
-      end
-
       def cookbook_count(cb_list)
         cb_count_list = {}
         cb_list.each do |name, versions|
@@ -179,14 +168,14 @@ class Chef
         cb_count_list
       end
 
-      def unused_cookbooks(used_list, cb_list)
+      def unused_cookbooks(used_list, cb_list, keep_versions)
         unused_list = {}
         cb_list.each do |name, versions|
           versions.sort! { |a, b| Gem::Version.new(a) <=> Gem::Version.new(b) }
           if used_list[name].nil? # Not in the used list at all (Remove all versions)
             unused_list[name] = versions
           elsif used_list[name].sort != versions # Is in the used cookbook list, but version arrays do not match (Find unused versions)
-            unused = versions - used_list[name] - [versions.last] # Don't delete the most recent version as it might not be in a run_list yet.
+            unused = versions - used_list[name] - versions.last(keep_versions) # Don't delete the X most recent version as it might not be in a run_list yet.
             unused_list[name] = unused unless unused.empty?
           end
         end

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = "2.1.2".freeze
+  VERSION = "2.1.6".freeze
   MAJOR, MINOR, TINY = VERSION.split(".")
 end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: knife-tidy
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.6
 platform: ruby
 authors:
-- Jeremy Miller
+- Chef Software, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies: []
-description: Report on stale Chef Server nodes and cookbooks and clean up data integrity
-  issues in a knife-ec-backup object based backup
+description: Report on stale Chef Infra Server nodes and cookbooks and clean up data
+  integrity issues in a knife-ec-backup object based backup
 email:
-- jmiller@chef.io
+- oss@chef.io
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -30,7 +30,7 @@ files:
 - lib/chef/tidy_server.rb
 - lib/chef/tidy_substitutions.rb
 - lib/knife-tidy/version.rb
-homepage: https://github.com/chef-customers/knife-tidy
+homepage: https://github.com/chef/knife-tidy
 licenses:
 - Apache-2.0
 metadata: {}
@@ -49,9 +49,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Report on stale Chef Server nodes and cookbooks and clean up data integrity
+summary: Report on stale Chef Infra Server nodes and cookbooks and clean up data integrity
   issues in a knife-ec-backup object based backup
 test_files: []