morpheus-cli 8.0.12.2 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '06781ec23df17a4185834c843d6b756bc28c9ec2239dd0c97647c8d2d67addc5'
-  data.tar.gz: c075335c0e1b772e6f8a4bf35fc1186b9cf2abc18ebec73c23b19b0c4283c0c8
+  metadata.gz: f058297ee2bc6b9cc1dac3f97bb2aad27785687af9283e89b5275b101a126145
+  data.tar.gz: 21f00f181e173a464d579d2f6368d12fbe9880530d01fd59cebc40775eb9af78
 SHA512:
-  metadata.gz: f6819ce4ebee4828c06dc23001532103dfbad397dc77de82c1846dbd3078f49e68c3ef84dcea19af82c38abb46b032de20c140babc38f5559457b24a40f7ef85
-  data.tar.gz: 8970d7c663daf582e01eacbfd12eb9a965f74f91813bf296fac2f49f6cb069b5c1ab6dd233578127516c5f8a84d56e646e12d6a0f23ea4229fc8aae9a8e58265
+  metadata.gz: fea8e30a0ff487c060873ca4ba6a3d4af91c52f819e6956675d653dc57c330d495b2f27b9d821e7314da332573acb8bf6bc17380a283fe1404a80789eebda5b0
+  data.tar.gz: 8d5fb8b37a542e13f5e9656e2d355b9224ed51ede6a4e749620b3dbdf059a3449b2b09e64c4d97a0b2458469d99508dbf3029a158c1a234a72736ccdc7b6437f

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 8.0.12.2
+RUN gem install morpheus-cli -v 8.1.0
 
 ENTRYPOINT ["morpheus"]

data/bin/morpheus

@@ -2,11 +2,14 @@
 require 'morpheus'
 
 # arguments
-args = ARGV
+args = ARGV.dup
 
-# input pipe
-# append piped data as arguments
-if !$stdin.tty?
+# input pipe: only read stdin as arguments when --stdin is explicitly passed.
+# Previously stdin was always consumed when not a TTY, which caused morpheus
+# invoked inside a piped bash script (e.g. base64 -d <<< <script> | bash -l)
+# to consume the remaining script lines as CLI arguments (MORPH-6237).
+# Usage: echo 42 | morpheus instances get --stdin
+if args.delete('--stdin') && !$stdin.tty?
   pipe_data = $stdin.read
   if pipe_data
     args += pipe_data.split

data/lib/morpheus/api/api_client.rb

@@ -412,6 +412,14 @@ class Morpheus::APIClient
     Morpheus::ServersInterface.new(common_interface_options).setopts(@options)
   end
 
+  def systems
+    Morpheus::SystemsInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def system_types
+    Morpheus::SystemTypesInterface.new(common_interface_options).setopts(@options)
+  end
+
   def server_devices
     Morpheus::ServerDevicesInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/roles_interface.rb

@@ -118,6 +118,20 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def update_cluster_type(account_id, id, options)
+    url = build_url(account_id, id) + "/update-cluster-type"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def validate(account_id, options, params={})
+    url = "#{@base_url}/api/roles/validate"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :post, url: url, headers: headers, payload: payload.to_json, params: params)
+  end
+
   private
 
   def build_url(account_id=nil, role_id=nil)

data/lib/morpheus/api/system_types_interface.rb

@@ -0,0 +1,13 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::SystemTypesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/infrastructure/system-types"
+  end
+
+  def list_layouts(type_id, params = {})
+    execute(method: :get, url: "#{base_path}/#{type_id}/layouts", params: params)
+  end
+
+end

data/lib/morpheus/api/systems_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::SystemsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/infrastructure/systems"
+  end
+
+end

data/lib/morpheus/cli/commands/backups_command.rb

@@ -528,6 +528,8 @@ EOT
     {
       "ID" => 'id',
       "Name" => 'name',
+      "Type" => lambda {|it| format_backup_type_tag(it) },
+      "Location" => lambda {|it| format_backup_location_tag(it) },
       "Schedule" => lambda {|it| it['schedule']['name'] rescue '' },
       "Backup Job" => lambda {|it| it['job']['name'] rescue '' },
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
@@ -539,6 +541,8 @@ EOT
     {
       "ID" => 'id',
       "Name" => 'name',
+      "Backup Type" => lambda {|it| format_backup_type_tag(it) },
+      "Backup Location" => lambda {|it| format_backup_location_tag(it) },
       "Location Type" => lambda {|it| 
         if it['locationType'] == "instance"
           "Instance"
@@ -589,6 +593,33 @@ EOT
     "#{result['backup']['name']} (#{format_local_dt(result['startDate'])})"
   end
 
+  # format backup type tag (manual or policy-based)
+  def format_backup_type_tag(backup)
+    # check if backup has a schdule or job associated with it
+    # manual backups typically dont have a schedule while policy-based do
+    if backup['cronExpression'] || (backup['schedule'] && backup['schedule']['id'])
+      "#{cyan}POLICY#{reset}"
+    elsif backup['job'] && backup['job']['id']
+      "#{cyan}POLICY#{reset}"
+    else
+      "#{yellow}MANUAL#{reset}"
+    end
+  end
+
+  # format backup location tag (local or remote)
+  def format_backup_location_tag(backup)
+    # check storage provider or backup provider indicating remote storage
+    if backup['storageProvider'] && backup['storageProvider']['id']
+      provider_type = backup['storageProvider']['type'] || backup['storageProvider']['providerType'] || ''
+      "#{green}REMOTE#{reset} (#{provider_type})"
+    elsif backup['backupProvider'] && backup['backupProvider']['id']
+      provider_type = backup['backupProvider']['type'] || backup['backupProvider']['providerType'] || ''
+      "#{green}REMOTE#{reset} (#{provider_type})"
+    else
+      "#{blue}LOCAL#{reset}"
+    end
+  end
+
   # prompt for an instance config (vdiPool.instanceConfig)
   def prompt_restore_instance_config(options)
     # use config if user passed one in..

data/lib/morpheus/cli/commands/catalog_item_types_command.rb

@@ -316,9 +316,8 @@ EOT
         parse_result = parse_json_or_yaml(file_content)
         config_map = parse_result[:data]
         if config_map.nil?
-          # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
-          #raise_command_error "Failed to parse config as valid YAML or JSON."
+          params['config'] = file_content
+          Morpheus::Logging::DarkPrinter.puts "Failed to parse config as JSON or YAML. Defaulting to String."
         else
           params['config'] = config_map
           options[:options]['config'] = params['config'] # or file_content
@@ -386,9 +385,8 @@ EOT
         parse_result = parse_json_or_yaml(config)
         config_map = parse_result[:data]
         if config_map.nil?
-          # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
-          #raise_command_error "Failed to parse config as valid YAML or JSON."
+          params['config'] = config
+          Morpheus::Logging::DarkPrinter.puts "Failed to parse config as JSON or YAML. Defaulting to String."
         else
           params['config'] = config_map
         end
@@ -466,9 +464,8 @@ EOT
         parse_result = parse_json_or_yaml(file_content)
         config_map = parse_result[:data]
         if config_map.nil?
-          # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
-          #raise_command_error "Failed to parse config as valid YAML or JSON."
+          params['config'] = file_content
+          Morpheus::Logging::DarkPrinter.puts "Failed to parse config as JSON or YAML. Defaulting to String."
         else
           params['config'] = config_map
           options[:options]['config'] = params['config'] # or file_content
@@ -529,9 +526,8 @@ EOT
         parse_result = parse_json_or_yaml(config)
         config_map = parse_result[:data]
         if config_map.nil?
-          # todo: bubble up JSON.parse error message
-          raise_command_error "Failed to parse config as YAML or JSON. Error: #{parse_result[:error]}"
-          #raise_command_error "Failed to parse config as valid YAML or JSON."
+          params['config'] = config
+          Morpheus::Logging::DarkPrinter.puts "Failed to parse config as JSON or YAML. Defaulting to String."
         else
           params['config'] = config_map
         end

data/lib/morpheus/cli/commands/clusters.rb

@@ -499,7 +499,7 @@ class Morpheus::Cli::Clusters
 
         # Group / Site
         group = load_group(cluster_type['code'], options)
-        cluster_payload['group'] = {'id' => group['id']}
+        cluster_payload['group'] = {'id' => group['id']} if group
 
         # Cluster Name
         if args.empty? && options[:no_prompt]
@@ -561,19 +561,19 @@ class Morpheus::Cli::Clusters
 
         # Cloud / Zone
         cloud_id = nil
-        cloud = options[:cloud] ? find_cloud_by_name_or_id_for_provisioning(group['id'], options[:cloud]) : nil
+        cloud = options[:cloud] ? find_cloud_by_name_or_id_for_provisioning(group ? group['id'] : nil, options[:cloud]) : nil
         if cloud
           # load full cloud
           cloud = @clouds_interface.get(cloud['id'])['zone']
           cloud_id = cloud['id']
         else
-          available_clouds = get_available_clouds(group['id'], {groupType: cluster_payload['type']})
+          available_clouds = get_available_clouds(group ? group['id'] : nil, {groupType: cluster_payload['type']})
 
           if available_clouds.empty?
-            print_red_alert "Group #{group['name']} has no available clouds"
+            print_red_alert group ? "Group #{group['name']} has no available clouds" : "No available clouds"
             exit 1
           else
-            cloud_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => available_clouds, 'required' => true, 'description' => 'Select Cloud.'}],options[:options],@api_client,{groupId: group['id']})['cloud']
+            cloud_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'cloud', 'type' => 'select', 'fieldLabel' => 'Cloud', 'selectOptions' => available_clouds, 'required' => true, 'description' => 'Select Cloud.'}],options[:options],@api_client,{groupId: group ? group['id'] : nil})['cloud']
           end
           cloud = @clouds_interface.get(cloud_id)['zone']
         end
@@ -598,7 +598,7 @@ class Morpheus::Cli::Clusters
         # 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'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}
+        api_params = {zoneId: cloud['id'], siteId: group ? group['id'] : nil, layoutId: layout['id'], groupTypeId: cluster_type['id'], provisionType: provision_type['code'], provisionTypeId: provision_type['id']}.compact
 
         # Service Plan
         service_plan = prompt_service_plan(api_params, options)
@@ -809,7 +809,7 @@ class Morpheus::Cli::Clusters
           elsif server_payload['sshHosts'].is_a?(Array)
             server_payload['sshHosts'] = server_payload['sshHosts'].collect {|it| it.is_a?(String) ? {"ip" => it} : it }
           end
-
+          server_payload['sshHosts'] = server_payload['sshHosts'].flatten
           # inject the optionalNames array into the sshHosts if present
           if server_payload['optionalNames']
             optional_names = server_payload['optionalNames'].is_a?(String) ? server_payload['optionalNames'].split(",") : [server_payload['optionalNames']].flatten
@@ -1344,7 +1344,7 @@ class Morpheus::Cli::Clusters
         server_payload['labels'] = labels if labels
 
         # Cloud
-        available_clouds = options_interface.options_for_source('clouds', {groupId: cluster['site']['id'], clusterId: cluster['id'], ownerOnly: true})['data']
+        available_clouds = options_interface.options_for_source('clouds', {groupId: cluster['site'] ? cluster['site']['id'] : nil, clusterId: cluster['id'], ownerOnly: true}.compact)['data']
         cloud_id = nil
 
         if options[:cloud]
@@ -1366,12 +1366,12 @@ class Morpheus::Cli::Clusters
         # resources (zone pools)
         cloud = @clouds_interface.get(cloud_id)['zone']
         cloud['zoneType'] = get_cloud_type(cloud['zoneType']['id'])
-        group = @groups_interface.get(cluster['site']['id'])['group']
+        group = cluster['site'] ? @groups_interface.get(cluster['site']['id'])['group'] : nil
         provision_type = server_type['provisionType'] || {}
         provision_type = @provision_types_interface.get(provision_type['id'])['provisionType'] if !provision_type.nil?
         
         server_payload['cloud'] = {'id' => cloud_id}
-        service_plan = prompt_service_plan({zoneId: cloud_id, siteId: cluster['site']['id'], provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id'], }, options)
+        service_plan = prompt_service_plan({zoneId: cloud_id, siteId: group ? group['id'] : nil, provisionTypeId: server_type['provisionType']['id'], groupTypeId: cluster_type['id']}.compact, options)
 
         if service_plan
           server_payload['plan'] = {'code' => service_plan['code']}
@@ -1420,7 +1420,7 @@ class Morpheus::Cli::Clusters
         metadata_option_type = cluster_type['optionTypes'].find {|type| type['fieldName'] == 'metadata' }
         option_type_list = option_type_list.reject {|type| type['fieldName'] == 'metadata' }
 
-        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {zoneId: cloud['id'], siteId: group['id'], layoutId: layout['id']}))
+        server_payload.deep_merge!(Morpheus::Cli::OptionTypes.prompt(option_type_list, options[:options], @api_client, {zoneId: cloud['id'], siteId: group ? group['id'] : nil, layoutId: layout['id']}.compact))
 
         # Metadata Tags
         if metadata_option_type
@@ -4751,11 +4751,15 @@ class Morpheus::Cli::Clusters
           print_red_alert "No available groups"
           exit 1
         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']
+          group_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'group', 'type' => 'select', 'fieldLabel' => 'Group', 'selectOptions' => available_groups, 'required' => false, 'description' => 'Select Group.'}],options[:options],@api_client,{})['group']
         end
       end
     end
-    @groups_interface.get(group_id)['group']
+    if group_id
+      return @groups_interface.get(group_id)['group']
+    else 
+      return nil
+    end
   end
 
   def prompt_service_plan(api_params, options)
@@ -4948,7 +4952,7 @@ class Morpheus::Cli::Clusters
       resource_pool = options[:resourcePool] ? find_cloud_resource_pool_by_name_or_id(cloud['id'], options[:resourcePool]) : nil
 
       if !resource_pool
-        resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group['id'], zoneId: cloud['id']}.merge(service_plan ? {planId: service_plan['id']} : {}))['data'].reject { |it| it['id'].nil? && it['name'].nil? }
+        resource_pool_options = @options_interface.options_for_source('zonePools', {groupId: group ? group['id'] : nil, zoneId: cloud['id'], planId: service_plan ? service_plan['id'] : nil}).compact['data'].reject { |it| it['id'].nil? && it['name'].nil? }
 
         if resource_pool_options.empty?
           print yellow,bold, "Cloud #{cloud['name']} has no available resource pools",reset,"\n\n"

data/lib/morpheus/cli/commands/library_option_lists_command.rb

@@ -171,11 +171,17 @@ class Morpheus::Cli::LibraryOptionListsCommand
           "Credentials" => lambda {|it| it['credential'] ? (it['credential']['type'] == 'local' ? '(Local)' : it['credential']['name']) : nil },
           "Username" => 'serviceUsername',
           "Password" => 'servicePassword',
+          "Inject System Auth Header" => lambda {|it| format_boolean it['injectExecutionLeaseAuth'] },
+          "Use Owner Authorization"   => lambda {|it| format_boolean it['useOwnerAuth'] }
         }
         option_list_columns.delete("API Type") if option_type_list['type'] != 'api'
         option_list_columns.delete("Credentials") if !['rest','ldap'].include?(option_type_list['type']) # || !(option_type_list['credential'] && option_type_list['credential']['id'])
         option_list_columns.delete("Username") if !['rest','ldap'].include?(option_type_list['type']) || !(option_type_list['serviceUsername'])
         option_list_columns.delete("Password") if !['rest','ldap'].include?(option_type_list['type']) || !(option_type_list['servicePassword'])
+        option_list_columns.delete("Inject System Auth Header") if option_type_list['type'] != 'rest'
+        option_list_columns.delete("Use Owner Authorization")   if option_type_list['type'] != 'rest'
+        option_list_columns.delete("Inject System Auth Header") if option_type_list['type'] != 'rest'
+        option_list_columns.delete("Use Owner Authorization") if option_type_list['type'] != 'rest'
         source_headers = []
         if option_type_list['config'] && option_type_list['config']['sourceHeaders']
           source_headers = option_type_list['config']['sourceHeaders'].collect do |header|
@@ -291,7 +297,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
           end
         end
         # tweak payload for API
-        ['ignoreSSLErrors', 'realTime'].each { |k|
+        ['ignoreSSLErrors', 'realTime', 'injectExecutionLeaseAuth', 'useOwnerAuth'].each { |k|
           list_payload[k] = ['on','true'].include?(list_payload[k].to_s) if list_payload.key?(k)
         }
         payload.deep_merge!({'optionTypeList' => list_payload})
@@ -348,7 +354,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
           end
         end
         # tweak payload for API
-        ['ignoreSSLErrors', 'realTime'].each { |k|
+        ['ignoreSSLErrors', 'realTime', 'injectExecutionLeaseAuth', 'useOwnerAuth'].each { |k|
           list_payload[k] = ['on','true'].include?(list_payload[k].to_s) if list_payload.key?(k)
         }
         payload.deep_merge!({'optionTypeList' => list_payload})
@@ -437,6 +443,8 @@ class Morpheus::Cli::LibraryOptionListsCommand
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceUrl', 'fieldLabel' => 'Source Url', 'type' => 'text', 'required' => true, 'description' => "A REST URL can be used to fetch list data and is cached in the appliance database.", 'displayOrder' => 6},
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'ignoreSSLErrors', 'fieldLabel' => 'Ignore SSL Errors', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 7},
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => false, 'displayOrder' => 8},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'injectExecutionLeaseAuth', 'switch' => 'inject-execution-lease-auth', 'fieldLabel' => 'Inject System Auth Header', 'type' => 'checkbox', 'defaultValue' => false, 'description' => 'Injects an authorization header using a system lease token when making the REST call.', 'displayOrder' => 21},
+        {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'useOwnerAuth', 'switch' => 'use-owner-auth', 'fieldLabel' => 'Use Owner Authorization', 'type' => 'checkbox', 'defaultValue' => false, 'description' => 'Uses the authorization credentials of the owner of the option list.', 'displayOrder' => 22},
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 9},
         {'dependsOnCode' => 'optionTypeList.type:rest|ldap', 'fieldName' => 'credential', 'fieldLabel' => 'Credentials', 'type' => 'select', 'optionSource' => 'credentials', 'description' => 'Credential ID or use "local" to specify username and password', 'displayOrder' => 10, 'defaultValue' => "local", 'required' => true, :for_help_only => true}, # hacky way to render this but not prompt for it
         {'dependsOnCode' => 'optionTypeList.type:rest', 'fieldName' => 'serviceUsername', 'fieldLabel' => 'Username', 'type' => 'text', 'description' => "A Basic Auth Username for use when type is 'rest'.", 'displayOrder' => 11, "credentialFieldContext" => 'credential', "credentialFieldName" => 'username', "credentialType" => "username-password,oauth2"},