morpheus-cli 5.3.3 → 5.4.2

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

@@ -1,11 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
-require 'morpheus/cli/mixins/provisioning_helper'
-require 'morpheus/cli/option_types'
 
 class Morpheus::Cli::Clouds
   include Morpheus::Cli::CliCommand
@@ -27,8 +20,6 @@ class Morpheus::Cli::Clouds
     @clouds_interface = @api_client.clouds
     @groups_interface = @api_client.groups
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
-    # preload stuff
-    get_available_cloud_types()
   end
 
   def handle(args)
@@ -134,38 +125,36 @@ class Morpheus::Cli::Clouds
 
   def get(args)
     options = {}
+    params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "Get details about a cloud.\n" +
                     "[name] is required. This is the name or id of a cloud."
     end
     optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
+    verify_args!(args:args, optparse:optparse, min:1)
     connect(options)
+    params.merge!(parse_query_options(options))
     id_list = parse_id_list(args)
     return run_command_for_each_arg(id_list) do |arg|
-      _get(arg, options)
+      _get(arg, params, options)
     end
   end
 
-  def _get(arg, options={})
-    begin
-      if options[:dry_run]
-        @clouds_interface.setopts(options)
-        if arg.to_s =~ /\A\d{1,}\Z/
-          print_dry_run @clouds_interface.dry.get(arg.to_i)
-        else
-          print_dry_run @clouds_interface.dry.list({name:arg})
-        end
-        return
-      end
-      cloud = find_cloud_by_name_or_id(arg)
-      @clouds_interface.setopts(options)
-      json_response = @clouds_interface.get(cloud['id'])
+  def _get(id, params, options={})
+    cloud = nil
+    if id.to_s !~ /\A\d{1,}\Z/
+      cloud = find_cloud_by_name_or_id(id)
+      id = cloud['id']
+    end
+    @clouds_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clouds_interface.dry.get(id.to_i, params)
+      return
+    end
+    json_response = @clouds_interface.get(id, params)
+    render_response(json_response, options, 'zone') do
       cloud = json_response['zone']
       cloud_stats = cloud['stats']
       # serverCounts moved to zone.stats.serverCounts
@@ -175,17 +164,6 @@ class Morpheus::Cli::Clouds
       else
         server_counts = json_response['serverCounts'] # legacy
       end
-      if options[:json]
-        puts as_json(json_response, options, 'zone')
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, 'zone')
-        return 0
-      end
-      if options[:csv]
-        puts records_as_csv([json_response['zone']], options)
-        return 0
-      end
       cloud_type = cloud_type_for_id(cloud['zoneTypeId'])
       print_h1 "Cloud Details"
       print cyan
@@ -195,6 +173,7 @@ class Morpheus::Cli::Clouds
         "Type" => lambda {|it| cloud_type ? cloud_type['name'] : '' },
         "Code" => 'code',
         "Location" => 'location',
+        "Region Code" => 'regionCode',
         "Visibility" => lambda {|it| it['visibility'].to_s.capitalize },
         "Groups" => lambda {|it| it['groups'].collect {|g| g.instance_of?(Hash) ? g['name'] : g.to_s }.join(', ') },
         #"Owner" => lambda {|it| it['owner'].instance_of?(Hash) ? it['owner']['name'] : it['ownerId'] },
@@ -214,14 +193,9 @@ class Morpheus::Cli::Clouds
         print "Unmanaged: #{server_counts['unmanaged']}".center(20)
         print "\n"
       end
-
       print reset,"\n"
-
-      #puts instance
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def add(args)
@@ -954,13 +928,14 @@ class Morpheus::Cli::Clouds
         name: cloud['name'],
         type: cloud_type ? cloud_type['name'] : '',
         location: cloud['location'],
+        "REGION CODE": cloud['regionCode'],
         groups: (cloud['groups'] || []).collect {|it| it.instance_of?(Hash) ? it['name'] : it.to_s }.join(', '),
         servers: cloud['serverCount'],
         status: format_cloud_status(cloud)
       }
     end
     columns = [
-      :id, :name, :type, :location, :groups, :servers, :status
+      :id, :name, :type, :location, "REGION CODE", :groups, :servers, :status
     ]
     print as_pretty_table(rows, columns, opts)
   end

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"
@@ -562,12 +556,12 @@ class Morpheus::Cli::Clusters
           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'])
 
-        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']
@@ -627,11 +621,15 @@ 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'])
 
+        # 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], @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']
+        server_payload['config']['nodeCount'] = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => "config.nodeCount", 'type' => 'number', 'fieldLabel' => "#{['docker', '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']
 
         # Create User
         if !options[:createUser].nil?
@@ -3671,7 +3669,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 +3680,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
@@ -3932,4 +3928,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