knife-cloud 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c8e63c32be098a1c7237ffdc07292bf4abb084e3c56fa7e336788a650307976
-  data.tar.gz: 68f6841384ee72b01b5b990ceeac3cf1582a8ebae9f5d63c58f67ffeb5259aa5
+  metadata.gz: 2faf09682aa12fa3ae8f46295159cbefea8158bcfc6f636f49c79f71cf6cb72d
+  data.tar.gz: 5d90a5bb0f7b079f757efdb08152aee4d0455c3595f509cb91e69e30984d2733
 SHA512:
-  metadata.gz: 92aa2998725dc7641bf1961aae50c27416188f5b0970c297398aa3e16b9648bd7a6de8a4e111934594e779f4b6ec54cf777bda4e189665f6948e0bdc9a5eedc9
-  data.tar.gz: 5469dc5b52b492416c8c722ece09379df2b7634db7aac0a4b0c43a1a8a5c107e1b72813c5f624b50c28d46d5f0756ee6926f1d13e596172ef31b18bf19ea1d0b
+  metadata.gz: 0d123173f850f37bfc50dce54f9777da38f4e93ec5c8a7adcac70d27c6b7ab0b3dd59cdcfe083cf0e751b48735c19bb96c9435d38084e9c6b5094665a8cd615d
+  data.tar.gz: aa78eed5d15dac77723f355ddf8da5b4dede80c9388e2112c12eaea16e21f13ec208fe19e4877f8ec91a6425496ebacd6bc8dfe2e553f7d7a561523fc2c2e2b0

data/lib/chef/knife/cloud/list_resource_command.rb

@@ -75,7 +75,10 @@ class Chef
             # display column wise only if @columns_with_info is specified, else as a json for readable display.
             begin
               resource_list = @columns_with_info.map { |col_info| ui.color(col_info[:label], :bold) } if @columns_with_info.length > 0
-              resources.sort_by { |x| x.send(@sort_by_field).downcase }.each do |resource|
+              records = data_sort(resources)
+              records.each do |resource|
+                next if resource.respond_to?(:deprecated) && resource.deprecated
+
                 if @columns_with_info.length > 0
                   list = get_resource_col_val(resource)
                   resource_list.concat(list) unless list.nil?
@@ -96,6 +99,14 @@ class Chef
           end
         end
 
+        def data_sort(resources)
+          if resources.length > 0
+            resources[0].respond_to?(:kind) && resources[0].kind == "compute#image" ? resources : resources.sort_by { |x| x.send(@sort_by_field).downcase }
+          else
+            []
+          end
+        end
+
       end # class ResourceListCommand
     end
   end

data/lib/knife-cloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Cloud
-    VERSION = "2.0.2".freeze
+    VERSION = "2.0.3".freeze
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-cloud
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Kaustubh Deorukhkar
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef