morpheus-cli 4.2.6 → 4.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fa057d89b29003c127a3c53616a012aeb2c23368384b85f0bf03b10bfd5124e
-  data.tar.gz: bc219cef29503224870be7de21a626a2f98c8ed766470ee79e3001ca1c41015f
+  metadata.gz: 126814172818496eedcb013dedfd88920675f1646b924b1304aa89986b4883d7
+  data.tar.gz: 936e0252a66ee0cd7ad99c691b87ed4e3a608ffd38810fccf4673c79dc53b47f
 SHA512:
-  metadata.gz: a93cb277435293503eddbd3abdb9f349b105298cf55820feeba7187d5c1f982b65c1cd5c2c1c4989b56f3e49c861acb8ce28e657fa4a797cd2589e193a858fd9
-  data.tar.gz: 2e11115d23a8d1d78eeb2214ca3aac06ef8ca92fd25d873c1ef02cb8350e2bfaeaeb25c7eb53c4311820c54266fb1fcd5c8a6fe1a2bacaf7d1e04308532c4821
+  metadata.gz: 72ee705d6fa646418aa223fe6ba2ab2558850a8a949ab8d821018878c3288c486bde5175c2ce8d360db8587f5db9a1bd0e760af900216ec9fb82b407270648f2
+  data.tar.gz: 6bb390e9947db29cf1e5ead6ea4c1de0ff4f78b11268247616354d677d42b838edf9e87ffc976f75423576b98509bb98462630ce48020300cb3e749a6b4f5f01

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 4.2.6
+RUN gem install morpheus-cli -v 4.2.7
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -686,6 +686,10 @@ class Morpheus::APIClient
     Morpheus::InvoicesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def guidance
+    Morpheus::GuidanceInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
   # add new interfaces here
 
 end

data/lib/morpheus/api/clouds_interface.rb

@@ -73,6 +73,20 @@ class Morpheus::CloudsInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def refresh(id, params={}, payload={})
+    url = "#{@base_url}/api/zones/#{id}/refresh"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def sync(id, params={}, payload={})
+    url = "#{@base_url}/api/zones/#{id}/sync"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def firewall_disable(id)
     url = "#{@base_url}/api/zones/#{id}/security-groups/disable"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/guidance_interface.rb

@@ -0,0 +1,47 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::GuidanceInterface < Morpheus::APIClient
+  def initialize(access_token, refresh_token,expires_at = nil, base_url=nil, api='guidance')
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @api_url = "#{base_url}/api/#{api}"
+    @expires_at = expires_at
+  end
+
+  def list(params={})
+    url = @api_url
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def stats()
+    url = "#{@api_url}/stats"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def types()
+    url = "#{@api_url}/types"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def get(id, params={})
+    url = "#{@api_url}/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    execute(method: :get, url: url, headers: headers)
+  end
+
+  def exec(id, params={})
+    url = "#{@api_url}/#{id}/execute"
+    headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers)
+  end
+
+  def ignore(id, params={})
+    url = "#{@api_url}/#{id}/ignore"
+    headers = { params: params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    execute(method: :put, url: url, headers: headers)
+  end
+end

data/lib/morpheus/api/users_interface.rb

@@ -31,6 +31,13 @@ class Morpheus::UsersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def permissions(account_id, id)
+    url = build_url(account_id, id) + "/permissions"
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
   def available_roles(account_id, id=nil, options={})
     url = build_url(account_id, id) + "/available-roles"
     headers = { params: {}, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/cli.rb

@@ -165,6 +165,7 @@ module Morpheus
       load 'morpheus/cli/budgets_command.rb'
       load 'morpheus/cli/health_command.rb'
       load 'morpheus/cli/invoices_command.rb'
+      load 'morpheus/cli/guidance_command.rb'
       # add new commands here...
 
     end

data/lib/morpheus/cli/account_groups_command.rb

@@ -83,7 +83,7 @@ class Morpheus::Cli::AccountGroupsCommand
       subtitles += parse_list_subtitles(options)
       print_h1 title, subtitles, options
       if groups.empty?
-        print yellow,"No groups currently configured.",reset,"\n"
+        print cyan,"No groups found.",reset,"\n"
       else
         print_groups_table(groups, options)
         print_results_pagination(json_response)

data/lib/morpheus/cli/approvals_command.rb

@@ -52,7 +52,7 @@ class Morpheus::Cli::ApprovalsCommand
 
       approvals = json_response['approvals']
       if approvals.empty?
-        print yellow,"No approvals found.",reset,"\n"
+        print cyan,"No approvals found.",reset,"\n"
       else
         rows = approvals.collect do |it|
           {
@@ -159,7 +159,7 @@ class Morpheus::Cli::ApprovalsCommand
         ]
         print as_pretty_table(rows, columns, options)
       else
-        print yellow,"No requested items.",reset,"\n"
+        print cyan,"No requested items.",reset,"\n"
       end
 
       print reset,"\n"

data/lib/morpheus/cli/apps.rb

@@ -298,15 +298,24 @@ class Morpheus::Cli::Apps
         end
         
         # Environment
+        selected_environment = nil
+        available_environments = get_available_environments()
         if options[:environment]
           payload['environment'] = options[:environment]
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'text', 'required' => false}], options[:options])
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'environment', 'fieldLabel' => 'Environment', 'type' => 'select', 'selectOptions' => available_environments}], options[:options], @api_client)
           payload['environment'] = v_prompt['environment'] unless v_prompt['environment'].to_s.empty?
         end
+        selected_environment = nil
+        if payload['environment']
+          selected_environment = available_environments.find {|it| it['code'] == payload['environment'] || it['name'] == payload['environment'] }
+          if selected_environment.nil?
+            print_red_alert "Environment not found by name or code '#{payload['environment']}'"
+            return 1
+          end
+        end
         # payload['appContext'] = payload['environment'] if payload['environment']
 
-
         if !payload['tiers']
           if payload['blueprintId'] != 'existing'
             
@@ -376,19 +385,21 @@ class Morpheus::Cli::Apps
                       
                       # prompt for the cloud for this instance
                       # the cloud is part of finding the scoped config in the blueprint
-                      scoped_instance_config = get_scoped_instance_config(instance_config.clone, payload['environment'], group ? group['name'] : nil, cloud ? cloud['name'] : nil)
+                      scoped_instance_config = get_scoped_instance_config(instance_config.clone, selected_environment ? selected_environment['name'] : nil, group ? group['name'] : nil, cloud ? cloud['name'] : nil)
 
                       # now configure an instance like normal, use the config as default options with :always_prompt
                       instance_prompt_options = {}
                       instance_prompt_options[:group] = group ? group['id'] : nil
                       #instance_prompt_options[:cloud] = cloud ? cloud['name'] : nil
                       instance_prompt_options[:default_cloud] = cloud ? cloud['name'] : nil
+                      instance_prompt_options[:environment] = selected_environment ? selected_environment['code'] : nil
+                      instance_prompt_options[:default_security_groups] = scoped_instance_config['securityGroups'] ? scoped_instance_config['securityGroups'] : nil
+                      
                       instance_prompt_options[:no_prompt] = options[:no_prompt]
                       #instance_prompt_options[:always_prompt] = options[:no_prompt] != true # options[:always_prompt]
                       instance_prompt_options[:options] = scoped_instance_config # meh, actually need to make these default values instead..
                       #instance_prompt_options[:options][:always_prompt] = instance_prompt_options[:no_prompt] != true
                       instance_prompt_options[:options][:no_prompt] = instance_prompt_options[:no_prompt]
-
                       # also allow arbritrary options passed as tierName.instanceIndex like Web.0.instance.layout.id=75
                       instance_extra_options = {}
                       if tier_extra_options && tier_extra_options[instance_index.to_s]
@@ -402,6 +413,7 @@ class Morpheus::Cli::Apps
                       help_field_prefix = "#{tier_name}.#{instance_index}" 
                       instance_prompt_options[:help_field_prefix] = help_field_prefix
                       instance_prompt_options[:options][:help_field_prefix] = help_field_prefix
+                      instance_prompt_options[:locked_fields] = scoped_instance_config['lockedFields']
                       # this provisioning helper method handles all (most) of the parsing and prompting
                       instance_config_payload = prompt_new_instance(instance_prompt_options)
                       
@@ -414,6 +426,7 @@ class Morpheus::Cli::Apps
                       final_config.delete('environments')
                       final_config.delete('groups')
                       final_config.delete('clouds')
+                      final_config.delete('lockedFields')
                       # add config to payload
                       payload['tiers'][tier_name]['instances'] ||= []
                       payload['tiers'][tier_name]['instances'] << final_config
@@ -531,7 +544,12 @@ class Morpheus::Cli::Apps
       rescue TypeError, JSON::ParserError => ex
         print_error red, "Failed to parse JSON response: #{ex}", reset, "\n"
       end
-
+      # The default way to print errors, except instances => []
+      (json_response['errors'] || {}).each do |error_key, error_msg|
+        if error_key != 'instances'
+          print_error red, " * #{error_key} : #{error_msg}", reset, "\n"
+        end
+      end
       # looks for special error format like instances.instanceErrors 
       if json_response['errors'] && json_response['errors']['instances']
         json_response['errors']['instances'].each do |error_obj|
@@ -545,13 +563,6 @@ class Morpheus::Cli::Apps
             end
           end
         end
-      else
-        # a default way to print errors
-        (json_response['errors'] || {}).each do |error_key, error_msg|
-          if error_key != 'instances'
-            print_error red, " * #{error_key} : #{error_msg}", reset, "\n"
-          end
-        end
       end
       exit 1
     end
@@ -613,6 +624,7 @@ class Morpheus::Cli::Apps
         "Description" => 'description',
         "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : '' },
         "Group" => lambda {|it| it['group'] ? it['group']['name'] : it['siteId'] },
+        "Environment" => lambda {|it| it['appContext'] },
         "Account" => lambda {|it| it['account'] ? it['account']['name'] : '' },
         "Tiers" => lambda {|it| 
           # it['instanceCount']
@@ -1938,6 +1950,7 @@ class Morpheus::Cli::Apps
         id: app['id'],
         name: app['name'],
         group: app['group'] ? app['group']['name'] : app['siteId'],
+        environment: app['appContext'],
         tiers: tiers_str,
         instances: instances_str,
         containers: containers_str,
@@ -1954,6 +1967,7 @@ class Morpheus::Cli::Apps
       :id,
       :name,
       :group,
+      :environment,
       :tiers,
       :instances,
       :containers,
@@ -2025,24 +2039,6 @@ class Morpheus::Cli::Apps
     return @available_blueprints
   end
 
-  def get_available_environments(refresh=false)
-    if !@available_environments || refresh
-      # results = @options_interface.options_for_source('environments',{})
-      # @available_environments = results['data'].collect {|it|
-      #   {"id" => it["value"], "name" => it["name"], "value" => it["value"]}
-      # }
-      # todo: api call
-      @available_environments = [
-        {'name' => 'Dev', 'value' => 'Dev'},
-        {'name' => 'Test', 'value' => 'Test'},
-        {'name' => 'Staging', 'value' => 'Staging'},
-        {'name' => 'Production', 'value' => 'Production'}
-      ]
-    end
-    #puts "get_available_environments() rtn: #{@available_environments.inspect}"
-    return @available_environments
-  end
-
   def find_blueprint_by_name_or_id(val)
     if val.to_s =~ /\A\d{1,}\Z/
       return find_blueprint_by_id(val)

data/lib/morpheus/cli/blueprints_command.rb

@@ -1733,7 +1733,7 @@ class Morpheus::Cli::BlueprintsCommand
       else
         print_h1 "Available Tiers"
         if tiers.empty?
-          print yellow,"No tiers found.",reset,"\n"
+          print cyan,"No tiers found.",reset,"\n"
         else
           print cyan
           tiers.each do |tier_name|

data/lib/morpheus/cli/budgets_command.rb

@@ -46,7 +46,7 @@ class Morpheus::Cli::BudgetsCommand
         subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
         if budgets.empty?
-          print yellow,"No budgets found.",reset,"\n"
+          print cyan,"No budgets found.",reset,"\n"
         else
           columns = [
             {"ID" => lambda {|budget| budget['id'] } },
@@ -264,7 +264,7 @@ class Morpheus::Cli::BudgetsCommand
           print red,"Failed to render budget summary.",reset,"\n"
         end
       else
-        print yellow,"No budget stat data found.",reset,"\n"
+        print cyan,"No budget stat data found.",reset,"\n"
       end
       return 0
     rescue RestClient::Exception => e

data/lib/morpheus/cli/change_password_command.rb

@@ -56,7 +56,6 @@ class Morpheus::Cli::ChangePasswordCommand
 
     connect(options)
     @current_remote = @appliance_name ? ::Morpheus::Cli::Remote.load_remote(@appliance_name) : ::Morpheus::Cli::Remote.load_active_remote()
-    puts "args is #{args}"
     begin
       if args[0]
         username = args[0]

data/lib/morpheus/cli/cli_command.rb

@@ -258,8 +258,8 @@ module Morpheus
           case option_key.to_sym
 
           when :account
-            opts.on('-a','--account ACCOUNT', "Account Name") do |val|
-              options[:account_name] = val
+            opts.on('-a','--account ACCOUNT', "Account Name or ID") do |val|
+              options[:account] = val
             end
             opts.on('-A','--account-id ID', "Account ID") do |val|
               options[:account_id] = val
@@ -602,18 +602,28 @@ module Morpheus
             end
 
           when :fields
-            opts.on('-f', '--fields x,y,z', Array, "Filter Output to a limited set of fields. Default is all fields.") do |val|
-              options[:include_fields] = val
+            opts.on('-f', '--fields x,y,z', Array, "Filter Output to a limited set of fields. Default is all fields for json,csv,yaml.") do |val|
+              if val.size == 1 && val[0].downcase == 'all'
+                options[:all_fields] = true
+              else
+                options[:include_fields] = val
+              end
             end
             opts.on('-F', '--old-fields x,y,z', Array, "alias for -f, --fields") do |val|
-              options[:include_fields] = val
+              if val.size == 1 && val[0].downcase == 'all'
+                options[:all_fields] = true
+              else
+                options[:include_fields] = val
+              end
             end
-            opts.on(nil, '--all-fields', "Show all fields. Useful for showing hidden columns on wide tables.") do
+            opts.add_hidden_option('-F,') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.on(nil, '--all-fields', "Show all fields present in the data.") do
               options[:all_fields] = true
             end
-            opts.add_hidden_option('--all-fields') if opts.is_a?(Morpheus::Cli::OptionParser)
-            opts.add_hidden_option('-F,') if opts.is_a?(Morpheus::Cli::OptionParser)
-
+            #opts.add_hidden_option('--all-fields') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.on(nil, '--wrap', "Wrap table columns instead hiding them when terminal is not wide enough.") do
+              options[:responsive_table] = false
+            end
           when :thin
             opts.on( '--thin', '--thin', "Format headers and columns with thin borders." ) do |val|
               options[:border_style] = :thin

data/lib/morpheus/cli/clouds.rb

@@ -12,7 +12,7 @@ class Morpheus::Cli::Clouds
   include Morpheus::Cli::InfrastructureHelper
   include Morpheus::Cli::ProvisioningHelper
 
-  register_subcommands :list, :count, :get, :add, :update, :remove, :security_groups, :apply_security_groups, :types => :list_cloud_types
+  register_subcommands :list, :count, :get, :add, :update, :remove, :refresh, :security_groups, :apply_security_groups, :types => :list_cloud_types
   register_subcommands :wiki, :update_wiki
   #register_subcommands :firewall_disable, :firewall_enable
   alias_subcommand :details, :get
@@ -335,12 +335,11 @@ class Morpheus::Cli::Clouds
       json_response = @clouds_interface.create(payload)
       cloud = json_response['zone']
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
-        #list([])
-        get([cloud["id"]])
+        get([cloud['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -405,12 +404,11 @@ class Morpheus::Cli::Clouds
       end
       json_response = @clouds_interface.update(cloud['id'], payload)
       if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
+        puts as_json(json_response, options)
       else
-        #list([])
-        get([cloud["id"]])
+        get([cloud['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
       end
+      return 0
     rescue RestClient::Exception => e
       print_rest_exception(e, options)
       exit 1
@@ -458,6 +456,105 @@ class Morpheus::Cli::Clouds
     end
   end
 
+  def refresh(args)
+    options = {}
+    query_params = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name] [options]")
+      opts.on( '-f', '--force', "Force Delete" ) do
+        query_params[:force] = 'true'
+      end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Refresh a cloud." + "\n" +
+                    "[cloud] is required. This is the name or id of a cloud."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      cloud = find_cloud_by_name_or_id(args[0])
+      return 1 if cloud.nil?
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!(passed_options) unless passed_options.empty?
+      else
+        payload = {}
+        payload.deep_merge!(passed_options) unless passed_options.empty?
+      end
+      @clouds_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clouds_interface.dry.refresh(cloud['id'], query_params, payload)
+        return
+      end
+      json_response = @clouds_interface.refresh(cloud['id'], query_params, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Refreshing cloud #{cloud['name']}..."
+        #get([cloud['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  # not exposed yet, refresh should be all that's needed.
+  def sync(args)
+    options = {}
+    query_params = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[name] [options]")
+      opts.on( '-f', '--force', "Force Delete" ) do
+        query_params[:force] = 'true'
+      end
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
+      opts.footer = "Sync a cloud." + "\n" +
+                    "[cloud] is required. This is the name or id of a cloud."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    connect(options)
+    begin
+      cloud = find_cloud_by_name_or_id(args[0])
+      return 1 if cloud.nil?
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!(passed_options) unless passed_options.empty?
+      else
+        payload = {}
+        payload.deep_merge!(passed_options) unless passed_options.empty?
+      end
+      @clouds_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clouds_interface.dry.sync(cloud['id'], query_params, payload)
+        return
+      end
+      json_response = @clouds_interface.sync(cloud['id'], query_params, payload)
+      if options[:json]
+        puts as_json(json_response, options)
+      else
+        print_green_success "Syncing cloud #{cloud['name']}..."
+        #get([cloud['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def firewall_disable(args)
     options = {}
     clear_or_secgroups_specified = false
@@ -643,7 +740,7 @@ class Morpheus::Cli::Clouds
       print_h1 title, subtitles
 
       if cloud_types.empty?
-        print yellow,"No cloud types found.",reset,"\n"
+        print cyan,"No cloud types found.",reset,"\n"
       else
         print cyan
         cloud_types = cloud_types.select {|it| it['enabled'] }