morpheus-cli 6.2.0 → 6.2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b786730f8b5d75b4fd3de84dbb6ab27b91a65302ac7d5a9087d5a2a6c69f4d27
-  data.tar.gz: e4750a00de745628f98534029f776e497263e14cc228435c0f27d24f9a4203bd
+  metadata.gz: 7c3a197cce2be26fa8c5920d9dcfb367edab10b100b645c02b171ce830e2eb7f
+  data.tar.gz: f8467d902d52c8238d3edeae9cf2c6a57eab41e693b76a2742230a9635aa7403
 SHA512:
-  metadata.gz: ab990dbe303e1bc744dde6b02c30bab0431f5a7d87a731c758173132973d3dad1b0b61937156a2d378075ee1d9088b55c63887bff673fc78d7bded01f390c943
-  data.tar.gz: e56666973915b9020de7715fe42cadaf62391af1c9bbecd50c06b125ddfe16beb6e86f07d4610ceefe961c97b215e8f7c790c24c0eda6d72b72bd3158d80afe1
+  metadata.gz: 74ffa8dc07f0960f05790ae69568fbf9ae0b1afbe68bf7b8fea8dd532bd79a6cbafad4e1893c899b41fdef2c48fcb063d539f475b976ec72419279b77e312ce6
+  data.tar.gz: 7f512bfd99104a127d8e2f67976ad3f221ae9a3c35cf6dd70f7c6002f5b0fe494c961570cdb40ace71abbc3ccff2d09b3a3b582089fc83355da4d95f1fddf9d4

data/Dockerfile

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

data/lib/morpheus/api/monitoring_settings_interface.rb

@@ -18,8 +18,4 @@ class Morpheus::MonitoringSettingsInterface < Morpheus::APIClient
     execute(method: :put, url: "#{base_path}/service-now", payload: payload, params: params, headers: headers)
   end
 
-  def update_new_relic(payload, params={}, headers={})
-    execute(method: :put, url: "#{base_path}/new-relic", payload: payload, params: params, headers: headers)
-  end
-
 end

data/lib/morpheus/api/service_catalog_interface.rb

@@ -46,22 +46,22 @@ class Morpheus::ServiceCatalogInterface < Morpheus::APIClient
   end
 
   # update cart (set cart name)
-  def update_cart(payload, params={})
+  def update_cart(params, payload)
     execute(method: :put, url: "#{base_path}/cart", params: params, payload: payload.to_json)
   end
 
   # validate a new item, can be used before before adding it
-  def validate_cart_item(payload, params={})
+  def validate_cart_item(params, payload)
     execute(method: :post, url: "#{base_path}/cart/items/validate", params: params, payload: payload.to_json)
   end
 
   # add item to cart
-  def create_cart_item(payload, params={})
+  def create_cart_item(params, payload)
     execute(method: :post, url: "#{base_path}/cart/items", params: params, payload: payload.to_json)
   end
 
   # update item in the cart
-  def update_cart_item(id, payload, params={})
+  def update_cart_item(id, params, payload)
     validate_id!(id)
     execute(method: :put, url: "#{base_path}/cart/items/#{id}", params: params, payload: payload.to_json)
   end
@@ -73,7 +73,7 @@ class Morpheus::ServiceCatalogInterface < Morpheus::APIClient
   end
 
   # place order with cart
-  def checkout(payload, params={})
+  def checkout(params, payload)
     execute(method: :post, url: "#{base_path}/checkout", params: params, payload: payload.to_json)
   end
 
@@ -83,7 +83,7 @@ class Morpheus::ServiceCatalogInterface < Morpheus::APIClient
   end
 
   # create an order from scratch, without using a cart
-  def create_order(payload, params={})
+  def create_order(params, payload)
     execute(method: :post, url: "#{base_path}/orders", params: params, payload: payload.to_json)
   end
 end

data/lib/morpheus/cli/cli_command.rb

@@ -1552,7 +1552,10 @@ module Morpheus
           payloads.each do |payload|
             apply_options(payload, options, object_key) unless options[:apply_options] == false
           end
-        else
+        #else
+        # should always do this, but a lot of methods rely on this returning nil right now, not {}
+        # so for now only do it if block is given
+        elsif block_given?
           # yield to block to construct the payload, 
           # this is typically where prompting for inputs with optionTypes happens
           payload = {}

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

@@ -259,7 +259,8 @@ EOT
     connect(options)
     backup_job = find_backup_job_by_name_or_id(args[0])
     return 1 if backup_job.nil?
-    parse_payload(options)
+    parse_payload(options) do |payload|
+    end
     execute_api(@backup_jobs_interface, :execute_job, [backup_job['id']], options, 'job') do |json_response|
       print_green_success "Executing backup job #{backup_job['name']}"
       # should get the result maybe, or could even support refreshing until it is complete...

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

@@ -305,7 +305,8 @@ EOT
     connect(options)
     backup = find_backup_by_name_or_id(args[0])
     return 1 if backup.nil?
-    parse_payload(options)
+    parse_payload(options) do |payload|
+    end
     execute_api(@backups_interface, :execute_backup, [backup['id']], options, 'backup') do |json_response|
       print_green_success "Executing backup #{backup['name']}"
       # should get the result maybe, or could even support refreshing until it is complete...

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

@@ -39,7 +39,6 @@ class Morpheus::Cli::MonitoringSettings
     render_response(json_response, options, 'monitoringSettings') do
       monitoring_settings = json_response['monitoringSettings']
       service_now_settings = monitoring_settings['serviceNow']
-      new_relic_settings = monitoring_settings['newRelic']
       print_h1 "Monitoring Settings"
       print cyan
       description_cols = {
@@ -61,13 +60,6 @@ class Morpheus::Cli::MonitoringSettings
           "Critical Mapping" => lambda {|it| format_service_now_mapping(it['criticalMapping']) },
         }
         print_description_list(description_cols, service_now_settings)
-
-        print_h2 "New Relic Settings", options.merge(:border_style => :thin)
-        description_cols = {
-          "Enabled" => lambda {|it| format_boolean(it['enabled']) },
-          "License Key" => lambda {|it| it['licenseKey'] },
-        }
-        print_description_list(description_cols, new_relic_settings, options)
       
       print reset, "\n"
     end
@@ -139,14 +131,6 @@ class Morpheus::Cli::MonitoringSettings
         params['serviceNow'] ||= {}
         params['serviceNow']['criticalMapping'] = val
       end
-      opts.on('--new-relic-enabled [on|off]', String, "New Relic: Enabled (on) or disabled (off)") do |val|
-        params['newRelic'] ||= {}
-        params['newRelic']['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
-      end
-      opts.on("--new-relic-license-key [VALUE]", String, "New Relic: License Key") do |val|
-        params['newRelic'] ||= {}
-        params['newRelic']['licenseKey'] = val
-      end
       build_standard_update_options(opts, options)
       opts.footer = "Update monitoring settings."
     end

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

@@ -65,7 +65,8 @@ EOT
     verify_args!(args:args, optparse:optparse, count:0)
     connect(options)
     params.merge!(parse_query_options(options))
-    payload = parse_payload(options)
+    payload = parse_payload(options) do |data|
+    end
     @plugins_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @plugins_interface.dry.check_updates(payload, params)

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

@@ -1206,7 +1206,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       exit 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
 
       cloud = nil
       if !do_all
@@ -1355,7 +1355,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       instance_type = nil
       if !do_all
         instance_type = find_instance_type_by_name(instance_type_name)
@@ -1504,7 +1504,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       blueprint_global_access = role_json['globalAppTemplateAccess'] || role_json['globalBlueprintAccess']
       blueprint_permissions = role_json['appTemplatePermissions'] || role_json['blueprintPermissions'] || []
 
@@ -1666,7 +1666,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       catalog_item_type_global_access = role_json['globalCatalogItemTypeAccess']
       catalog_item_type_permissions = role_json['catalogItemTypePermissions'] || role_json['catalogItemTypes'] []
 
@@ -1821,7 +1821,7 @@ Update default persona access for a role.
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       
       # no lookup right now, pass the code serviceCatalog|standard
       persona_code = persona_id
@@ -1963,7 +1963,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       vdi_pool_global_access = role_json['globalVdiPoolAccess']
       vdi_pool_permissions = role_json['vdiPoolPermissions'] || role_json['vdiPools'] || []
 
@@ -2119,7 +2119,7 @@ EOT
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       report_type_global_access = role_json['globalReportTypeAccess']
       report_type_permissions = role_json['reportTypePermissions'] || role_json['reportTypes'] || []
 
@@ -2273,7 +2273,7 @@ Update default task access for a role.
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       task_permissions = role_json['taskPermissions'] || role_json['tasks'] || []
 
       # hacky, but support name or code lookup via the list returned in the show payload
@@ -2425,7 +2425,7 @@ Update default workflow access for a role.
       role = find_role_by_name_or_id(account_id, name)
       return 1 if role.nil?
 
-      role_json = @roles_interface.get(account_id, role['id'])
+      role_json = @roles_interface.get(account_id, role['id'], {'includeDefaultAccess' => true})
       workflow_permissions = role_json['taskSetPermissions'] || role_json['taskSets'] || []
 
       # hacky, but support name or code lookup via the list returned in the show payload

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

@@ -871,7 +871,7 @@ EOT
     
     @service_catalog_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run @service_catalog_interface.dry.checkout(payload)
+      print_dry_run @service_catalog_interface.dry.checkout(params, payload)
       return
     end
 
@@ -889,7 +889,7 @@ EOT
     unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to checkout and place an order?")
       return 9, "aborted command"
     end
-    json_response = @service_catalog_interface.checkout(payload, params)
+    json_response = @service_catalog_interface.checkout(params, payload)
     render_response(json_response, options) do
       print_green_success "Order placed"
       # ok so this is delayed because list does not return all statuses right now..

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

@@ -158,7 +158,8 @@ EOT
         "Login URL" => lambda {|it| it['loginURL'] },
         "Default Role" => lambda {|it| it['defaultAccountRole'] ? it['defaultAccountRole']['authority'] : '' },
         "External Login" => lambda {|it| format_boolean it['externalLogin'] },
-        "Allow Custom Mappings" => lambda {|it| format_boolean it['allowCustomMappings'] },
+        "Enable Role Mapping Permission" => lambda {|it| format_boolean it['allowCustomMappings'] },
+        "Manual Role Assignment" => lambda {|it| it['manualRoleAssignment'].nil? ? '' : format_boolean(it['manualRoleAssignment']) },
         "Active" => lambda {|it| format_boolean it['active'] },
       }
       print_description_list(description_cols, user_source)
@@ -235,13 +236,27 @@ EOT
       opts.on('--description VALUE', String, "Description") do |val|
         params['description'] = val
       end
-      opts.on("--allow-custom-mappings [on|off]", ['on','off'], "Allow Custom Mappings, Enable Role Mapping Permissions") do |val|
+      opts.on("--allow-custom-mappings [on|off]", ['on','off'], "Enable Role Mapping Permissions") do |val|
         params['allowCustomMappings'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      opts.on("--allowCustomMappings [on|off]", ['on','off'], "Allow Custom Mappings, Enable Role Mapping Permissions") do |val|
+      opts.on("--allowCustomMappings [on|off]", ['on','off'], "Enable Role Mapping Permissions") do |val|
         params['allowCustomMappings'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       opts.add_hidden_option('--allowCustomMappings')
+      opts.on("--manual-role-assignment [on|off]", ['on','off'], "Manual Role Assignment") do |val|
+        params['manualRoleAssignment'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on("--manualRoleAssignment [on|off]", ['on','off'], "Manual Role Assignment") do |val|
+        params['manualRoleAssignment'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.add_hidden_option('--manualRoleAssignment')
+      opts.on("--manual-role-assignment [on|off]", ['on','off'], "Manual Role Assignment") do |val|
+        params['manualRoleAssignment'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.on("--manualRoleAssignment [on|off]", ['on','off'], "Manual Role Assignment") do |val|
+        params['manualRoleAssignment'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
+      end
+      opts.add_hidden_option('--manualRoleAssignment')
       opts.on('--role-mappings MAPPINGS', String, "Role Mappings FQN in the format id1:FQN1,id2:FQN2") do |val|
         role_mappings = {}
         val.split(',').collect {|it| it.strip.split(':') }.each do |pair|
@@ -386,14 +401,22 @@ EOT
         end
         payload['userSource']['defaultAccountRole'] = {'id' => default_role_id }
 
-        # Allow Custom Mappings
+        # Enable Role Mapping Permissions
         if !params['allowCustomMappings'].nil?
           payload['userSource']['allowCustomMappings'] = ["on","true"].include?(params['allowCustomMappings'].to_s)
         else
-          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowCustomMappings', 'type' => 'checkbox', 'fieldLabel' => 'Allow Custom Mappings', 'defaultValue' => false}], options[:options])
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'allowCustomMappings', 'type' => 'checkbox', 'fieldLabel' => 'Enable Role Mapping Permissions', 'defaultValue' => false}], options[:options])
           payload['userSource']['allowCustomMappings'] = ["on","true"].include?(v_prompt['allowCustomMappings'].to_s)
         end
 
+        # Manual Role Assignment
+        if !params['manualRoleAssignment'].nil?
+          payload['userSource']['manualRoleAssignment'] = ["on","true"].include?(params['allowCustomMappings'].to_s)
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'manualRoleAssignment', 'type' => 'checkbox', 'fieldLabel' => 'Manual Role Assignment', 'defaultValue' => false}], options[:options])
+          payload['userSource']['manualRoleAssignment'] = ["on","true"].include?(v_prompt['manualRoleAssignment'].to_s)
+        end
+
         if role_mappings
           payload['roleMappings'] = role_mappings
         end
@@ -435,10 +458,10 @@ EOT
       opts.on('--description VALUE', String, "Description") do |val|
         params['description'] = val
       end
-      opts.on("--allow-custom-mappings [on|off]", ['on','off'], "Allow Custom Mappings, Enable Role Mapping Permissions") do |val|
+      opts.on("--allow-custom-mappings [on|off]", ['on','off'], "Enable Role Mapping Permissions") do |val|
         params['allowCustomMappings'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
-      opts.on("--allowCustomMappings [on|off]", ['on','off'], "Allow Custom Mappings, Enable Role Mapping Permissions") do |val|
+      opts.on("--allowCustomMappings [on|off]", ['on','off'], "Enable Role Mapping Permissions") do |val|
         params['allowCustomMappings'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s == '1' || val.to_s == ''
       end
       opts.add_hidden_option('--allowCustomMappings')
@@ -493,11 +516,16 @@ EOT
           payload['userSource']['description'] = params['description']
         end
         
-        # Allow Custom Mappings
+        # Enable Role Mapping Permissions
         if !params['allowCustomMappings'].nil?
           payload['userSource']['allowCustomMappings'] = params['allowCustomMappings']
         end
 
+        # Manual Role Assignment
+        if !params['manualRoleAssignment'].nil?
+          payload['userSource']['manualRoleAssignment'] = params['manualRoleAssignment']
+        end
+
         if role_mappings
           payload['roleMappings'] = role_mappings
         end

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.2.0"
+    VERSION = "6.2.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.2.0
+  version: 6.2.1.1
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-17 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler