morpheus-cli 5.5.1.4 → 5.5.2

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

@@ -79,6 +79,12 @@ class Morpheus::Cli::Apps
       opts.on('--status STATUS', "Filter by status.") do |val|
         params['status'] = (params['status'] || []) + val.to_s.split(',').collect {|s| s.strip }.select {|s| s != "" }
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       opts.on('-a', '--details', "Display all details: memory and storage usage used / max values." ) do
         options[:details] = true
       end
@@ -221,6 +227,9 @@ class Morpheus::Cli::Apps
       opts.on( '--name VALUE', String, "Name" ) do |val|
         options[:name] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on( '--description VALUE', String, "Description" ) do |val|
         options[:description] = val
       end
@@ -303,7 +312,6 @@ class Morpheus::Cli::Apps
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'description' => 'Enter a name for this app'}], options[:options])
         payload['name'] = v_prompt['name']
         
-
         # Description
         options[:options]['description'] = options[:description] if options.key?(:description)
         v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'required' => false}], options[:options])
@@ -332,7 +340,7 @@ class Morpheus::Cli::Apps
         end
         if cloud_id
           cloud = find_cloud_by_name_or_id_for_provisioning(group['id'], cloud_id)
-          #payload['cloud'] = {'id' => cloud['id'], 'name' => cloud['name']}
+          payload['defaultCloud'] = {'id' => cloud ? cloud['id'] : cloud_id}
         end
         
         # Environment
@@ -354,6 +362,11 @@ class Morpheus::Cli::Apps
         end
         # payload['appContext'] = payload['environment'] if payload['environment']
 
+        # Labels
+        v_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'labels', 'fieldLabel' => 'Labels', 'type' => 'text'}], options[:options])
+        payload['labels'] = parse_labels(v_prompt['labels']) unless v_prompt['labels'].to_s.empty?
+
+        # Configure (Tiers and their instances)
         if !payload['tiers']
           if payload['blueprintId'] != 'existing'
             
@@ -371,6 +384,7 @@ class Morpheus::Cli::Apps
               # tiers are a map, heh, sort them by tierIndex
               tiers = blueprint["config"]["tiers"] ? blueprint["config"]["tiers"] : (blueprint["tiers"] || {})
               sorted_tiers = tiers.collect {|k,v| [k,v] }.sort {|a,b| a[1]['tierIndex'] <=> b[1]['tierIndex'] }
+              payload.delete('defaultCloud')
               sorted_tiers.each do |tier_obj|
                 tier_name = tier_obj[0]
                 tier_config = tier_obj[1]
@@ -453,6 +467,8 @@ class Morpheus::Cli::Apps
                       instance_prompt_options[:options][:help_field_prefix] = help_field_prefix
                       instance_prompt_options[:locked_fields] = scoped_instance_config['lockedFields']
                       instance_prompt_options[:for_app] = true
+                      instance_prompt_options[:skip_labels_prompt] = true
+                      # or could do this: instance_prompt_options[:labels] = default_labels
                       # this provisioning helper method handles all (most) of the parsing and prompting
                       scoped_instance_config = Marshal.load( Marshal.dump(scoped_instance_config) )
                       instance_config_payload = prompt_new_instance(instance_prompt_options)
@@ -467,6 +483,10 @@ class Morpheus::Cli::Apps
                       final_config.delete('groups')
                       final_config.delete('clouds')
                       final_config.delete('lockedFields')
+                      final_config.delete('userRemovedFields')
+                      # should not need this...
+                      final_config.delete(:no_prompt)
+                      final_config.delete(:help_field_prefix)
                       # add config to payload
                       payload['tiers'][tier_name]['instances'] ||= []
                       payload['tiers'][tier_name]['instances'] << final_config
@@ -682,6 +702,7 @@ class Morpheus::Cli::Apps
       description_cols = {
         "ID" => 'id',
         "Name" => 'name',
+        "Labels" => lambda {|it| format_list(it['labels']) rescue '' },
         "Description" => 'description',
         "Type" => lambda {|it| 
           if it['type']
@@ -810,6 +831,9 @@ class Morpheus::Cli::Apps
       opts.on( '--name VALUE', String, "Name" ) do |val|
         options[:name] = val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on( '--description VALUE', String, "Description" ) do |val|
         options[:description] = val
       end
@@ -2367,6 +2391,7 @@ EOT
       {
         id: app['id'],
         name: app['name'],
+        labels: format_list(app['labels'], '', 3),
         description: app['description'],
         blueprint: app['blueprint'] ? app['blueprint']['name'] : '',
         type: app['type'] ? format_blueprint_type(app['type']) : (format_blueprint_type(app['blueprint'] ? app['blueprint']['type'] : nil)),
@@ -2389,6 +2414,7 @@ EOT
     columns = [
       :id,
       :name,
+      :labels,
       # :description,
       :type,
       :blueprint,

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

@@ -973,10 +973,10 @@ class Morpheus::Cli::ArchivesCommand
       
       
       print_h2 "Download URLs"
-      private_download_url = "#{@appliance_url}/api/archives/download/#{CGI::escape(bucket_id)}" + "/#{CGI::escape(archive_file['filePath'])}".squeeze('/')
+      private_download_url = "#{@appliance_url}/api/archives/download/#{CGI::escape(bucket_id)}" + "/#{escape_filepath(archive_file['filePath'])}".squeeze('/')
       public_download_url = nil
       if archive_file['archiveBucket'] && archive_file['archiveBucket']['isPublic']
-        public_download_url = "#{@appliance_url}/public-archives/download/#{CGI::escape(bucket_id)}" + "/#{CGI::escape(archive_file['filePath'])}".squeeze('/')
+        public_download_url = "#{@appliance_url}/public-archives/download/#{CGI::escape(bucket_id)}" + "/#{escape_filepath(archive_file['filePath'])}".squeeze('/')
       end
       print cyan
       puts "Private URL: #{private_download_url}"

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

@@ -62,6 +62,12 @@ class Morpheus::Cli::BlueprintsCommand
         params['ownerId'] << val
       end
       opts.add_hidden_option('--created-by')
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List blueprints."
     end
@@ -191,6 +197,9 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on('-t', '--type TYPE', String, "Blueprint Type. Default is morpheus.") do |val|
         options[:blueprint_type] = parse_blueprint_type(val.to_s)
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       build_standard_add_options(opts, options)
       opts.footer = "Create a new blueprint.\n" + 
                     "[name] is required. This is the name of the new blueprint."
@@ -258,6 +267,9 @@ class Morpheus::Cli::BlueprintsCommand
       opts.on( '--owner USER', "Owner Username or ID" ) do |val|
         options[:owner] = val == 'null' ? nil : val
       end
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       build_standard_update_options(opts, options)
       opts.footer = "Update a blueprint.\n" + 
                     "[blueprint] is required. This is the name or id of a blueprint."
@@ -817,6 +829,7 @@ class Morpheus::Cli::BlueprintsCommand
       options[:name_required] = false
       options[:instance_type_code] = instance_config['instance']['type'] #instance_type["code"]
       options[:for_app] = true
+      options[:skip_labels_prompt] = true
       #options[:options].deep_merge!(specific_config)
       # this provisioning helper method handles all (most) of the parsing and prompting
       instance_config_payload = prompt_new_instance(options)
@@ -1929,6 +1942,7 @@ class Morpheus::Cli::BlueprintsCommand
       {
         id: blueprint['id'],
         name: blueprint['name'],
+        labels: format_list(blueprint['labels'], '', 3),
         type: blueprint['type'].kind_of?(Hash) ? blueprint['type']['name'] : format_blueprint_type(blueprint['type']),
         description: blueprint['description'],
         category: blueprint['category'],
@@ -1947,6 +1961,7 @@ class Morpheus::Cli::BlueprintsCommand
     columns = [
       :id,
       :name,
+      :labels,
       :type,
       :description,
       :category,
@@ -2026,6 +2041,7 @@ class Morpheus::Cli::BlueprintsCommand
     description_cols = {
       "ID" => 'id',
       "Name" => 'name',
+      "Labels" => lambda {|it| format_list(it['labels'], '') rescue '' },
       "Type" => lambda {|it| it['type'].kind_of?(Hash) ? it['type']['name'] : it['type'] },
       "Description" => 'description',
       "Category" => 'category',

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

@@ -37,6 +37,12 @@ class Morpheus::Cli::CatalogItemTypesCommand
       opts.on( '--featured [on|off]', String, "Filter by featured" ) do |val|
         params['featured'] = (val.to_s != 'false' && val.to_s != 'off')
       end
+      opts.on('-l', '--labels LABEL', String, "Filter by labels, can match any of the values") do |val|
+        add_query_parameter(params, 'labels', parse_labels(val))
+      end
+      opts.on('--all-labels LABEL', String, "Filter by labels, must match all of the values") do |val|
+        add_query_parameter(params, 'allLabels', parse_labels(val))
+      end
       build_standard_list_options(opts, options)
       opts.footer = "List catalog item types."
     end
@@ -59,7 +65,7 @@ class Morpheus::Cli::CatalogItemTypesCommand
       if catalog_item_types.empty?
         print cyan,"No catalog item types found.",reset,"\n"
       else
-        list_columns = catalog_item_type_column_definitions.upcase_keys!
+        list_columns = catalog_item_type_list_column_definitions.upcase_keys!
         list_columns.delete("Blueprint")
         list_columns.delete("Workflow")
         list_columns.delete("Context")
@@ -232,6 +238,9 @@ EOT
       #   options[:options]['type'] = val.to_s.downcase
       # end
       build_option_type_options(opts, options, add_catalog_item_type_option_types)
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
         filename = val
         logo_file = nil
@@ -386,6 +395,9 @@ EOT
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[type] [options]")
       build_option_type_options(opts, options, update_catalog_item_type_option_types)
+      opts.on('-l', '--labels [LIST]', String, "Labels") do |val|
+        options[:options]['labels'] = parse_labels(val)
+      end
       opts.on('--logo FILE', String, "Upload a custom logo icon") do |val|
         filename = val
         logo_file = nil
@@ -549,7 +561,7 @@ EOT
     filename = args[1]
     logo_file = nil
     if filename == 'null'
-      filename = 'null' # clear it
+      logo_file = 'null' # clear it
     else
       filename = File.expand_path(filename)
       if !File.exists?(filename)
@@ -641,10 +653,30 @@ EOT
 
   private
 
+  def catalog_item_type_list_column_definitions()
+    {
+      "ID" => 'id',
+      "Name" => 'name',
+      "Labels" => lambda {|it| format_list(it['labels'], '', 3) },
+      "Description" => 'description',
+      "Type" => lambda {|it| format_catalog_type(it) },
+      "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : nil },
+      "Workflow" => lambda {|it| it['workflow'] ? it['workflow']['name'] : nil },
+      "Context" => lambda {|it| it['context'] },
+      # "Content" => lambda {|it| it['content'] },
+      "Enabled" => lambda {|it| format_boolean(it['enabled']) },
+      "Featured" => lambda {|it| format_boolean(it['featured']) },
+      #"Config" => lambda {|it| it['config'] },
+      "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
   def catalog_item_type_column_definitions()
     {
       "ID" => 'id',
       "Name" => 'name',
+      "Labels" => lambda {|it| format_list(it['labels']) },
       "Description" => 'description',
       "Type" => lambda {|it| format_catalog_type(it) },
       "Blueprint" => lambda {|it| it['blueprint'] ? it['blueprint']['name'] : nil },

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

@@ -0,0 +1,338 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::ClientsCommand
+	include Morpheus::Cli::CliCommand
+
+  set_command_name :clients
+  set_command_description "View and manage Oath Clients"
+  register_subcommands :list, :get, :add, :update, :remove
+
+  def initialize()
+    #@appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
+  end
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @clients_interface = @api_client.clients
+  end
+
+  def handle(args)
+    handle_subcommand(args)
+  end
+
+  def list(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage()
+      build_standard_list_options(opts, options)
+      opts.footer = "List Oauth Clients."
+    end
+    optparse.parse!(args)
+    connect(options)
+
+    params.merge!(parse_list_options(options))
+    @clients_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @clients_interface.dry.list(params)
+      return 0
+    end
+
+    json_response = @clients_interface.list(params)
+    render_response(json_response, options, "clients") do 
+      clients = json_response["clients"]
+      if clients.empty?
+        print cyan,"No clients found",reset,"\n"
+      else
+        rows = clients.collect {|client|
+          row = {
+            id: client['id'],
+            client_id: client['clientId'],
+            access_token_seconds: client['accessTokenValiditySeconds'],
+            refresh_token_seconds: client['refreshTokenValiditySeconds']
+          }
+          row
+        }
+        columns = [:id, {:client_id => {:max_width => 50}}, :access_token_seconds, :refresh_token_seconds]
+        print_h1 "Morpheus Clients", [], options
+        print as_pretty_table(rows, columns, options)
+        print reset
+        print_results_pagination(json_response)
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def get(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[client]")
+      build_standard_get_options(opts, options)
+      opts.footer = "Get details about an oath client.\n" + 
+                    "[client] is required. This is the name or id of a client."
+
+    end
+    optparse.parse!(args)
+    if args.count < 1
+      puts optparse
+      exit 1
+    end
+    connect(options)
+    begin
+      @clients_interface.setopts(options)
+      if options[:dry_run]
+        if args[0].to_s =~ /\A\d{1,}\Z/
+          print_dry_run @clients_interface.dry.get(args[0])
+        else
+          print_dry_run @clients_interface.dry.list({name: args[0].to_s})
+        end
+        return 0
+      end
+      client = find_client_by_name_or_id(args[0])
+      return 1 if client.nil?
+      json_response = {'client' => client}
+      render_result = render_with_format(json_response, options, 'client')
+      return 0 if render_result
+
+      unless options[:quiet]
+        print_h1 "Client Details"
+        print cyan
+        client_columns = {
+          "ID" => 'id',
+          "Client ID" => 'clientId',
+          "Access Token Validity Seconds" => 'accessTokenValiditySeconds',
+          "Refresh Token Validity Seconds" => 'refreshTokenValiditySeconds' 
+        }
+        
+        print_description_list(client_columns, client)
+        print reset,"\n"
+
+      end
+      print reset,"\n"
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def add(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[clientId] [options]")
+      build_option_type_options(opts, options, add_client_option_types)
+      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :remote])
+      opts.footer = "Add New Oauth Client Record."
+    end
+    optparse.parse!(args)
+    if args.count > 1
+      raise_command_error "wrong number of arguments, expected 0-1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+    if args[0]
+      options[:options] ||= {}
+      options[:options]['clientId'] ||= args[0]
+    end
+    connect(options)
+    begin
+       # construct payload
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'client' => passed_options}) unless passed_options.empty?
+      else
+        payload = {
+          'client' => {
+          }
+        }
+        # allow arbitrary -O options
+        payload.deep_merge!({'client' => passed_options}) unless passed_options.empty?
+        # prompt for options
+        params = Morpheus::Cli::OptionTypes.prompt(add_client_option_types, options[:options], @api_client, options[:params])
+        payload.deep_merge!({'client' => params}) unless params.empty?
+      end
+
+      @clients_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clients_interface.dry.create(payload)
+        return
+      end
+      json_response = @clients_interface.create(payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        display_name = json_response['client']  ? json_response['client']['clientId'] : ''
+        print_green_success "Client #{display_name} added"
+        get([json_response['client']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def update(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[clientId] [options]")
+      build_option_type_options(opts, options, client_option_types)
+      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :remote])
+      opts.footer = "Update Oauth Client Record."
+    end
+    optparse.parse!(args)
+
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+
+    connect(options)
+    begin
+
+      client = find_client_by_name_or_id(args[0])
+      return 1 if client.nil?
+
+      # construct payload
+      passed_options = options[:options] ? options[:options].reject {|k,v| k.is_a?(Symbol) } : {}
+      payload = nil
+      if options[:payload]
+        payload = options[:payload]
+        payload.deep_merge!({'client' => passed_options}) unless passed_options.empty?
+      else
+        payload = {
+          'client' => {
+          }
+        }
+        # allow arbitrary -O options
+        payload.deep_merge!({'page' => passed_options}) unless passed_options.empty?
+        # prompt for options
+        #params = Morpheus::Cli::OptionTypes.prompt(update_wiki_page_option_types, options[:options], @api_client, options[:params])
+        params = passed_options
+
+        if params.empty?
+          raise_command_error "Specify at least one option to update.\n#{optparse}"
+        end
+
+        payload.deep_merge!({'client' => params}) unless params.empty?
+      end
+      @clients_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clients_interface.dry.update(client['id'], payload)
+        return
+      end
+      json_response = @clients_interface.update(client['id'], payload)
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        display_name = json_response['client'] ? json_response['client']['clientId'] : ''
+        print_green_success "Client #{display_name} updated"
+        get([json_response['client']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+  def remove(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[clientId]")
+      build_common_options(opts, options, [:auto_confirm, :json, :dry_run, :remote])
+      opts.footer = "Deletes Oauth Client."
+    end
+    optparse.parse!(args)
+
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args}\n#{optparse}"
+    end
+
+    connect(options)
+    begin
+      client = find_client_by_name_or_id(args[0])
+      return 1 if client.nil?
+
+      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the client #{client['clientId']}?")
+        return 9, "aborted command"
+      end
+      @clients_interface.setopts(options)
+      if options[:dry_run]
+        print_dry_run @clients_interface.dry.destroy(client['id'])
+        return
+      end
+      json_response = @clients_interface.destroy(client['id'])
+      if options[:json]
+        print JSON.pretty_generate(json_response)
+        print "\n"
+      else
+        print_green_success "Client #{client['clientId']} removed"
+        # list([] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
+
+  private
+  def find_client_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_client_by_id(val)
+    else
+      return find_client_by_client_id(val)
+    end
+  end
+
+  def find_client_by_id(id)
+    raise "#{self.class} has not defined @client_interface" if @clients_interface.nil?
+    begin
+      json_response = @clients_interface.get(id)
+      return json_response['client']
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "Client not found by id #{id}"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_client_by_client_id(clientId)
+    raise "#{self.class} has not defined @client_interface" if @clients_interface.nil?
+    clients = @clients_interface.list()['clients'].select { |client| client['clientId'] == clientId }
+    if clients.empty?
+      print_red_alert "Client not found by clientId #{clientId}"
+      return nil
+    elsif clients.size > 1
+      print_red_alert "#{clients.size} Clients found by clientId #{clientId}"
+      print as_pretty_table(clients, [:id,:clientId], {color:red})
+      print reset,"\n"
+      return nil
+    else
+      return clients[0]
+    end
+  end
+
+  def client_option_types
+    [
+      {'fieldName' => 'clientId', 'fieldLabel' => 'Client Id', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'accessTokenValiditySeconds', 'fieldLabel' => 'Access Token Validity Length (Seconds)', 'type' => 'number', 'required' => true, 'defaultValue' => 43200,'displayOrder' => 2},
+      {'fieldName' => 'refreshTokenValiditySeconds', 'fieldLabel' => 'Refresh Token Validity Length (Seconds)', 'type' => 'number', 'required' => true, 'defaultValue' => 43200,'displayOrder' => 3}
+    ]
+  end
+
+   def add_client_option_types
+    [
+      {'fieldName' => 'clientId', 'fieldLabel' => 'Client Id', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
+      {'fieldName' => 'clientSecret', 'fieldLabel' => 'Client Secret', 'type' => 'text', 'displayOrder' => 2},
+      {'fieldName' => 'accessTokenValiditySeconds', 'fieldLabel' => 'Access Token Validity Length (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'displayOrder' => 3},
+      {'fieldName' => 'refreshTokenValiditySeconds', 'fieldLabel' => 'Refresh Token Validity Length (Seconds)', 'type' => 'number', 'required' => true,'defaultValue' => 43200, 'displayOrder' => 4}
+    ]
+  end
+end