knife-tidy 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c88d6c7424cf8313b281efc0f68e2d635df4fae
-  data.tar.gz: 2fb450888ca5ca8d612b73efcb810806314246b8
+  metadata.gz: fdd8bded909178ab1e6055a4415dc0c675ee0441
+  data.tar.gz: 52b73bfc270082947f232fd333ecdd900bac2ac7
 SHA512:
-  metadata.gz: c63e4dd5f37b8a9cf028430455727243d944e01b13bca25b4562d00ea16b8fed5a86d47adcc727935197e95dfd60792d5cbcda7f6ca4f85a6ea580acdffefcd1
-  data.tar.gz: cbdeb1bca74cee204b16ec6bb89c6bab18263d73f98268a58197a2bd8b8d9107cfeac88298c522d543cadc63854ba1f1a4f08647bf2a735ae12332143e9a8804
+  metadata.gz: e843f9db36f6baf438c500ff2fd52b8e7e7151f06391597c3809dd52b4bf89124ba7a9cd2579d090c1eb9280b92145ff09a2738a799275cbb4bfb8de75b1865e
+  data.tar.gz: 7dcb30b9c176ccb3b087cbecdfdbe4ec03854c32643eb7de6b7592a24ae1d58a7b8009a3ce1ab0f38ddcab16114f9eae005ee6505958c4c4987a1f80133d5278

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## [0.4.1](https://github.com/chef-customers/knife-tidy/tree/0.4.1) (2017-09-27)
+[Full Changelog](https://github.com/chef-customers/knife-tidy/compare/0.4.0...0.4.1)
+
+**Merged pull requests:**
+
+- fixing corrupt invitations and invalid platform names with commas in … [\#38](https://github.com/chef-customers/knife-tidy/pull/38) ([jeremymv2](https://github.com/jeremymv2))
+- bump to 0.4.0 [\#36](https://github.com/chef-customers/knife-tidy/pull/36) ([jeremymv2](https://github.com/jeremymv2))
+
 ## [0.4.0](https://github.com/chef-customers/knife-tidy/tree/0.4.0) (2017-09-26)
 [Full Changelog](https://github.com/chef-customers/knife-tidy/compare/0.3.6...0.4.0)
 

data/lib/chef/knife/tidy_backup_clean.rb

@@ -51,6 +51,7 @@ class Chef
 
         orgs.each do |org|
           fix_org_object(org)
+          validate_invitations(org)
           validate_roles(org)
           org_acls = Chef::TidyOrgAcls.new(tidy, org)
           org_acls.validate_acls
@@ -213,6 +214,8 @@ class Chef
         end
         if metadata.has_key?('platforms')
           metadata['platforms'].each_pair do |key, value|
+            # platform key cannot contain comma delimited values
+            md['platforms'].delete(key) if key =~ /,/
             if value.kind_of?(Array) && value.empty?
               puts "REPAIRING: Fixing empty platform key for for key #{key} in #{json_path}"
               md['platforms'][key] = '>= 0.0.0'
@@ -365,6 +368,26 @@ class Chef
           end
         end
       end
+
+      def validate_invitations(org)
+        invite_file = tidy.invitations_path(org)
+        puts "INFO: validating org #{org} invites in #{invite_file}"
+        invitations = FFI_Yajl::Parser.parse(::File.read(invite_file), symbolize_names: false)
+        invitations_new = []
+        invitations.each do |invite|
+          if invite['username'].nil?
+            puts "REPAIRING: Dropping corrupt invitations for #{org} in file #{invite_file}"
+          else
+            invite_hash = {}
+            invite_hash['id'] = invite['id']
+            invite_hash['username'] = invite['username']
+            invitations_new.push(invite_hash)
+          end
+        end
+        ::File.open(invite_file, 'w') do |f|
+          f.write(Chef::JSONCompat.to_json_pretty(invitations_new))
+        end
+      end
     end
   end
 end

data/lib/chef/tidy_common.rb

@@ -17,6 +17,10 @@ class Chef
       ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'members.json'))
     end
 
+    def invitations_path(org)
+      ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'invitations.json'))
+    end
+
     def clients_path(org)
       ::File.expand_path(::File.join(@backup_path, 'organizations', org, 'clients'))
     end

data/lib/knife-tidy/version.rb

@@ -1,4 +1,4 @@
 module KnifeTidy
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
   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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Jeremy Miller
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake