morpheus-cli 6.2.3 → 6.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5930c4f23cd2074b678db885c77f067ca32b305371cb93875a372b22a91fd18
-  data.tar.gz: 036f912c60e1f86ba302dc240cc1a485722ef0716752d934a352e54d797fd5d4
+  metadata.gz: 02effa7bdd51120b68b2253e21f9be4df3a3388424975e21ec4add33a6ad516e
+  data.tar.gz: 55ce2d5a93cce0ac5aa77ed3d993af5daa41fd3473bddeae773e6d18ac324442
 SHA512:
-  metadata.gz: c93378cfb509b11873be3d183f69bc5662fd5afb6888ea759271347e84f87443a73c9eb80a12572b1c196f1afe8ebf40068d00290053ebad398df5ee320d8446
-  data.tar.gz: 1c277dd0ff9b918b3c2dfd9fc7bc0c4ed662e59ba3fa10a4abf3d037ffc08211e0f0c7a040917ca1322dbc06610391f676560ec195ddd794ff50d2098658235b
+  metadata.gz: c8a17ab56472e03157c1e9d2fd2cbaf36dd98dbc4c0d06270b84dfd8b0064d93f2259206a0f6623dc2a51995cd0888ba7ea3785cbcf43936fe7998f4f54577b7
+  data.tar.gz: 3086104a09b6739bab99d963937dec66d8f1de208270aae3a7bb23374c3c848e1636e6bd7086f37dee0e259f6dc718e57b7a15213b615d37a985805fcc620f43

data/Dockerfile

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

data/README.md

@@ -58,6 +58,12 @@ While developing, you can quickly reload your code changes in a morpheus shell w
 morpheus shell
 ```
 
+or 
+
+```shell
+bundle exec morpheus shell —debug
+```
+
 Then to reload changes without restarting the morpheus shell (and the ruby process), use:
 
 ```shell

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

@@ -730,14 +730,13 @@ class Morpheus::Cli::Clusters
         server_payload['hostname'] = options[:hostname] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'hostname', 'fieldLabel' => 'Hostname', 'type' => 'text', 'required' => true, 'description' => 'Hostname', 'defaultValue' => resourceName}], options[:options], @api_client, api_params)['hostname']
 
         # Kube Default Repo
-        if cluster_payload['type'] == 'kubernetes-cluster' && (layout['clusterVersion'] == '1.28.x' || layout['clusterVersion'] == '1.27.x')
+        if cluster_payload['type'] == 'kubernetes-cluster'
           default_repo = options[:default_repo] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'defaultRepoAccount', 'fieldLabel' => 'Cluster Repo Account', 'type' => 'select', 'required' => false, 'optionSource' => 'dockerHubRegistries'}], options[:options], @api_client, api_params)['defaultRepoAccount']
           if default_repo != ""
             server_payload['config']['defaultRepoAccount'] = default_repo
           end
         end
 
-
         # Workflow / Automation
         if provision_type['code'] != 'manual' && controller_type && controller_type['hasAutomation']
           task_set_id = options[:taskSetId] || Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'taskSet', 'fieldLabel' => 'Workflow', 'type' => 'select', 'required' => false, 'optionSource' => 'taskSets'}], options[:options], @api_client, api_params.merge({'phase' => 'postProvision'}))['taskSet']

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

@@ -763,61 +763,49 @@ class Morpheus::Cli::PoliciesCommand
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.banner = subcommand_usage("[search]")
+      build_standard_list_options(opts, options, [], [:search])
+      opts.footer = <<-EOT
+Get details about a policy type.
+[policy-type] is required. This is Name or ID of a policy type.
+EOT
       opts.footer = "List policy types."
     end
     optparse.parse!(args)
-
-    if args.count != 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 0 and got #{args.count}\n#{optparse}"
-      return 1
-    end
-
+    verify_args!(args:args, optparse:optparse, count:0)
+    # if args.count > 0
+    #   options[:phrase] = args.join(" ")
+    # end
+    params.merge!(parse_list_options(options))
     connect(options)
-    begin
-      @policies_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @policies_interface.dry.list_policy_types(params)
-        return 0
-      end
-      json_response = @policies_interface.list_policy_types()
+    @policies_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @policies_interface.dry.list_policy_types(params)
+      return 0
+    end
+    json_response = @policies_interface.list_policy_types(params)
+    render_response(json_response, options, 'policyTypes') do
       policy_types = json_response['policyTypes']
-      if options[:json]
-        puts as_json(json_response, options, "policyTypes")
-        return 0
-      elsif options[:yaml]
-        puts as_yaml(json_response, options, "policyTypes")
-        return 0
-      elsif options[:csv]
-        puts records_as_csv(policy_types, options)
-        return 0
-      else
-        print_h1 "Morpheus Policy Types"
-        rows = policy_types.collect {|policy_type| 
-          row = {
-            id: policy_type['id'],
-            name: policy_type['name'],
-            code: policy_type['code'],
-            description: policy_type['description']
-          }
-          row
+      print_h1 "Morpheus Policy Types"
+      rows = policy_types.collect {|policy_type| 
+        row = {
+          id: policy_type['id'],
+          name: policy_type['name'],
+          code: policy_type['code'],
+          description: policy_type['description']
         }
-        columns = [:id, :name]
-        if options[:include_fields]
-          columns = options[:include_fields]
-        end
-        print cyan
-        print as_pretty_table(rows, columns, options)
-        print_results_pagination(json_response, {:label => "policy type", :n_label => "policy types"})
-        print reset, "\n"
+        row
+      }
+      columns = [:id, :name]
+      if options[:include_fields]
+        columns = options[:include_fields]
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
+      print cyan
+      print as_pretty_table(rows, columns, options)
+      print_results_pagination(json_response)
+      print reset, "\n"
     end
+    return 0
   end
 
   def get_type(args)
@@ -825,91 +813,54 @@ class Morpheus::Cli::PoliciesCommand
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[policy-type]")
-      build_common_options(opts, options, [:json, :dry_run, :remote])
-      opts.footer = "Get details about a policy type." + "\n" +
-                    "[policy-type] is required. This is ID of a policy type."
+      build_standard_get_options(opts, options)
+      opts.footer = <<-EOT
+Get details about a policy type.
+[policy-type] is required. This is Name or ID of a policy type.
+EOT
     end
     optparse.parse!(args)
-
-    if args.count != 1
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "wrong number of arguments, expected 1 and got #{args.count}\n#{optparse}"
-      return 1
-    end
-
+    verify_args!(args:args, optparse:optparse, count: 1)
     connect(options)
-    begin
-      policy_type_id = args[0].to_s
-      @policies_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @policies_interface.dry.get_policy_type(policy_type_id, params)
-        return 0
-      end
-      json_response = @policies_interface.get_policy_type(policy_type_id, params)
-      policy_type = json_response['policyType']
-      if options[:json]
-        puts as_json(json_response)
-      else
-        print_h1 "Policy Type Details"
-        print cyan
-        description_cols = {
-          "ID" => 'id',
-          "Name" => 'name',
-          # "Description" => 'description',
-          "Code" => 'code',
-          "Category" => 'category',
-          # "Load Method" => 'loadMethod',
-          # "Enforce Method" => 'enforceMethod',
-          # "Prepare Method" => 'prepareMethod',
-          # "Validate Method" => 'validateMethod',
-          "Provision Enforced" => lambda {|it| it['enforceOnProvision'] ? 'Yes' : 'No'  },
-          "Managed Enforced" => lambda {|it| it['enforceOnManaged'] ? 'Yes' : 'No'  },
-        }
-        print_description_list(description_cols, policy_type)
-        print reset,"\n"
-
-        # show option types
-        print_h2 "Policy Type Options"
-        policy_type_option_types = policy_type['optionTypes']
-        if !policy_type_option_types || policy_type_option_types.size() == 0
-          puts "No options found for policy type"
-        else
-          rows = policy_type_option_types.collect {|option_type|
-            field_str = option_type['fieldName'].to_s
-            if !option_type['fieldContext'].to_s.empty?
-              field_str = option_type['fieldContext'] + "." + field_str
-            end
-            description_str = option_type['description'].to_s
-            if option_type['helpBlock']
-              if description_str.empty?
-                description_str = option_type['helpBlock']
-              else
-                description_str += " " + option_type['helpBlock']
-              end
-            end
-            row = {
-              #code: option_type['code'],
-              field: field_str,
-              type: option_type['type'],
-              description: description_str,
-              default: option_type['defaultValue'],
-              required: option_type['required'] ? 'Yes' : 'No'
-            }
-            row
-          }
-          columns = [:field, :type, :description, :default, :required]
-          print cyan
-          print as_pretty_table(rows, columns)
-          print reset,"\n"
-        end
-        return 0
-      end
+    params.merge!(parse_query_options(options))
+    policy_type_id = args[0]
+    if policy_type_id.to_s !~ /\A\d{1,}\Z/
+      policy_type = find_policy_type_by_name_or_id(args[0])
+      return [1, "Policy Type not found for #{args[0]}"] if policy_type.nil?
+      policy_type_id = policy_type['id']
+    end
+    @policies_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @policies_interface.dry.get_policy_type(policy_type_id, params)
       return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      return 1
     end
-    @policies_interface.list_policy_types
+    json_response = @policies_interface.get_policy_type(policy_type_id, params)
+    render_response(json_response, options, 'policyType') do
+      policy_type = json_response['policyType']
+      print_h1 "Policy Type Details"
+      print cyan
+      description_cols = {
+        "ID" => 'id',
+        "Name" => 'name',
+        # "Description" => 'description',
+        "Code" => 'code',
+        "Category" => 'category',
+        # "Load Method" => 'loadMethod',
+        # "Enforce Method" => 'enforceMethod',
+        # "Prepare Method" => 'prepareMethod',
+        # "Validate Method" => 'validateMethod',
+        "Provision Enforced" => lambda {|it| it['enforceOnProvision'] ? 'Yes' : 'No'  },
+        "Managed Enforced" => lambda {|it| it['enforceOnManaged'] ? 'Yes' : 'No'  },
+      }
+      print_description_list(description_cols, policy_type)
+      print reset,"\n"
+
+      # show option types
+      print_h2 "Policy Type Options"
+      print format_option_types_table(policy_type['optionTypes'], options, 'policy')
+      print reset,"\n"
+    end
+    return 0
   end
 
   private
@@ -978,9 +929,42 @@ class Morpheus::Cli::PoliciesCommand
     end
   end
 
+  def find_policy_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_policy_type_by_id(val)
+    else
+      return find_policy_type_by_name(val)
+    end
+  end
+
+  def find_policy_type_by_name(name)
+    json_response = nil
+    
+    # json_response = @policies_interface.list_policy_types({name: name.to_s})
+    json_response = @policies_interface.list_policy_types({max: 10000})
+    policy_types = json_response['policyTypes']
+    match_value = name.to_s.downcase
+    policy_types = policy_types.select {|it| it['name'].to_s.downcase == match_value || it['code'].to_s.downcase == match_value }
+    if policy_types.empty?
+      print_red_alert "Policy not found by name #{name}"
+      return nil
+    elsif policy_types.size > 1
+      print_red_alert "#{policy_types.size} policy types found by name or code #{name}"
+      # print_policies_table(policy_types, {color: red})
+      rows = policy_types.collect do |it|
+        {id: it['id'], name: it['name'], code: it['code']}
+      end
+      puts as_pretty_table(rows, [:id, :name], {color:red})
+      return nil
+    else
+      policy_type = policy_types[0]
+      return policy_type
+    end
+  end
+
   def find_policy_type_by_id(id)
     begin
-      json_response = @policies_interface.get_type(id.to_s)
+      json_response = @policies_interface.get_policy_type(id.to_s)
       return json_response['policyType']
     rescue RestClient::Exception => e
       if e.response && e.response.code == 404

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

@@ -631,6 +631,8 @@ EOT
         params['authority'] = v_prompt['authority']
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2}], options[:options])
         params['description'] = v_prompt['description']
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'landingUrl', 'fieldLabel' => 'landingUrl', 'type' => 'text', 'displayOrder' => 3, 'description' => 'An optional override for the default landing page after login for a user.'}], options[:options])
+        params['landingUrl'] = v_prompt['landingUrl']
 
         if params['owner']
           if @is_master_account && has_complete_access
@@ -2479,6 +2481,7 @@ Update default workflow access for a role.
     [
       {'fieldName' => 'authority', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
+      {'fieldName' => 'landingUrl', 'fieldLabel' => 'Landing URL', 'type' => 'text', 'description' => 'An optional override for the default landing page after login for a user.'},
       {'fieldName' => 'roleType', 'fieldLabel' => 'Role Type', 'type' => 'select', 'selectOptions' => [{'name' => 'User Role', 'value' => 'user'}, {'name' => 'Account Role', 'value' => 'account'}], 'defaultValue' => 'user'},
       {'fieldName' => 'baseRole', 'fieldLabel' => 'Copy From Role', 'type' => 'text'},
       {'fieldName' => 'multitenant', 'fieldLabel' => 'Multitenant', 'type' => 'checkbox', 'defaultValue' => 'off', 'description' => 'A Multitenant role is automatically copied into all existing subaccounts as well as placed into a subaccount when created. Useful for providing a set of predefined roles a Customer can use'},

data/lib/morpheus/cli/mixins/accounts_helper.rb

@@ -131,6 +131,7 @@ module Morpheus::Cli::AccountsHelper
       "ID" => 'id',
       "Name" => 'authority',
       "Description" => 'description',
+      "Landing URL" => 'landingUrl',
       #"Scope" => lambda {|it| it['scope'] },
       "Type" => lambda {|it| format_role_type(it) },
       "Multitenant" => lambda {|it| 
@@ -149,6 +150,7 @@ module Morpheus::Cli::AccountsHelper
       "ID" => 'id',
       "Name" => 'authority',
       "Description" => 'description',
+      "Landing URL" => 'landingUrl',
       "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
       "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) }
     }

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "6.2.3"
+    VERSION = "6.3.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 6.2.3
+  version: 6.3.0
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler