morpheus-cli 5.0.2 → 5.2.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 5.0.2
+  version: 5.2.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-23 00:00:00.000000000 Z
+date: 2020-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -279,6 +279,7 @@ files:
 - lib/morpheus/api/security_groups_interface.rb
 - lib/morpheus/api/server_types_interface.rb
 - lib/morpheus/api/servers_interface.rb
+- lib/morpheus/api/service_catalog_interface.rb
 - lib/morpheus/api/service_plans_interface.rb
 - lib/morpheus/api/setup_interface.rb
 - lib/morpheus/api/storage_providers_interface.rb
@@ -310,7 +311,7 @@ files:
 - lib/morpheus/cli/blueprints_command.rb
 - lib/morpheus/cli/boot_scripts_command.rb
 - lib/morpheus/cli/budgets_command.rb
-- lib/morpheus/cli/catalog_command.rb
+- lib/morpheus/cli/catalog_item_types_command.rb
 - lib/morpheus/cli/change_password_command.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
@@ -388,7 +389,6 @@ files:
 - lib/morpheus/cli/logs_command.rb
 - lib/morpheus/cli/mixins/accounts_helper.rb
 - lib/morpheus/cli/mixins/backups_helper.rb
-- lib/morpheus/cli/mixins/catalog_helper.rb
 - lib/morpheus/cli/mixins/deployments_helper.rb
 - lib/morpheus/cli/mixins/infrastructure_helper.rb
 - lib/morpheus/cli/mixins/library_helper.rb
@@ -435,6 +435,7 @@ files:
 - lib/morpheus/cli/search_command.rb
 - lib/morpheus/cli/security_group_rules.rb
 - lib/morpheus/cli/security_groups.rb
+- lib/morpheus/cli/service_catalog_command.rb
 - lib/morpheus/cli/service_plans_command.rb
 - lib/morpheus/cli/setup.rb
 - lib/morpheus/cli/shell.rb

data/lib/morpheus/cli/mixins/catalog_helper.rb

@@ -1,66 +0,0 @@
-require 'morpheus/cli/mixins/print_helper'
-# Mixin for Morpheus::Cli command classes
-# Provides common methods for infrastructure management
-module Morpheus::Cli::CatalogHelper
-
-  def self.included(klass)
-    klass.send :include, Morpheus::Cli::PrintHelper
-  end
-
-  def catalog_item_types_interface
-    raise "#{self.class} has not defined @catalog_item_types_interface" if @catalog_item_types_interface.nil?
-    @catalog_item_types_interface
-  end
-
-  # def service_catalog_interface
-  #   raise "#{self.class} has not defined @service_catalog_interface" if @service_catalog_interface.nil?
-  #   @service_catalog_interface
-  # end
-
-  def catalog_item_type_object_key
-    'catalogItemType'
-  end
-
-  def catalog_item_type_list_key
-    'catalogItemTypes'
-  end
-
-  def find_catalog_item_type_by_name_or_id(val)
-    if val.to_s =~ /\A\d{1,}\Z/
-      return find_catalog_item_type_by_id(val)
-    else
-      return find_catalog_item_type_by_name(val)
-    end
-  end
-
-  def find_catalog_item_type_by_id(id)
-    begin
-      json_response = catalog_item_types_interface.get(id.to_i)
-      return json_response[catalog_item_type_object_key]
-    rescue RestClient::Exception => e
-      if e.response && e.response.code == 404
-        print_red_alert "catalog_item_type not found by id '#{id}'"
-      else
-        raise e
-      end
-    end
-  end
-
-  def find_catalog_item_type_by_name(name)
-    json_response = catalog_item_types_interface.list({name: name.to_s})
-    catalog_item_types = json_response[catalog_item_type_list_key]
-    if catalog_item_types.empty?
-      print_red_alert "catalog_item_type not found by name '#{name}'"
-      return nil
-    elsif catalog_item_types.size > 1
-      print_red_alert "#{catalog_item_types.size} catalog_item_types found by name '#{name}'"
-      puts_error as_pretty_table(catalog_item_types, [:id, :name], {color:red})
-      print_red_alert "Try using ID instead"
-      print reset,"\n"
-      return nil
-    else
-      return catalog_item_types[0]
-    end
-  end
-
-end