knife-tidy 2.0.12 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f6ab0938f4a6ca55ff3b6551451f2ceecf78eb05b3187880a7a6341525ea32e
-  data.tar.gz: bf2e3f30342700b6c7578d0256505475dfa0aa74b095383f0af98a79457035e2
+  metadata.gz: c7aaf34102e27291f03892bfb4eddb450aaed46c5e615818e48a59c174c91e42
+  data.tar.gz: f482bbfb1182b581532ef643900c6f4814dc800ff42e02ff0a29b8936faed77b
 SHA512:
-  metadata.gz: f0e80bd713ce788302e0555c1611d4b08b47107fd9e0b6c96c1794ef1715a6fe40a4e4762f7c3b58b4b4d34e36f75510758dcd9874eabb812ed4d06a6e9050fd
-  data.tar.gz: 7d3ed20eac5000a9b60e48cbe3fbfa12250162c917a02619ff428213cfa948d24ff8fe355359f4f2667d59ec90edacdfd78b2af5ed2cac0e6ff059cb8575e301
+  metadata.gz: a5192215cbd8341aef601e71bf6c42bb2eb5d19f652570734ac192151941d7b954da8d0fe5c504ea67b599772d09ea12da77d6d782f54e2c967c6c12fc9cef0d
+  data.tar.gz: 75b37b5663f0558791ad1a52b5281d84197e1def8ed2c15103896165a781b4a07f1ac4556f5d266e35fb662d76218e6be0ccf413d569e0b7b776075e5a5aca27

data/conf/substitutions.json.example

@@ -0,0 +1,10 @@
+{
+  "your-problem-descriptor":{
+    "organizations/*/cookbooks/*/metadata.rb":[
+      {
+        "pattern":"^version .*GO_PIPELINE_LABEL",
+        "replace":"version !COOKBOOK_VERSION!"
+      }
+    ]
+  }
+}

data/lib/chef/knife/tidy_server_report.rb

@@ -17,6 +17,11 @@ class Chef
         default: 30,
         description: "Maximum number of days since last checkin before node is considered stale (default: 30)"
 
+      option :keep_versions,
+        long: "--keep-versions MIN",
+        default: 0,
+        description: "Keep a minimum of this many versions of each cookbook (default: 0)"
+
       def run
         ensure_reports_dir!
         FileUtils.rm_f(server_warnings_file_path)
@@ -32,6 +37,7 @@ class Chef
 
         stale_orgs = []
         node_threshold = config[:node_threshold].to_i
+        keep_versions  = config[:keep_versions].to_i
 
         orgs.each do |org|
           pre_12_3_nodes = []
@@ -76,6 +82,9 @@ 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)
 
@@ -153,6 +162,15 @@ 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|

data/lib/knife-tidy/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-tidy
 version: !ruby/object:Gem::Version
-  version: 2.0.12
+  version: 2.0.15
 platform: ruby
 authors:
 - Jeremy Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-20 00:00:00.000000000 Z
+date: 2020-06-11 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
@@ -19,6 +19,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- conf/substitutions.json.example
 - lib/chef/knife/tidy_backup_clean.rb
 - lib/chef/knife/tidy_base.rb
 - lib/chef/knife/tidy_notify.rb