morpheus-cli 8.0.13 → 8.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad3ce7f814765f24cd6d8c0c54c234d6c745be616536a92b3005e127740f2d0
-  data.tar.gz: af0212f0f02ee8f85133c36790493e09542112e9e21ee183692cce150a029e29
+  metadata.gz: 1c5ef57fd8e0005ce881d8a2e8de0d8100e965447dd5e66dfded62ab50229c8a
+  data.tar.gz: 64705b005697dbab2f6b0c15fa58400182a8a2a063c5a99d93cb0364b101227c
 SHA512:
-  metadata.gz: 648640393d42c0a3dc358a198baf5c513cbf48e8c58202143974f7bbd15e2acc06f7cd3c35305a6404ddabb9ed0ee64c16c4beb84bbda588d7c03df4debca69d
-  data.tar.gz: 4a1b6e530ebcb825f2c1bc54e04ea29ad0ec249f1b3ddc65d1bfce2144db1f17c1389d2368ee9f4dbb4398f5be911b1509f418f6ee9a28c8c42bd1e4e95b3cc2
+  metadata.gz: feedeaf9d8c6241a0076af156b22182dc76ffb91feafbfd5fff9bae98016624f93400351d7fd37d4cb0fa16d42eb50444f5fd895d554bbb4214e6f8eb30c30e6
+  data.tar.gz: bbb9fb396e8b36bf35bf75a1afbcd08d3c0d000716486035c24d64a9540615a0de01e084ebce2dec11828d3345a5e9643b41c71b339bedbc92d17f8f79b10aa2

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.7.5
 
-RUN gem install morpheus-cli -v 8.0.13
+RUN gem install morpheus-cli -v 8.1.1
 
 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/image_builder_image_builds_interface.rb

@@ -2,58 +2,69 @@ require 'morpheus/api/api_client'
 # this may change to just /api/image-builds
 class Morpheus::ImageBuilderImageBuildsInterface < Morpheus::APIClient
 
+  def base_path
+    "#{@base_url}/api/image-builds"
+  end
+
   def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    url = "#{@base_url}/api/image-builds/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def list(params={})
-    url = "#{@base_url}/api/image-builds"
+    url = "#{base_path}"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)
   end
 
   def create(payload)
-    url = "#{@base_url}/api/image-builds"
+    url = "#{base_path}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   # def validate_save(payload)
-  #   url = "#{@base_url}/api/image-builds/validate-save"
+  #   url = "#{base_path}/validate-save"
   #   headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
   #   opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
   #   execute(opts)
   # end
 
   def update(id, payload)
-    url = "#{@base_url}/api/image-builds/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
   def destroy(id, params={})
-    url = "#{@base_url}/api/image-builds/#{id}"
+    url = "#{base_path}/#{id}"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :delete, url: url, headers: headers}
     execute(opts)
   end
 
   def run(id, params={})
-    url = "#{@base_url}/api/image-builds/#{id}/run"
+    url = "#{base_path}/#{id}/run"
     headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
     opts = {method: :post, url: url, headers: headers}
     execute(opts)
   end
 
   def list_executions(id, params={})
-    url = "#{@base_url}/api/image-builds/#{id}/list-executions"
+    url = "#{base_path}/#{id}/list-executions"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create_options(params={})
+    url = "#{base_path}/create-options"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
     execute(opts)

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,23 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::SystemsInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/infrastructure/systems"
+  end
+
+  def save_uninitialized(payload, params={}, headers={})
+    execute(method: :post, url: "#{base_path}/uninitialized", params: params, payload: payload, headers: headers)
+  end
+
+  def initialize_system(id, payload={}, params={}, headers={})
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{CGI::escape(id.to_s)}/initialize", params: params, payload: payload, headers: headers)
+  end
+
+  def validate_system(id, params={}, headers={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{CGI::escape(id.to_s)}/validate", params: params, headers: headers)
+  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/image_builder_command.rb

@@ -651,9 +651,9 @@ class Morpheus::Cli::ImageBuilderCommand
   private
 
   def get_available_image_build_types()
-    # todo: api call
     [
-      {'name' => 'VMware', 'code' => 'vmware', 'instanceType' => {'code' => 'vmware'}}
+      {'name' => 'VMware', 'code' => 'vmware', 'instanceType' => {'code' => 'vmware'}},
+      {'name' => 'KVM', 'code' => 'kvm', 'instanceType' => {'code' => 'kvm'}}
     ]
   end
 
@@ -663,17 +663,6 @@ class Morpheus::Cli::ImageBuilderCommand
     }
   end
 
-  def find_image_build_type(val)
-    if val.nil? || val.to_s.empty?
-      return nil
-    else
-      return get_available_image_build_types().find { |it| 
-        (it['code'].to_s.downcase == val.to_s.downcase) || 
-        (it['name'].to_s.downcase == val.to_s.downcase)
-      }
-    end
-  end
-
   def add_image_build_option_types(connected=true)
     [
       {'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_image_build_types_dropdown(), 'required' => true, 'description' => 'Choose the type of image build.'},
@@ -901,15 +890,28 @@ class Morpheus::Cli::ImageBuilderCommand
   def prompt_new_image_build(options={}, default_values={}, do_require=true)
     payload = {}
 
+    # load to create-options data for help with prompting
+    create_options = nil
+    begin
+      create_options = @image_builds_interface.create_options({})
+    rescue => ex
+      Morpheus::Logging::DarkPrinter.puts "Unable to load image build create options data" if Morpheus::Logging.debug?
+    end
     # Summary / Settings Tab
 
     # Image Build Type
+    image_build_types = nil
+    if create_options && create_options['imageBuildTypes']
+      image_build_types = create_options['imageBuildTypes'].collect {|it| it.merge({'value' => it['code']}) }
+    else
+      image_build_types = get_available_image_build_types_dropdown
+    end
     image_build_type = nil
     if options['type']
-      image_build_type = find_image_build_type(options['type'])
+      image_build_type = image_build_types.find { |it| (it['code'].to_s.downcase == options['type'].to_s.downcase) ||  (it['name'].to_s.downcase == options['type'].to_s.downcase) }
     else
-      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_image_build_types_dropdown(), 'required' => do_require, 'description' => 'Choose the type of image build.', 'defaultValue' => default_values['type'], :fmt=>:natural}], options, @api_client)
-      image_build_type = find_image_build_type(v_prompt['type'])
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => image_build_types, 'required' => do_require, 'description' => 'Choose the type of image build.', 'defaultValue' => default_values['type'], :fmt=>:natural}], options, @api_client)
+      image_build_type = Morpheus::Cli::OptionTypes.get_last_select()
     end
     if !image_build_type
       print_red_alert "Image Build Type not found!"

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"},