knife-tidy 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60a150c120a04db504d0a45032efbf9426bbdcfc
-  data.tar.gz: 21e0ade15f1e70010c329b0e957e2346ca1cb364
+  metadata.gz: ea6f3ab3ae6f2d01e70092c6df3e6ef4496b70bb
+  data.tar.gz: a5b9ba72970cbf016296c590a4177e23b07a4e82
 SHA512:
-  metadata.gz: 4534399f82061ce69215d280b431a4880c42accaa39f229e4f38cf9c71ff12d856734ebf6a129c1318e0f8b72c6a5ed1c61e81dd7bd6380733fa28750a583e13
-  data.tar.gz: f0dbc8390ffb48af2193e100ac0a06a7b081359113a03bd2acac64b8e7f929860025fca818f15f1fcb33d2f97fdb8302d8e0a43c9e9b152837de20ea1a6bab5d
+  metadata.gz: 58fcda1b011c58c583535b929e56e7c50f37853b168544926886c71e373896dc3b985d454c85cd51e9035d41fdd472411cffc9d03876a74a1f0f3a9a972d0005
+  data.tar.gz: a87916d53272aa57ecaa8ef5a628cef0aaca192825bca03dab4a476660f2e803aec7e14f7fd486b6999ba2fb83d2cae068d453fc8828a06c949ee692dce5f23b

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log
 
+## [0.7.0](https://github.com/chef-customers/knife-tidy/tree/0.7.0) (2017-11-29)
+[Full Changelog](https://github.com/chef-customers/knife-tidy/compare/0.6.1...0.7.0)
+
+**Closed issues:**
+
+- Users/clients from backups older than CS 12.5 may be missing read acls on clients [\#63](https://github.com/chef-customers/knife-tidy/issues/63)
+- notify subcommand ignores --orgs option [\#59](https://github.com/chef-customers/knife-tidy/issues/59)
+
+**Merged pull requests:**
+
+- Add admins/users groups to the read acl for clients from \< CS 12.5 [\#64](https://github.com/chef-customers/knife-tidy/pull/64) ([itmustbejj](https://github.com/itmustbejj))
+- Restore acls for ::server-admins and org read access groups if they a… [\#61](https://github.com/chef-customers/knife-tidy/pull/61) ([itmustbejj](https://github.com/itmustbejj))
+- Filter email notifications on org\_list config option. [\#60](https://github.com/chef-customers/knife-tidy/pull/60) ([itmustbejj](https://github.com/itmustbejj))
+- Set default encoding to utf-8 to properly handle non-ascii in backups. [\#58](https://github.com/chef-customers/knife-tidy/pull/58) ([itmustbejj](https://github.com/itmustbejj))
+- Add check for pre-12.3 nodes to report generation… [\#57](https://github.com/chef-customers/knife-tidy/pull/57) ([jonlives](https://github.com/jonlives))
+- bump path to 0.6.1 [\#55](https://github.com/chef-customers/knife-tidy/pull/55) ([jeremymv2](https://github.com/jeremymv2))
+
 ## [0.6.1](https://github.com/chef-customers/knife-tidy/tree/0.6.1) (2017-10-26)
 [Full Changelog](https://github.com/chef-customers/knife-tidy/compare/0.6.0...0.6.1)
 
@@ -177,4 +194,4 @@
 
 
 
-\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/lib/chef/knife/tidy_backup_clean.rb

@@ -58,6 +58,7 @@ class Chef
           org_acls = Chef::TidyOrgAcls.new(tidy, org)
           org_acls.validate_acls
           org_acls.validate_user_acls
+          org_acls.validate_client_acls
           fix_self_dependencies(org)
           fix_cookbook_names(org)
           generate_new_metadata(org)

data/lib/chef/knife/tidy_notify.rb

@@ -65,6 +65,11 @@ class Chef
 
         # Fetch list of organisation names from reports directory
         org_names = reports_files.map{|r_file|r_file.split("/").last.split("_").first}.sort.uniq
+        if config[:org_list]
+          filter_orgs = config[:org_list].split(',')
+          # Take the intersection of org_names and filter_orgs
+          org_names &= filter_orgs
+        end
 
         reports = {}
 

data/lib/chef/knife/tidy_server_report.rb

@@ -29,6 +29,7 @@ class Chef
                  all_orgs
                end
 
+        pre_12_3_nodes = []
         stale_orgs = []
         node_threshold = config[:node_threshold].to_i
 
@@ -39,6 +40,13 @@ class Chef
           used_cookbooks = {}
           nodes = nodes_list(org)
 
+          nodes.each do |node|
+            chef_version = Chef::VersionString.new(node['chef_packages']['chef']['version'])
+            if chef_version < "12.3"
+              pre_12_3_nodes << node['name']
+            end
+          end
+
           nodes.select{|node| !node['cookbooks'].nil?}.each do |node|
             node['cookbooks'].each do |name, version_hash|
               version = Gem::Version.new(version_hash['version']).to_s
@@ -65,10 +73,13 @@ 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"))
           tidy.write_new_file(unused_cookbooks(used_cookbooks, cb_list), ::File.join(tidy.reports_dir, "#{org}_unused_cookbooks.json"))
           tidy.write_new_file(version_count, ::File.join(tidy.reports_dir, "#{org}_cookbook_count.json"))
           tidy.write_new_file(stale_nodes_hash, ::File.join(tidy.reports_dir, "#{org}_stale_nodes.json"))
+
+          if pre_12_3_nodes.length > 0
+            ui.warn "#{pre_12_3_nodes.length} nodes have been detected in the organization #{org} running chef-client versions prior to 12.3 - this means that the list of stale cookbooks for these nodes may not have been correctly calculated and your report may not be complete for this organization."
+          end
         end
 
         completion_message
@@ -95,7 +106,8 @@ class Chef
           :filter_result => {
             'name' => ['name'],
             'cookbooks' => ['cookbooks'],
-            'ohai_time' => ['ohai_time']
+            'ohai_time' => ['ohai_time'],
+            'chef_packages' => ['chef_packages']
           }
         ) do |node|
           node_results << node

data/lib/chef/tidy_acls.rb

@@ -142,6 +142,33 @@ class Chef
       write_new_file(acl, acl_file)
     end
 
+    # Appends the proper acls for ::server-admins and the org's read access group if they are missing.
+    def ensure_global_group_acls(acl_file)
+      acl = FFI_Yajl::Parser.parse(::File.read(acl_file), symbolize_names: false)
+      acl_ops.each do |op|
+        unless acl[op]['groups'].include? '::server-admins'
+          puts "REPAIRING: Adding #{op} acl for ::server-admins in #{acl_file}"
+          acl[op]['groups'].push('::server-admins')
+        end
+        if op == 'read' && !acl[op]['groups'].include?("::#{@org}_read_access_group")
+          puts "REPAIRING: Adding #{op} acl for ::#{@org}_read_access_group in #{acl_file}"
+          acl[op]['groups'].push("::#{@org}_read_access_group")
+        end
+      end
+      write_new_file(acl, acl_file)
+    end
+
+    def ensure_client_read_acls(acl_file)
+      acl = FFI_Yajl::Parser.parse(::File.read(acl_file), symbolize_names: false)
+      %w(users admins).each do | group |
+        unless acl['read']['groups'].include? group
+          puts "REPAIRING: Adding read acl for #{group} in #{acl_file}"
+          acl['read']['groups'].push(group)
+        end
+      end
+      write_new_file(acl, acl_file)
+    end
+
     def validate_acls
       org_acls.each do |acl_file|
         acl = FFI_Yajl::Parser.parse(::File.read(acl_file), symbolize_names: false)
@@ -168,6 +195,7 @@ class Chef
       @members.each do |member|
         user_acl_path = ::File.join(@tidy.user_acls_path, "#{member[:user][:username]}.json")
         user_acl = FFI_Yajl::Parser.parse(::File.read(user_acl_path), symbolize_names: false)
+        ensure_global_group_acls(user_acl_path)
         actors_groups = acl_actors_groups(user_acl)
         actors_groups[:groups].each do |group|
           if invalid_group?(group)
@@ -176,5 +204,13 @@ class Chef
         end
       end
     end
+
+    def validate_client_acls
+      @clients.each do |client|
+        client_acl_path = ::File.join(@tidy.org_acls_path(@org), 'clients', "#{client[:name]}.json")
+        client_acl = FFI_Yajl::Parser.parse(::File.read(client_acl_path), symbolize_names: false)
+        ensure_client_read_acls(client_acl_path)
+      end
+    end
   end
 end

data/lib/chef/tidy_common.rb

@@ -6,6 +6,8 @@ class Chef
     attr_accessor :backup_path
 
     def initialize(backup_path = Dir.pwd)
+      Encoding.default_external = Encoding::UTF_8
+      Encoding.default_internal = Encoding::UTF_8
       @backup_path = ::File.expand_path(backup_path)
     end
 

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = '0.6.1'
+  VERSION = '0.7.0'
   MAJOR, MINOR, TINY = VERSION.split('.')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-tidy
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Jeremy Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2017-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake