morpheus-cli 3.4.1.10 → 3.5.1

data/lib/morpheus/cli/echo_command.rb

@@ -11,7 +11,7 @@ class Morpheus::Cli::Echo
   set_command_hidden
 
   unless defined?(DEFAULT_VARIABLE_MAP)
-    DEFAULT_VARIABLE_MAP = {'%cyan' => Term::ANSIColor.cyan, '%magenta' => Term::ANSIColor.magenta, '%red' => Term::ANSIColor.red, '%green' => Term::ANSIColor.green, '%yellow' => Term::ANSIColor.yellow, '%dark' => Term::ANSIColor.dark, '%reset' => Term::ANSIColor.reset}
+    DEFAULT_VARIABLE_MAP = {'%cyan' => Term::ANSIColor.cyan, '%magenta' => Term::ANSIColor.magenta, '%red' => Term::ANSIColor.red, '%green' => Term::ANSIColor.green, '%yellow' => Term::ANSIColor.yellow, '%white' => Term::ANSIColor.white, '%dark' => Term::ANSIColor.dark, '%reset' => Term::ANSIColor.reset}
   end
 
   def self.variable_map

data/lib/morpheus/cli/library_option_lists_command.rb

@@ -129,25 +129,38 @@ class Morpheus::Cli::LibraryOptionListsCommand
         # print_h2 "Initial Dataset"
         # print bright_black,"#{option_type_list['initialDataset']}","\n",reset
       else
-        print_description_list({
+        option_list_columns = {
           "ID" => 'id',
           "Name" => 'name',
           "Description" => 'description',
           "Type" => lambda {|it| it['type'].to_s.capitalize },
           "Source URL" => 'sourceUrl',
+          "Real Time" => lambda {|it| format_boolean it['realTime'] },
           "Ignore SSL Errors" => lambda {|it| format_boolean it['ignoreSSLErrors'] },
-          "Source Method" => lambda {|it| it['sourceMethod'].to_s.upcase },
-        }, option_type_list)
+          "Source Method" => lambda {|it| it['sourceMethod'].to_s.upcase }
+        }
+        source_headers = []
+        if option_type_list['config'] && option_type_list['config']['sourceHeaders']
+          source_headers = option_type_list['config']['sourceHeaders'].collect do |header|
+            {name: header['name'], value: header['value'], masked: format_boolean(header['masked'])}
+          end
+          #option_list_columns["Source Headers"] = lambda {|it| source_headers.collect {|it| "#{it[:name]} #{it[:value]}"}.join("\n") }
+        end
+        print_description_list(option_list_columns, option_type_list)
+        if source_headers && !source_headers.empty?
+          print cyan
+          print_h2 "Source Headers"
+          print as_pretty_table(source_headers, [:name, :value, :masked])
+        end
         if !option_type_list['initialDataset'].empty?
           print_h2 "Initial Dataset"
-          print bright_black,"  #{option_type_list['initialDataset']}","\n",reset
+          print bright_black,"#{option_type_list['initialDataset']}","\n",reset
         end
         if !option_type_list['translationScript'].empty?
           print_h2 "Translation Script"
-          print bright_black,"  #{option_type_list['translationScript']}","\n",reset
+          print bright_black,"#{option_type_list['translationScript']}","\n",reset
         end
       end
-
       print_h2 "List Items"
       if option_type_list['listItems']
         # puts "\tNAME\tVALUE"
@@ -181,7 +194,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
         # options[:options]['type'] = val
       end
       build_option_type_options(opts, options, new_option_type_list_option_types())
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     
@@ -192,13 +205,31 @@ class Morpheus::Cli::LibraryOptionListsCommand
 
     connect(options)
     begin
-      params = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(list_type), options[:options], @api_client, options[:params])
-      if params.key?('required')
-        params['required'] = ['on','true'].include?(params['required'].to_s)
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        if options[:options]
+          payload['optionTypeList'] ||= {}
+          payload['optionTypeList'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+      else
+        params = Morpheus::Cli::OptionTypes.prompt(new_option_type_list_option_types(list_type), options[:options], @api_client, options[:params])
+        params['type'] = list_type
+        if params['type'] == 'rest'
+          # prompt for Source Headers
+          source_headers = prompt_source_headers(options)
+          if !source_headers.empty?
+            params['config'] ||= {}
+            params['config']['sourceHeaders'] = source_headers
+          end
+        end
+        if params.key?('required')
+          params['required'] = ['on','true'].include?(params['required'].to_s)
+        end
+        list_payload = params
+        payload = {'optionTypeList' => list_payload}
       end
-      params['type'] = list_type
-      list_payload = params
-      payload = {'optionTypeList' => list_payload}
       if options[:dry_run]
         print_dry_run @option_type_lists_interface.dry.create(payload)
         return
@@ -227,7 +258,7 @@ class Morpheus::Cli::LibraryOptionListsCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, update_option_type_list_option_types())
-      build_common_options(opts, options, [:options, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :remote])
     end
     optparse.parse!(args)
     connect(options)
@@ -235,20 +266,39 @@ class Morpheus::Cli::LibraryOptionListsCommand
       option_type_list = find_option_type_list_by_name_or_id(args[0])
       exit 1 if option_type_list.nil?
 
-      list_type = option_type_list['type']
-      prompt_options = update_option_type_list_option_types(list_type)
-      #params = options[:options] || {}
-      params = Morpheus::Cli::OptionTypes.no_prompt(prompt_options, options[:options], @api_client, options[:params])
-      if params.empty?
-        print_red_alert "Specify atleast one option to update"
-        puts optparse
-        exit 1
-      end
-      if params.key?('required')
-        params['required'] = ['on','true'].include?(params['required'].to_s)
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        if options[:options]
+          payload['optionTypeList'] ||= {}
+          payload['optionTypeList'].deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) })
+        end
+      else
+        list_type = option_type_list['type']
+        prompt_options = update_option_type_list_option_types(list_type)
+        #params = options[:options] || {}
+        params = Morpheus::Cli::OptionTypes.no_prompt(prompt_options, options[:options], @api_client, options[:params])
+        if list_type == 'rest'
+          # parse Source Headers
+          source_headers = prompt_source_headers(options.merge({no_prompt: true}))
+          if !source_headers.empty?
+            #params['config'] ||= option_type_list['config'] || {}
+            params['config'] ||= {}
+            params['config']['sourceHeaders'] = source_headers
+          end
+        end
+        if params.empty?
+          print_red_alert "Specify atleast one option to update"
+          puts optparse
+          exit 1
+        end
+        if params.key?('required')
+          params['required'] = ['on','true'].include?(params['required'].to_s)
+        end
+        list_payload = params
+        payload = {'optionTypeList' => list_payload}
       end
-      list_payload = params
-      payload = {optionTypeList: list_payload}
       if options[:dry_run]
         print_dry_run @option_type_lists_interface.dry.update(option_type_list['id'], payload)
         return
@@ -446,9 +496,10 @@ class Morpheus::Cli::LibraryOptionListsCommand
         #{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => get_available_option_list_types, 'defaultValue' => 'rest', 'required' => true, 'displayOrder' => 3},
         {'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' => 4},
         {'fieldName' => 'ignoreSSLErrors', 'fieldLabel' => 'Ignore SSL Errors', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 5},
-        {'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 6},
-        {'fieldName' => 'initialDataset', 'fieldLabel' => 'Initial Dataset', 'type' => 'code-editor', 'description' => "Create an initial json dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'. However, if there is a translation script, that will also be passed through.", 'displayOrder' => 7},
-        {'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 8},
+        {'fieldName' => 'realTime', 'fieldLabel' => 'Real Time', 'type' => 'checkbox', 'defaultValue' => 'off', 'displayOrder' => 6},
+        {'fieldName' => 'sourceMethod', 'fieldLabel' => 'Source Method', 'type' => 'select', 'selectOptions' => [{'name' => 'GET', 'value' => 'GET'}, {'name' => 'POST', 'value' => 'POST'}], 'defaultValue' => 'GET', 'required' => true, 'displayOrder' => 7},
+        {'fieldName' => 'initialDataset', 'fieldLabel' => 'Initial Dataset', 'type' => 'code-editor', 'description' => "Create an initial json dataset to be used as the collection for this option list. It should be a list containing objects with properties 'name', and 'value'. However, if there is a translation script, that will also be passed through.", 'displayOrder' => 8},
+        {'fieldName' => 'translationScript', 'fieldLabel' => 'Translation Script', 'type' => 'code-editor', 'description' => "Create a js script to translate the result data object into an Array containing objects with properties name, and value. The input data is provided as data and the result should be put on the global variable results.", 'displayOrder' => 9},
       ]
     elsif list_type.to_s.downcase == 'manual'
       [
@@ -473,4 +524,32 @@ class Morpheus::Cli::LibraryOptionListsCommand
     list
   end
 
+  # returns array of header objects {name: "Auth", value: "somevalue", masked: false}
+  def prompt_source_headers(options={})
+    #puts "Source Headers:"
+    no_prompt = (options[:no_prompt] || (options[:options] && options[:options][:no_prompt]))
+    source_headers = []
+    source_header_index = 0
+    has_another_source_header = options[:options] && options[:options]["sourceHeader#{source_header_index}"]
+    add_another_source_header = has_another_source_header || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add a Source Header?", {default: false}))
+    while add_another_source_header do
+      field_context = "sourceHeader#{source_header_index}"
+      source_header = {}
+      source_header['id'] = nil
+      source_header_label = source_header_index == 0 ? "Header" : "Header [#{source_header_index+1}]"
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'name', 'type' => 'text', 'fieldLabel' => "#{source_header_label} Name", 'required' => true, 'description' => 'HTTP Header Name.', 'defaultValue' => source_header['name']}], options[:options])
+      source_header['name'] = v_prompt[field_context]['name']
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'value', 'type' => 'text', 'fieldLabel' => "#{source_header_label} Value", 'required' => true, 'description' => 'HTTP Header Value', 'defaultValue' => source_header['value']}], options[:options])
+      source_header['value'] = v_prompt[field_context]['value']
+      v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldContext' => field_context, 'fieldName' => 'masked', 'type' => 'checkbox', 'fieldLabel' => "#{source_header_label} Masked", 'required' => true, 'description' => 'Header value is secret and should not be displayed', 'defaultValue' => source_header['masked'] ? 'yes' : 'no'}], options[:options])
+      source_header['masked'] = v_prompt[field_context]['masked'] if !v_prompt[field_context]['masked'].nil?
+      source_headers << source_header
+      source_header_index += 1
+      has_another_source_header = options[:options] && options[:options]["sourceHeader#{source_header_index}"]
+      add_another_source_header = has_another_source_header || (!no_prompt && Morpheus::Cli::OptionTypes.confirm("Add another Source Header?", {default: false}))
+    end
+
+    return source_headers
+  end
+
 end

data/lib/morpheus/cli/policies_command.rb

@@ -6,10 +6,12 @@ require 'filesize'
 require 'table_print'
 require 'morpheus/cli/cli_command'
 require 'morpheus/cli/mixins/infrastructure_helper'
+require 'morpheus/cli/mixins/accounts_helper'
 
 class Morpheus::Cli::PoliciesCommand
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::InfrastructureHelper
+  include Morpheus::Cli::AccountsHelper
 
   set_command_name :policies
 
@@ -31,6 +33,7 @@ class Morpheus::Cli::PoliciesCommand
     @cloud_policies_interface = @api_client.cloud_policies
     @clouds_interface = @api_client.clouds
     @groups_interface = @api_client.groups
+    @users_interface = @api_client.users
     @active_group_id = Morpheus::Cli::Groups.active_groups[@appliance_name]
   end
 
@@ -49,22 +52,32 @@ class Morpheus::Cli::PoliciesCommand
       opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID" ) do |val|
         options[:cloud] = val
       end
-      opts.on( '-G', '--global', "Exclude policies scoped to a group or cloud" ) do
+      opts.on( '-u', '--user USER', "Username or ID" ) do |val|
+        options[:user] = val
+      end
+      opts.on( '-G', '--global', "Global policies only" ) do
         params[:global] = true
       end
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :json, :dry_run, :remote])
       opts.footer = "List policies."
     end
     optparse.parse!(args)
     connect(options)
     begin
-      group, cloud = nil, nil
+      group, cloud, user = nil, nil, nil
       if options[:group]
         group = find_group_by_name_or_id(options[:group])
       elsif options[:cloud]
         cloud = find_cloud_by_name_or_id(options[:cloud])
+      elsif options[:user]
+        user = find_user_by_username_or_id(nil, options[:user])
+        return 1 if user.nil?
       end
       params.merge!(parse_list_options(options))
+      if user
+        params['refType'] = 'User'
+        params['refId'] = user['id']
+      end
       if options[:dry_run]
         if group
           print_dry_run @group_policies_interface.dry.list(group['id'], params)
@@ -72,6 +85,10 @@ class Morpheus::Cli::PoliciesCommand
           print_dry_run @cloud_policies_interface.dry.list(cloud['id'], params)
         else
           # global
+          if user
+            params['refType'] = 'User'
+            params['refId'] = user['id']
+          end
           print_dry_run @policies_interface.dry.list(params)
         end
         return 0
@@ -103,6 +120,9 @@ class Morpheus::Cli::PoliciesCommand
       if cloud
         subtitles << "Cloud: #{cloud['name']}".strip
       end
+      if user
+        subtitles << "User: #{user['username']}".strip
+      end
       if params[:global]
         subtitles << "(Global)".strip
       end
@@ -129,15 +149,16 @@ class Morpheus::Cli::PoliciesCommand
             #for: ref_str,
             group: policy['site'] ? policy['site']['name'] : '',
             cloud: policy['zone'] ? policy['zone']['name'] : '',
+            user: policy['user'] ? policy['user']['username'] : '',
             tenants: truncate_string(format_tenants(policy['accounts']), 15),
             config: truncate_string(config_str, 50),
             enabled: policy['enabled'] ? 'Yes' : 'No',
           }
           row
         }
-        columns = [:id, :name, :description, :group, :cloud, :tenants, :type, :config, :enabled]
-        if group || cloud
-          columns = [:id, :description, :type, :config]
+        columns = [:id, :name, :description, :group, :cloud, :user, :tenants, :type, :config, :enabled]
+        if group || cloud || user
+          columns = columns - [:group, :cloud, :user]
         end
         if options[:include_fields]
           columns = options[:include_fields]
@@ -159,6 +180,15 @@ class Morpheus::Cli::PoliciesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[policy]")
+      opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
+        options[:group] = val
+      end
+      opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID" ) do |val|
+        options[:cloud] = val
+      end
+      # opts.on( '-u', '--user USER', "Username or ID" ) do |val|
+      #   options[:user] = val
+      # end
       build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "Get details about a policy." + "\n" +
                     "[policy] is required. This is the id of a policy."
@@ -171,15 +201,38 @@ class Morpheus::Cli::PoliciesCommand
     end
     connect(options)
     begin
+      group, cloud, user = nil, nil, nil
+      if options[:group]
+        group = find_group_by_name_or_id(options[:group])
+        return 1 if group.nil?
+      elsif options[:cloud]
+        cloud = find_cloud_by_name_or_id(options[:cloud])
+        return 1 if cloud.nil?
+      elsif options[:user]
+        user = find_user_by_username_or_id(nil, options[:user])
+        return 1 if user.nil?
+      end
       if options[:dry_run]
         if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @policies_interface.dry.get(args[0].to_i)
+          if group
+            print_dry_run @group_policies_interface.dry.get(group['id'], args[0].to_i)
+          elsif cloud
+            print_dry_run @cloud_policies_interface.dry.get(cloud['id'], args[0].to_i)
+          else
+            print_dry_run @policies_interface.dry.get(args[0].to_i)
+          end
         else
-          print_dry_run @policies_interface.dry.list({name:args[0]})
+          if group
+            print_dry_run @group_policies_interface.dry.list(group['id'], {name:args[0]})
+          elsif cloud
+            print_dry_run @cloud_policies_interface.dry.list(cloud['id'], {name:args[0]})
+          else
+            print_dry_run @policies_interface.dry.list({name:args[0]})
+          end
         end
         return
       end
-      policy = find_policy_by_name_or_id(args[0])
+      policy = find_policy_by_name_or_id(args[0], {cloud:cloud,group:group})
       return 1 if policy.nil?
       json_response = {'policy' => policy}  # skip redundant request
       # json_response = @policies_interface.get(policy['id'])
@@ -203,12 +256,12 @@ class Morpheus::Cli::PoliciesCommand
         "Type" => lambda {|it| it['policyType'] ? it['policyType']['name'] : '' },
         "Group" => lambda {|it| it['site'] ? it['site']['name'] : '' },
         "Cloud" => lambda {|it| it['zone'] ? it['zone']['name'] : '' },
-        "Enabled" => lambda {|it| it['enabled'] ? 'Yes' : 'No' },
         # "All Accounts" => lambda {|it| it['allAccounts'] ? 'Yes' : 'No' },
         # "Ref Type" => 'refType',
         # "Ref ID" => 'refId',
         # "Owner" => lambda {|it| it['owner'] ? it['owner']['name'] : '' },
         "Tenants" => lambda {|it| format_tenants(policy["accounts"]) },
+        "Enabled" => lambda {|it| it['enabled'] ? 'Yes' : 'No' }
       }
       print_description_list(description_cols, policy)
       # print reset,"\n"
@@ -235,6 +288,9 @@ class Morpheus::Cli::PoliciesCommand
       opts.on( '-c', '--cloud CLOUD', "Cloud Name or ID, for scoping the policy to a cloud" ) do |val|
         options[:cloud] = val
       end
+      opts.on( '-u', '--user USER', "Username or ID, for scoping the policy to a user" ) do |val|
+        options[:user] = val
+      end
       opts.on('-t', '--type ID', "Policy Type Name or ID") do |val|
         options['type'] = val
       end
@@ -263,7 +319,7 @@ class Morpheus::Cli::PoliciesCommand
       opts.on('--config-file FILE', String, "Policy Config from a local JSON or YAML file") do |val|
         options['configFile'] = val.to_s
       end
-      build_common_options(opts, options, [:options, :json, :dry_run, :quiet, :remote])
+      build_common_options(opts, options, [:options, :payload, :json, :dry_run, :quiet, :remote])
       opts.footer = "Create a new policy." + "\n" +
                     "[name] is optional and can be passed as --name instead."
     end
@@ -275,118 +331,134 @@ class Morpheus::Cli::PoliciesCommand
     end
     connect(options)
     begin
-      group, cloud = nil, nil
-      if options[:group]
-        group = find_group_by_name_or_id(options[:group])
-      elsif options[:cloud]
-        cloud = find_cloud_by_name_or_id(options[:cloud])
-      end
-
-      # merge -O options into normally parsed options
-      options.deep_merge!(options[:options]) if options[:options] && options[:options].keys.size > 0
-      
-      # support [name] as first argument
-      if args[0]
-        options['name'] = args[0]
-      end
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        # support -O OPTION switch on top of --payload
+        payload.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options]
+      else
+        group, cloud, user = nil, nil, nil
+        if options[:group]
+          group = find_group_by_name_or_id(options[:group])
+        elsif options[:cloud]
+          cloud = find_cloud_by_name_or_id(options[:cloud])
+        elsif options[:user]
+          user = find_user_by_username_or_id(nil, options[:user])
+          return 1 if user.nil?
+        end
 
-      # construct payload
-      payload = {
-        'policy' => {
-          'config' => {}
-        }
-      }
-      
-      # prompt for policy options
+        # merge -O options into normally parsed options
+        options.deep_merge!(options[:options].reject {|k,v| k.is_a?(Symbol) }) if options[:options] && options[:options].keys.size > 0
+        
+        # support [name] as first argument
+        if args[0]
+          options['name'] = args[0]
+        end
 
-      # Policy Type
-      # allow user as id, name or code
-      available_policy_types = @policies_interface.list_policy_types({})['policyTypes']
-      if available_policy_types.empty?
-        print_red_alert "No available policy types found!"
-        return 1
-      end
-      policy_types_dropdown = available_policy_types.collect {|it| {'name' => it['name'], 'value' => it['id']} }
-      policy_type_id = nil
-      policy_type = nil
-      if options['type']
-        policy_type_id = options['type']
-      else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Policy Type', 'type' => 'select', 'selectOptions' => policy_types_dropdown, 'required' => true, 'description' => 'Choose a policy type.'}], options[:options])
-        policy_type_id = v_prompt['type']
-      end
-      if !policy_type_id.to_s.empty?
-        policy_type = available_policy_types.find {|it| 
-          it['id'] == policy_type_id.to_i || it['name'] == policy_type_id.to_s || it['code'] == policy_type_id.to_s
+        # construct payload
+        payload = {
+          'policy' => {
+            'config' => {}
+          }
         }
-      end
-      if !policy_type
-        print_red_alert "Policy Type not found by id '#{policy_type_id}'"
-        return 1
-      end
-      # payload['policy']['policyTypeId'] = policy_type['id']
-      payload['policy']['policyType'] = {'id' => policy_type['id']}
-
-      # Name (this is not even used at the moment!)
-      if options['name']
-        payload['policy']['name'] = options['name']
-      else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => false, 'description' => 'Name for this policy.'}], options)
-        payload['policy']['name'] = v_prompt['name']
-      end
+        
+        # prompt for policy options
+
+        # Policy Type
+        # allow user as id, name or code
+        available_policy_types = @policies_interface.list_policy_types({})['policyTypes']
+        if available_policy_types.empty?
+          print_red_alert "No available policy types found!"
+          return 1
+        end
+        policy_types_dropdown = available_policy_types.collect {|it| {'name' => it['name'], 'value' => it['id']} }
+        policy_type_id = nil
+        policy_type = nil
+        if options['type']
+          policy_type_id = options['type']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'type', 'fieldLabel' => 'Policy Type', 'type' => 'select', 'selectOptions' => policy_types_dropdown, 'required' => true, 'description' => 'Choose a policy type.'}], options[:options])
+          policy_type_id = v_prompt['type']
+        end
+        if !policy_type_id.to_s.empty?
+          policy_type = available_policy_types.find {|it| 
+            it['id'] == policy_type_id.to_i || it['name'] == policy_type_id.to_s || it['code'] == policy_type_id.to_s
+          }
+        end
+        if !policy_type
+          print_red_alert "Policy Type not found by id '#{policy_type_id}'"
+          return 1
+        end
+        # payload['policy']['policyTypeId'] = policy_type['id']
+        payload['policy']['policyType'] = {'id' => policy_type['id']}
 
-      # Description (this is not even used at the moment!)
-      if options['description']
-        payload['policy']['description'] = options['description']
-      else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'description' => 'Description of policy.'}], options)
-        payload['policy']['description'] = v_prompt['description']
-      end
+        # Scope
+        if user
+          payload['policy']['refType'] = 'User'
+          payload['policy']['refId'] = user['id']
+        end
 
-      # Enabled
-      if options['enabled']
-        payload['policy']['enabled'] = options['enabled']
-      else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'description' => 'Can be used to disable a policy', 'defaultValue' => true}], options)
-        payload['policy']['enabled'] = v_prompt['enabled']
-      end
+        # Name (this is not even used at the moment!)
+        if options['name']
+          payload['policy']['name'] = options['name']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => false, 'description' => 'Name for this policy.'}], options)
+          payload['policy']['name'] = v_prompt['name']
+        end
 
-      # Tenants
-      if options['accounts']
-        # payload['policy']['accounts'] = options['accounts'].collect {|it| {'id' => it } }
-        payload['policy']['accounts'] = options['accounts']
-      else
-        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'accounts', 'fieldLabel' => 'Tenants', 'type' => 'text', 'required' => false, 'description' => 'Tenant accounts, comma separated list of account IDs'}], options)
-        payload['policy']['accounts'] = v_prompt['accounts']
-      end
+        # Description (this is not even used at the moment!)
+        if options['description']
+          payload['policy']['description'] = options['description']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false, 'description' => 'Description of policy.'}], options)
+          payload['policy']['description'] = v_prompt['description']
+        end
 
-      # Config
-      if options['config']
-        payload['policy']['config'] = options['config']
-      elsif options['configFile']
-        config_file = File.expand_path(options['configFile'])
-        if !File.exists?(config_file) || !File.file?(config_file)
-          print_red_alert "File not found: #{config_file}"
-          return false
+        # Enabled
+        if options['enabled']
+          payload['policy']['enabled'] = options['enabled']
+        else
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'required' => false, 'description' => 'Can be used to disable a policy', 'defaultValue' => true}], options)
+          payload['policy']['enabled'] = v_prompt['enabled']
         end
-        if config_file =~ /\.ya?ml\Z/
-          payload['policy']['config'] = YAML.load_file(config_file)
+
+        # Tenants
+        if options['accounts']
+          # payload['policy']['accounts'] = options['accounts'].collect {|it| {'id' => it } }
+          payload['policy']['accounts'] = options['accounts']
         else
-          payload['policy']['config'] = JSON.parse(File.read(config_file))
+          v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'accounts', 'fieldLabel' => 'Tenants', 'type' => 'text', 'required' => false, 'description' => 'Tenant accounts, comma separated list of account IDs'}], options)
+          payload['policy']['accounts'] = v_prompt['accounts']
         end
-      else
-        # prompt for policy specific options
-        policy_type_option_types = policy_type['optionTypes']
-        # puts "POLICY OPTION TYPES:\n #{policy_type_option_types.inspect}"
-        if policy_type_option_types
-          config_prompt = Morpheus::Cli::OptionTypes.prompt(policy_type_option_types, options, @api_client)
-          # everything should be under fieldContext:'config'
-          # payload['policy'].deep_merge!(config_prompt)
-          if config_prompt['config']
-            payload['policy']['config'].deep_merge!(config_prompt['config'])
+
+        # Config
+        if options['config']
+          payload['policy']['config'] = options['config']
+        elsif options['configFile']
+          config_file = File.expand_path(options['configFile'])
+          if !File.exists?(config_file) || !File.file?(config_file)
+            print_red_alert "File not found: #{config_file}"
+            return false
+          end
+          if config_file =~ /\.ya?ml\Z/
+            payload['policy']['config'] = YAML.load_file(config_file)
+          else
+            payload['policy']['config'] = JSON.parse(File.read(config_file))
           end
         else
-          puts "No options found for policy type! Proceeding without config options..."
+          # prompt for policy specific options
+          policy_type_option_types = policy_type['optionTypes']
+          # puts "POLICY OPTION TYPES:\n #{policy_type_option_types.inspect}"
+          if policy_type_option_types
+            config_prompt = Morpheus::Cli::OptionTypes.prompt(policy_type_option_types, options, @api_client)
+            # everything should be under fieldContext:'config'
+            # payload['policy'].deep_merge!(config_prompt)
+            if config_prompt['config']
+              payload['policy']['config'].deep_merge!(config_prompt['config'])
+            end
+          else
+            puts "No options found for policy type! Proceeding without config options..."
+          end
         end
       end
 
@@ -762,17 +834,26 @@ class Morpheus::Cli::PoliciesCommand
 
   private
 
-  def find_policy_by_name_or_id(val)
+  def find_policy_by_name_or_id(val, scope_by={})
     if val.to_s =~ /\A\d{1,}\Z/
-      return find_policy_by_id(val)
+      return find_policy_by_id(val, scope_by)
     else
-      return find_policy_by_name(val)
+      return find_policy_by_name(val, scope_by)
     end
   end
 
-  def find_policy_by_id(id)
+  def find_policy_by_id(id, scope_by={})
     begin
-      json_response = @policies_interface.get(id.to_i)
+      group = scope_by[:group]
+      cloud = scope_by[:cloud]
+      json_response = nil
+      if group
+        json_response = @group_policies_interface.get(group['id'], id.to_i)
+      elsif cloud
+        json_response = @cloud_policies_interface.get(cloud['id'], id.to_i)
+      else
+        json_response = @policies_interface.get(id.to_i)
+      end
       return json_response['policy']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404
@@ -784,8 +865,17 @@ class Morpheus::Cli::PoliciesCommand
     end
   end
 
-  def find_policy_by_name(name)
-    json_response = @policies_interface.list({name: name.to_s})
+  def find_policy_by_name(name, scope_by={})
+    group = scope_by[:group]
+    cloud = scope_by[:cloud]
+    json_response = nil
+    if group
+      json_response = @group_policies_interface.list(group['id'], {name: name.to_s})
+    elsif cloud
+      json_response = @cloud_policies_interface.list(cloud['id'], {name: name.to_s})
+    else
+      json_response = @policies_interface.list({name: name.to_s})
+    end
     policies = json_response['policies']
     if policies.empty?
       print_red_alert "Policy not found by name #{name}"