morpheus-cli 5.3.4 → 5.4.3

data/lib/morpheus/cli/{clusters.rb → commands/clusters.rb}

@@ -1,10 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-#require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::Clusters
   include Morpheus::Cli::CliCommand
@@ -464,6 +458,10 @@ class Morpheus::Cli::Clusters
 
         cluster_payload['type'] = cluster_type['code'] # {'id' => cluster_type['id']}
 
+        # Group / Site
+        group = load_group(cluster_type['code'], options)
+        cluster_payload['group'] = {'id' => group['id']}
+
         # Cluster Name
         if args.empty? && options[:no_prompt]
           print_red_alert "No cluster name provided"
@@ -520,10 +518,6 @@ class Morpheus::Cli::Clusters
 
         server_payload['tags'] = tags if tags
 
-        # Group / Site
-        group = load_group(options)
-        cluster_payload['group'] = {'id' => group['id']}
-
         # Cloud / Zone
         cloud_id = nil
         cloud = options[:cloud] ? find_cloud_by_name_or_id_for_provisioning(group['id'], options[:cloud]) : nil
@@ -532,7 +526,7 @@ class Morpheus::Cli::Clusters
           cloud = @clouds_interface.get(cloud['id'])['zone']
           cloud_id = cloud['id']
         else
-          available_clouds = get_available_clouds(group['id'])
+          available_clouds = get_available_clouds(group['id'], {groupType: cluster_payload['type']})
 
           if available_clouds.empty?
             print_red_alert "Group #{group['name']} has no available clouds"
@@ -553,30 +547,34 @@ class Morpheus::Cli::Clusters
           available_layouts = layouts_for_dropdown(cloud['id'], cluster_type['id'])
 
           if !available_layouts.empty?
-            if available_layouts.count > 1 && !options[:no_prompt]
-              layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'selectOptions' => available_layouts, 'required' => true, 'description' => 'Select Layout.'}],options[:options],@api_client,{})['layout']
-            else
-              layout_id = available_layouts.first['id']
-            end
+            layout_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'layout', 'type' => 'select', 'fieldLabel' => 'Layout', 'selectOptions' => available_layouts, 'required' => true, 'description' => 'Select Layout.'}],options[:options],@api_client,{})['layout']
             layout = find_layout_by_name_or_id(layout_id)
           end
         end
 
-        cluster_payload['layout'] = {id: layout['id']}
+        cluster_payload['layout'] = {'id' => layout['id']}
 
         # Provision Type
         provision_type = (layout && layout['provisionType'] ? layout['provisionType'] : nil) || get_provision_type_for_zone_type(cloud['zoneType']['id'])
+        provision_type = @provision_types_interface.get(provision_type['id'])['provisionType'] if !provision_type.nil?
 
-        api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionTypeId: provision_type['id']}
+        api_params = {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}
 
         # Controller type
-        server_types = @server_types_interface.list({max:1, computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes']
+        server_types = @server_types_interface.list({computeTypeId: cluster_type['controllerTypes'].first['id'], zoneTypeId: cloud['zoneType']['id'], useZoneProvisionTypes: true})['serverTypes'].reject {|it| it['provisionType']['code'] == 'manual'}
         controller_provision_type = nil
         resource_pool = nil
 
         if !server_types.empty?
           controller_type = server_types.first
-          controller_provision_type = controller_type['provisionType'] ? (@provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil) : nil
+
+          if controller_type['provisionType']
+            if provision_type && provision_type['id'] == controller_type['provisionType']['id']
+              controller_provision_type = provision_type
+            else
+              controller_provision_type = @provision_types_interface.get(controller_type['provisionType']['id'])['provisionType'] rescue nil
+            end
+          end
 
           if controller_provision_type && resource_pool = prompt_resource_pool(group, cloud, nil, controller_provision_type, options)
             server_payload['config']['resourcePoolId'] = resource_pool['id']
@@ -591,21 +589,23 @@ class Morpheus::Cli::Clusters
         service_plan = prompt_service_plan(api_params, options)
 
         if service_plan
-          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          server_payload['plan'] = {'id' => service_plan['id'], 'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, provision_type, options)}
           api_params['planId'] = service_plan['id']
         end
 
         # Multi-disk / prompt for volumes
-        volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
-
-        if !volumes.empty?
-          server_payload['volumes'] = volumes
+        if provision_type['hasVolumes']
+          volumes = options[:volumes] || prompt_volumes(service_plan, options.merge({'defaultAddFirstDataVolume': true}), @api_client, api_params)
+          if !volumes.empty?
+            server_payload['volumes'] = volumes
+          end
         end
 
         # Options / Custom Config
         option_type_list =
-          ((controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) + layout['optionTypes'] +
-          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue [])).sort { |type| type['displayOrder'] }
+          ((controller_type.nil? ? [] : controller_type['optionTypes'].reject { |type| !type['enabled'] || type['fieldComponent'] } rescue []) +
+          layout['optionTypes'] +
+          (cluster_type['optionTypes'].reject { |type| !type['enabled'] || !type['creatable'] || type['fieldComponent'] } rescue []))
 
         # KLUDGE: google zone required for network selection
         if option_type = option_type_list.find {|type| type['code'] == 'computeServerType.googleLinux.googleZoneId'}
@@ -627,11 +627,17 @@ class Morpheus::Cli::Clusters
         # Visibility
         server_payload['visibility'] = options[:visibility] || (Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'defaultValue' => 'private', 'required' => true, 'selectOptions' => [{'name' => 'Private', 'value' => 'private'},{'name' => 'Public', 'value' => 'public'}]}], options[:options], @api_client, {})['visibility'])
 
-        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, api_params, options[:no_prompt], true))
+        # Layout template options
+        cluster_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(load_layout_options(cluster_payload), options[:options], @api_client, api_params, options[:no_prompt], true))
+
+        # Server options
+        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options].deep_merge({:context_map => {'domain' => ''}}), @api_client, api_params, options[:no_prompt], true))
 
         # Worker count
-        default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
-        server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{cluster_type['code'].include?('docker') ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+        if !['manual', 'external'].include?(provision_type['code'])
+          default_node_count = layout['computeServers'] ? (layout['computeServers'].find {|it| it['nodeType'] == 'worker'} || {'nodeCount' => 3})['nodeCount'] : 3
+          server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker-cluster', 'kvm-cluster'].include?(cluster_type['code']) ? 'Host' : 'Worker'} Count", 'required' => true, 'defaultValue' => default_node_count > 0 ? default_node_count : 3}], options[:options], @api_client, api_params, options[:no_prompt])['config']['nodeCount']
+        end
 
         # Create User
         if !options[:createUser].nil?
@@ -659,10 +665,12 @@ class Morpheus::Cli::Clusters
         server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
         # Workflow / Automation
-        task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
+        if provision_type['code'] != 'manual' && controller_type && controller_type['hasAutomation']
+          task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']
 
-        if !task_set_id.nil?
-          server_payload['taskSet'] = {'id' => task_set_id}
+          if !task_set_id.nil?
+            server_payload['taskSet'] = {'id' => task_set_id}
+          end
         end
 
         cluster_payload['server'] = server_payload
@@ -1174,7 +1182,7 @@ class Morpheus::Cli::Clusters
         service_plan = prompt_service_plan({zoneId: cloud_id, siteId: cluster['site']['id'], provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id'], }, options)
 
         if service_plan
-          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, options)}
+          server_payload['plan'] = {'code' => service_plan['code'], 'options' => prompt_service_plan_options(service_plan, nil, options)}
         end
 
         if resource_pool = prompt_resource_pool(cluster, cloud, service_plan, server_type['provisionType'], options)
@@ -3671,7 +3679,7 @@ class Morpheus::Cli::Clusters
     @clouds_interface.cloud_type(zone_type_id)['zoneType']['provisionTypes'].first rescue nil
   end
 
-  def load_group(options)
+  def load_group(group_type, options)
     # Group / Site
     group_id = nil
     group = options[:group] ? find_group_by_name_or_id_for_provisioning(options[:group]) : nil
@@ -3682,15 +3690,13 @@ class Morpheus::Cli::Clusters
       if @active_group_id
         group_id = @active_group_id
       else
-        available_groups = get_available_groups
+        available_groups = get_available_groups({groupType: group_type})
 
         if available_groups.empty?
           print_red_alert "No available groups"
           exit 1
-        elsif available_groups.count > 1 && !options[:no_prompt]
+        else available_groups.count > 1 && !options[:no_prompt]
           group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => available_groups, 'required' => true, 'description' => 'Select Group.'}],options[:options],@api_client,{})['group']
-        else
-          group_id = available_groups.first['id']
         end
       end
     end
@@ -3717,34 +3723,37 @@ class Morpheus::Cli::Clusters
     service_plan
   end
 
-  def prompt_service_plan_options(service_plan, options)
+  def prompt_service_plan_options(service_plan, provision_type, options)
     plan_options = {}
-
-    # custom max memory
-    if service_plan['customMaxMemory']
-      if !options[:maxMemory]
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'maxMemory', 'type' => 'number', 'fieldLabel' => 'Max Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image', 'defaultValue' => service_plan['maxMemory'] ? service_plan['maxMemory'] / (1024 * 1024) : 10 }], options[:options])
-        plan_options['maxMemory'] = v_prompt['maxMemory'] * 1024 * 1024 if v_prompt['maxMemory']
-      else
-        plan_options['maxMemory'] = options[:maxMemory]
+    hide_custom_options = provision_type && provision_type['code'] == 'manual'
+
+    if !hide_custom_options
+      # custom max memory
+      if service_plan['customMaxMemory']
+        if !options[:maxMemory]
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'maxMemory', 'type' => 'number', 'fieldLabel' => 'Max Memory (MB)', 'required' => false, 'description' => 'This will override any memory requirement set on the virtual image', 'defaultValue' => service_plan['maxMemory'] ? service_plan['maxMemory'] / (1024 * 1024) : 10 }], options[:options])
+          plan_options['maxMemory'] = v_prompt['maxMemory'] * 1024 * 1024 if v_prompt['maxMemory']
+        else
+          plan_options['maxMemory'] = options[:maxMemory]
+        end
       end
-    end
 
-    # custom cores: max cpu, max cores, cores per socket
-    if service_plan['customCores']
-      if options[:cpuCount].empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cpuCount', 'type' => 'number', 'fieldLabel' => 'CPU Count', 'required' => false, 'description' => 'Set CPU Count', 'defaultValue' => service_plan['maxCpu'] ? service_plan['maxCpu'] : 1 }], options[:options])
-        plan_options['cpuCount'] = v_prompt['cpuCount'] if v_prompt['cpuCount']
-      else
-        plan_options['cpuCount']
-      end
-      if options[:coreCount].empty?
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coreCount', 'type' => 'number', 'fieldLabel' => 'Core Count', 'required' => false, 'description' => 'Set Core Count', 'defaultValue' => service_plan['maxCores'] ? service_plan['maxCores'] : 1 }], options[:options])
-        plan_options['coreCount'] = v_prompt['coreCount'] if v_prompt['coreCount']
-      end
-      if options[:coresPerSocket].empty? && service_plan['coresPerSocket']
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => 'Cores Per Socket', 'required' => false, 'description' => 'Set Core Per Socket', 'defaultValue' => service_plan['coresPerSocket']}], options[:options])
-        plan_options['coresPerSocket'] = v_prompt['coresPerSocket'] if v_prompt['coresPerSocket']
+      # custom cores: max cpu, max cores, cores per socket
+      if service_plan['customCores']
+        if options[:cpuCount].empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cpuCount', 'type' => 'number', 'fieldLabel' => 'CPU Count', 'required' => false, 'description' => 'Set CPU Count', 'defaultValue' => service_plan['maxCpu'] ? service_plan['maxCpu'] : 1 }], options[:options])
+          plan_options['cpuCount'] = v_prompt['cpuCount'] if v_prompt['cpuCount']
+        else
+          plan_options['cpuCount']
+        end
+        if options[:coreCount].empty?
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coreCount', 'type' => 'number', 'fieldLabel' => 'Core Count', 'required' => false, 'description' => 'Set Core Count', 'defaultValue' => service_plan['maxCores'] ? service_plan['maxCores'] : 1 }], options[:options])
+          plan_options['coreCount'] = v_prompt['coreCount'] if v_prompt['coreCount']
+        end
+        if options[:coresPerSocket].empty? && service_plan['coresPerSocket']
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'coresPerSocket', 'type' => 'number', 'fieldLabel' => 'Cores Per Socket', 'required' => false, 'description' => 'Set Core Per Socket', 'defaultValue' => service_plan['coresPerSocket']}], options[:options])
+          plan_options['coresPerSocket'] = v_prompt['coresPerSocket'] if v_prompt['coresPerSocket']
+        end
       end
     end
     plan_options
@@ -3932,4 +3941,27 @@ class Morpheus::Cli::Clusters
     ]
   end
 
+  def load_layout_options(cluster)
+    (@api_client.options.options_for_source('computeTypeLayoutParameters', {layoutId: cluster['layout']['id']})['data'] || []).collect do |it|
+      it['fieldName'] = it['name']
+      it['fieldLabel'] = it['displayName']
+      it['fieldContext'] = 'config.templateParameter'
+      if it['type'] == 'ServicePlan'
+        it['optionSource'] = 'servicePlans'
+        it['type'] = 'select'
+        it['params'] = {:provisionType => '', :zoneId => '', :siteId => '', :resourcePoolId => ''}
+        it['params'][:provisionType] = 'azure' if it['azureServicePlanType']
+      elsif it['type'] == 'Subnet'
+        it['optionSource'] = 'networks'
+        it['type'] = 'select'
+        it['params'] = {:siteId => '', :instanceId => '', :serverId => '', :zonePoolId => '', :zoneRegionId => '', :zoneId => '', :provisionType => ''}
+        if cluster['type'] == 'aks-cluster'
+          it['params'][:provisionType] = 'azure'
+        end
+      else
+        it['type'] = 'text'
+      end
+      it
+    end
+  end
 end

data/lib/morpheus/cli/commands/{standard/coloring_command.rb → coloring_command.rb}

@@ -1,6 +1,4 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 # This is for use in dotfile scripts
 # It allows you to turn colors on or off globally

data/lib/morpheus/cli/{containers_command.rb → commands/containers_command.rb}

@@ -1,11 +1,4 @@
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/provisioning_helper'
-require 'morpheus/cli/mixins/logs_helper'
-require 'morpheus/cli/option_types'
 
 class Morpheus::Cli::ContainersCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/commands/{standard/curl_command.rb → curl_command.rb}

@@ -1,7 +1,4 @@
-require 'optparse'
-require 'morpheus/logging'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 class Morpheus::Cli::CurlCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{cypher_command.rb → commands/cypher_command.rb}

@@ -1,4 +1,3 @@
-require 'json'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::CypherCommand

data/lib/morpheus/cli/{dashboard_command.rb → commands/dashboard_command.rb}

@@ -1,6 +1,4 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'json'
 
 class Morpheus::Cli::DashboardCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/commands/{standard/debug_command.rb → debug_command.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'morpheus/logging'
 
 # This is for use in dotfile scripts
 # It allows you to turn colors on or off globally

data/lib/morpheus/cli/{deploy.rb → commands/deploy.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'yaml'
 
 class Morpheus::Cli::Deploy
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{deploys.rb → commands/deploys.rb}

@@ -1,5 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'yaml'
 
 class Morpheus::Cli::Deploys
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{doc.rb → commands/doc.rb}

@@ -2,7 +2,7 @@ require 'morpheus/cli/cli_command'
 
 # This provides commands for authentication 
 # This also includes credential management.
-class Morpheus::Cli::DocCommand
+class Morpheus::Cli::Doc
   include Morpheus::Cli::CliCommand
 
   set_command_name :'doc'

data/lib/morpheus/cli/commands/{standard/echo_command.rb → echo_command.rb}

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
 # This is for use in dotfile scripts for printing
 # It is also responsible for maintaining a map of variables

data/lib/morpheus/cli/commands/{standard/edit_profile_command.rb → edit_profile_command.rb}

@@ -1,8 +1,6 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
-# Command for editing the .morpheus_profile initalization script
+# Command for editing the .morpheus_profile initialization script
 class Morpheus::Cli::EditProfileCommand
   include Morpheus::Cli::CliCommand
   set_command_name :'edit-profile'
@@ -18,7 +16,20 @@ class Morpheus::Cli::EditProfileCommand
         editor = val
       end
       build_common_options(opts, options, [])
-      opts.footer = "Edit your interactive shell script at #{filename}"
+      opts.footer = <<-EOT
+Edit your .morpheus_profile script located in the morpheus home directory.
+This script runs whenever the morpheus terminal command is executed.
+It provides a way to initialize your cli environment for all morpheus commands.
+
+Example:
+
+# disable coloring to exclude ansi characters in output
+coloring off -q
+
+# Enable debugging to print extra output for troubleshooting
+debug on
+
+EOT
     end
     optparse.parse!(args)
 

data/lib/morpheus/cli/commands/{standard/edit_rc_command.rb → edit_rc_command.rb}

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
 # Command for editing the .morpheus_profile initalization script
 class Morpheus::Cli::EditRcCommand
@@ -18,7 +16,25 @@ class Morpheus::Cli::EditRcCommand
         editor = val.gsub("'",'')
       end
       build_common_options(opts, options, [])
-      opts.footer = "Edit your morpheus initialization script at #{filename}"
+      opts.footer = <<-EOT
+Edit your .morpheusrc script located in the morpheus home directory.
+This script runs at the beginning of the interactive morpheus shell command.
+It provides a way to initialize your interactive morpheus shell environment.
+
+Example:
+
+# customize the morpheus shell prompt
+set-prompt "%cyan%username%reset@%magenta%remote %cyanmorpheus> %reset"
+
+# print the morpheus cli version
+version
+
+# print the current remote appliance version
+remote get current
+
+# greetings
+echo "Welcome back %username"
+EOT
     end
     optparse.parse!(args)
     

data/lib/morpheus/cli/{environments_command.rb → commands/environments_command.rb}

@@ -1,9 +1,4 @@
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/option_types'
-require 'json'
 
 class Morpheus::Cli::EnvironmentsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{execution_request_command.rb → commands/execution_request_command.rb}

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-# require 'morpheus/cli/mixins/provisioning_helper'
-# require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::ExecutionRequestCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/commands/{standard/exit_command.rb → exit_command.rb}

@@ -1,6 +1,4 @@
 require 'morpheus/cli/cli_command'
-require 'term/ansicolor'
-require 'json'
 
 # Utility command for exiting a shell
 class Morpheus::Cli::ExitCommand

data/lib/morpheus/cli/{file_copy_request_command.rb → commands/file_copy_request_command.rb}

@@ -1,11 +1,7 @@
 require 'morpheus/cli/cli_command'
-# require 'morpheus/cli/mixins/provisioning_helper'
-# require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::FileCopyRequestCommand
   include Morpheus::Cli::CliCommand
-  # include Morpheus::Cli::InfrastructureHelper
-  # include Morpheus::Cli::ProvisioningHelper
 
   set_command_name :'file-copy-request'
 

data/lib/morpheus/cli/commands/{standard/get_prompt_command.rb → get_prompt_command.rb}

@@ -1,6 +1,3 @@
-require 'optparse'
-require 'json'
-require 'morpheus/logging'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::GetPromptCommand

data/lib/morpheus/cli/{groups.rb → commands/groups.rb}

@@ -1,11 +1,4 @@
-require 'fileutils'
-require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
-require 'morpheus/logging'
 
 class Morpheus::Cli::Groups
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{guidance_command.rb → commands/guidance_command.rb}

@@ -1,5 +1,5 @@
 require 'morpheus/cli/cli_command'
-require 'date'
+require 'date' #needed?
 
 class Morpheus::Cli::GuidanceCommand
   include Morpheus::Cli::CliCommand