morpheus-cli 5.0.2 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ca8fc7cabb51b4042eb212172b60191d6863cf9310ffce4e386d016692f7f1
-  data.tar.gz: d1183424bef986bb22123d60b45e97ed077c8ea30c5bfd249f8bf503c0a22d13
+  metadata.gz: 4f4b5a29dcfa1a915ab2d3fed9ad07197d2a760758b2bc3b76e72cf6899c4372
+  data.tar.gz: 59c981a5aede057b69e08f5c717d27c884bdd64aed84fb81361b35291b3aaf72
 SHA512:
-  metadata.gz: d006acc9447822675c3593de443679ac2eee514bf1ffe041ddfa5ddc44223e8edfbbeee9393056c59fb98c14d4beb240b0ce9725a3bcc56eb5e1095066d15d1c
-  data.tar.gz: ca41986fc3561f562b799971514b92dfe08027e06ad5443b0e116713fee9132d62b84905c929209be03a7dc0f3855e97adf7fe053e64832067addca692ef4268
+  metadata.gz: 678ff7f73923c9883968ee8bba29b8d75d5464a4899ca812477ce943b25f758c74f187a481c781500928206c4d540d5153f858ee4e2242cfb24cc2604be1602d
+  data.tar.gz: c27881081abb71b05eceb4857280f51a4f838e9a568658baa34385afe7fc2b86be61eb31a070a4e3a9381000337ceb9b11f58fe8572fff8066882225133742ba

data/Dockerfile

@@ -1,5 +1,5 @@
 FROM ruby:2.5.1
 
-RUN gem install morpheus-cli -v 5.0.2
+RUN gem install morpheus-cli -v 5.2.0
 
 ENTRYPOINT ["morpheus"]

data/lib/morpheus/api/api_client.rb

@@ -776,6 +776,10 @@ class Morpheus::APIClient
     Morpheus::CatalogItemTypesInterface.new(common_interface_options).setopts(@options)
   end
 
+  def catalog
+    Morpheus::ServiceCatalogInterface.new(common_interface_options).setopts(@options)
+  end
+
   def usage
     Morpheus::UsageInterface.new(common_interface_options).setopts(@options)
   end

data/lib/morpheus/api/instances_interface.rb

@@ -169,10 +169,10 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def backup(id,server=true)
+  def backup(id, payload={})
     url = "#{@base_url}/api/instances/#{id}/backup"
     headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
-    opts = {method: :put, url: url, headers: headers}
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
     execute(opts)
   end
 
@@ -218,6 +218,13 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
   
+  def snapshot(id, payload={})
+    url = "#{@base_url}/api/instances/#{id}/snapshot"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def snapshots(instance_id, params={})
     url = "#{@base_url}/api/instances/#{instance_id}/snapshots"
     headers = { params: params, authorization: "Bearer #{@access_token}" }

data/lib/morpheus/api/servers_interface.rb

@@ -176,4 +176,11 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def software(id, params={})
+    url = "#{@base_url}/api/servers/#{id}/software"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
 end

data/lib/morpheus/api/service_catalog_interface.rb

@@ -0,0 +1,89 @@
+require 'morpheus/api/api_client'
+# Service Catalog Persona interface
+class Morpheus::ServiceCatalogInterface < Morpheus::APIClient
+
+  def base_path
+    # "/api/service-catalog"
+    "/api/catalog"
+  end
+
+  # dashboard
+  def dashboard(params={})
+    execute(method: :get, url: "#{base_path}/dashboard", params: params)
+  end
+
+  # list catalog types available for ordering
+  def list_types(params={})
+    execute(method: :get, url: "#{base_path}/types", params: params)
+  end
+
+  # get specific catalog type
+  def get_type(id, params={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/types/#{id}", params: params)
+  end
+
+  # list catalog inventory (items)
+  def list_inventory(params={})
+    execute(method: :get, url: "#{base_path}/items", params: params)
+  end
+
+  # get catalog inventory item
+  def get_inventory(id, params={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/items/#{id}", params: params)
+  end
+
+  # delete a catalog inventory item
+  def destroy_inventory(id, params = {})
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/items/#{id}", params: params)
+  end
+
+  # get cart (one per user)
+  def get_cart(params={})
+    execute(method: :get, url: "#{base_path}/cart", params: params)
+  end
+
+  # update cart (set cart name)
+  def update_cart(payload, params={})
+    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={})
+    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={})
+    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={})
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/cart/items/#{id}", params: params, payload: payload.to_json)
+  end
+
+  # remove item from the cart
+  def destroy_cart_item(id, params={})
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/cart/items/#{id}", params: params)
+  end
+
+  # place order with cart
+  def checkout(payload, params={})
+    execute(method: :post, url: "#{base_path}/checkout", params: params, payload: payload.to_json)
+  end
+
+  # remove all items from cart and reset name
+  def clear_cart(params={})
+    execute(method: :delete, url: "#{base_path}/cart", params: params)
+  end
+
+  # create an order from scratch, without using a cart
+  def create_order(payload, params={})
+    execute(method: :post, url: "#{base_path}/orders", params: params, payload: payload.to_json)
+  end
+end

data/lib/morpheus/cli.rb

@@ -175,7 +175,8 @@ module Morpheus
       load 'morpheus/cli/projects_command.rb'
       load 'morpheus/cli/backups_command.rb'
       load 'morpheus/cli/backup_jobs_command.rb'
-      load 'morpheus/cli/catalog_command.rb'
+      load 'morpheus/cli/catalog_item_types_command.rb' # catalog-types
+      load 'morpheus/cli/service_catalog_command.rb' # catalog
       load 'morpheus/cli/usage_command.rb'
       # add new commands here...
 

data/lib/morpheus/cli/apps.rb

@@ -72,9 +72,6 @@ class Morpheus::Cli::Apps
         options[:owner] = val
       end
       opts.add_hidden_option('--created-by')
-      opts.on('--details', "Display more details: memory and storage usage used / max values." ) do
-        options[:details] = true
-      end
       opts.on('--pending-removal', "Include apps pending removal.") do
         options[:showDeleted] = true
       end
@@ -88,6 +85,9 @@ 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('-a', '--details', "Display all details: memory and storage usage used / max values." ) do
+        options[:details] = true
+      end
       build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
       opts.footer = "List apps."
     end
@@ -2185,26 +2185,6 @@ EOT
     print reset
   end
 
-  def format_app_status(app, return_color=cyan)
-    out = ""
-    status_string = app['status'] || app['appStatus'] || ''
-    if status_string == 'running'
-      out = "#{green}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'provisioning'
-      out = "#{cyan}#{status_string.upcase}#{cyan}"
-    elsif status_string == 'stopped' or status_string == 'failed'
-      out = "#{red}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'unknown'
-      out = "#{yellow}#{status_string.upcase}#{return_color}"
-    elsif status_string == 'warning' && app['instanceCount'].to_i == 0
-      # show this instead of WARNING
-      out =  "#{cyan}EMPTY#{return_color}"
-    else
-      out =  "#{yellow}#{status_string.upcase}#{return_color}"
-    end
-    out
-  end
-
   def format_app_tiers(app)
     out = ""
     begin

data/lib/morpheus/cli/{catalog_command.rb → catalog_item_types_command.rb}

@@ -1,17 +1,16 @@
 require 'morpheus/cli/cli_command'
 
 # CLI command self service
-# UI is Tools: Self Service - Catalog Items
+# UI is Tools: Self Service - Catalog
 # API is /catalog-item-types and returns catalogItemTypes
-class Morpheus::Cli::CatalogCommand
+class Morpheus::Cli::CatalogItemTypesCommand
   include Morpheus::Cli::CliCommand
-  include Morpheus::Cli::CatalogHelper
   include Morpheus::Cli::LibraryHelper
   include Morpheus::Cli::OptionSourceHelper
 
-  # hide until 5.1 when update api is fixed and service-catalog endpoints are available
-  set_command_hidden  
-  set_command_name :'catalog'
+  # set_command_name :'catalog-types'
+  set_command_name :'self-service'
+  set_command_description "Self Service: View and manage catalog item types"
 
   register_subcommands :list, :get, :add, :update, :remove
   
@@ -38,7 +37,7 @@ class Morpheus::Cli::CatalogCommand
         params['featured'] = (val.to_s != 'false' && val.to_s != 'off')
       end
       build_standard_list_options(opts, options)
-      opts.footer = "List catalog items."
+      opts.footer = "List catalog item types."
     end
     optparse.parse!(args)
     connect(options)
@@ -55,11 +54,14 @@ class Morpheus::Cli::CatalogCommand
     json_response = @catalog_item_types_interface.list(params)
     catalog_item_types = json_response[catalog_item_type_list_key]
     render_response(json_response, options, catalog_item_type_list_key) do
-      print_h1 "Morpheus Catalog Items", parse_list_subtitles(options), options
+      print_h1 "Morpheus Catalog Item Types", parse_list_subtitles(options), options
       if catalog_item_types.empty?
-        print cyan,"No catalog items found.",reset,"\n"
+        print cyan,"No catalog item types found.",reset,"\n"
       else
         list_columns = catalog_item_type_column_definitions.upcase_keys!
+        list_columns.delete("Blueprint")
+        list_columns.delete("Workflow")
+        list_columns.delete("Context")
         #list_columns["Config"] = lambda {|it| truncate_string(it['config'], 100) }
         print as_pretty_table(catalog_item_types, list_columns.upcase_keys!, options)
         print_results_pagination(json_response)
@@ -67,7 +69,7 @@ class Morpheus::Cli::CatalogCommand
       print reset,"\n"
     end
     if catalog_item_types.empty?
-      return 1, "no catalog items found"
+      return 1, "no catalog item types found"
     else
       return 0, nil
     end
@@ -77,17 +79,20 @@ class Morpheus::Cli::CatalogCommand
     params = {}
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[catalog item type]")
+      opts.banner = subcommand_usage("[type]")
       opts.on( '-c', '--config', "Display raw config only. Default is YAML. Combine with -j for JSON instead." ) do
         options[:show_config] = true
       end
-      # opts.on('--no-config', "Do not display config content." ) do
+      # opts.on('--no-config', "Do not display Config YAML." ) do
       #   options[:no_config] = true
       # end
+      opts.on('--no-content', "Do not display Content." ) do
+        options[:no_content] = true
+      end
       build_standard_get_options(opts, options)
       opts.footer = <<-EOT
 Get details about a specific catalog item type.
-[catalog item type] is required. This is the name or id of a catalog item type.
+[type] is required. This is the name or id of a catalog item type.
 EOT
     end
     optparse.parse!(args)
@@ -131,6 +136,8 @@ EOT
       print cyan
       show_columns = catalog_item_type_column_definitions
       show_columns.delete("Blueprint") unless catalog_item_type['blueprint']
+      show_columns.delete("Workflow") unless catalog_item_type['workflow']
+      show_columns.delete("Context") unless catalog_item_type['context'] # workflow context
       print_description_list(show_columns, catalog_item_type)
 
       if catalog_item_type['optionTypes'] && catalog_item_type['optionTypes'].size > 0
@@ -149,25 +156,62 @@ EOT
         # print cyan,"No option types found for this catalog item.","\n",reset
       end
 
-      if config && options[:no_config] != true
-        print_h2 "Config YAML"
-        #print reset,(JSON.pretty_generate(config) rescue config),"\n",reset
-        #print reset,(as_yaml(config, options) rescue config),"\n",reset
-        config_string = as_yaml(config, options) rescue config
-        config_lines = config_string.split("\n")
-        config_line_count = config_lines.size
-        max_lines = 10
-        if config_lines.size > max_lines
-          config_string = config_lines.first(max_lines).join("\n")
-          config_string << "\n\n"
-          config_string << "(#{(config_line_count - max_lines)} more lines were not shown, use -c to show the config)"
-          #config_string << "\n"
-        end
-        # strip --- yaml header
-        if config_string[0..3] == "---\n"
-          config_string = config_string[4..-1]
+      item_type_code = catalog_item_type['type'].to_s.downcase
+      if options[:no_config] != true
+        if item_type_code == 'instance'
+          print_h2 "Config YAML"
+          if config
+            #print reset,(JSON.pretty_generate(config) rescue config),"\n",reset
+            #print reset,(as_yaml(config, options) rescue config),"\n",reset
+            config_string = as_yaml(config, options) rescue config
+            config_lines = config_string.split("\n")
+            config_line_count = config_lines.size
+            max_lines = 10
+            if config_lines.size > max_lines
+              config_string = config_lines.first(max_lines).join("\n")
+              config_string << "\n\n"
+              config_string << "#{dark}(#{(config_line_count - max_lines)} more lines were not shown, use -c to show the config)#{reset}"
+              #config_string << "\n"
+            end
+            # strip --- yaml header
+            if config_string[0..3] == "---\n"
+              config_string = config_string[4..-1]
+            end
+            print reset,config_string.chomp("\n"),"\n",reset
+          else
+            print reset,"(blank)","\n",reset
+          end
+        elsif item_type_code == 'blueprint' || item_type_code == 'apptemplate' || item_type_code == 'app'
+          print_h2 "App Spec"
+          if catalog_item_type['appSpec']
+            #print reset,(JSON.pretty_generate(config) rescue config),"\n",reset
+            #print reset,(as_yaml(config, options) rescue config),"\n",reset
+            config_string = catalog_item_type['appSpec'] || ""
+            config_lines = config_string.split("\n")
+            config_line_count = config_lines.size
+            max_lines = 10
+            if config_lines.size > max_lines
+              config_string = config_lines.first(max_lines).join("\n")
+              config_string << "\n\n"
+              config_string << "#{dark}(#{(config_line_count - max_lines)} more lines were not shown, use -c to show the config)#{reset}"
+              #config_string << "\n"
+            end
+            # strip --- yaml header
+            if config_string[0..3] == "---\n"
+              config_string = config_string[4..-1]
+            end
+            print reset,config_string.chomp("\n"),"\n",reset
+          else
+            print reset,"(blank)","\n",reset
+          end
+        elsif item_type_code == 'workflow' || item_type_code == 'operationalworkflow' || item_type_code == 'taskset'
         end
-        print reset,config_string.chomp("\n"),"\n",reset
+      end
+
+      # Content (Wiki Page)
+      if !catalog_item_type["content"].to_s.empty? && options[:no_content] != true
+        print_h2 "Content"
+        print reset,catalog_item_type["content"].chomp("\n"),"\n",reset
       end
 
       print reset,"\n"
@@ -180,6 +224,10 @@ EOT
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
+      # opts.on('-t', '--type [instance|blueprint|workflow]', "Item Type, default is instance.") do |val|
+      #   # params['type'] = val.to_s.downcase
+      #   options[:options]['type'] = val.to_s.downcase
+      # end
       build_option_type_options(opts, options, add_catalog_item_type_option_types)
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
@@ -233,6 +281,8 @@ EOT
       payload.deep_merge!({catalog_item_type_object_key => parse_passed_options(options)})
     else
       payload.deep_merge!({catalog_item_type_object_key => parse_passed_options(options)})
+      # Type prompt first
+      #params['type'] = Morpheus::Cli::OptionTypes.no_prompt([{'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Instance', 'value' => 'instance'}, {'name' => 'Blueprint', 'value' => 'blueprint'}, {'name' => 'Workflow', 'value' => 'workflow'}], 'defaultValue' => 'instance', 'required' => true}], options[:options], @api_client, options[:params])['type']
       v_prompt = Morpheus::Cli::OptionTypes.prompt(add_catalog_item_type_option_types(), options[:options], @api_client, options[:params])
       params.deep_merge!(v_prompt)
       advanced_config = Morpheus::Cli::OptionTypes.no_prompt(add_catalog_item_type_advanced_option_types, options[:options], @api_client, options[:params])
@@ -241,13 +291,15 @@ EOT
       # convert checkbox "on" and "off" to true and false
       params.booleanize!
       # convert type to refType until api accepts type
-      if params['type'] && !params['refType']
-        if params['type'].to_s.downcase == 'blueprint'
-          params['refType'] = 'AppTemplate'
-        else
-          params['refType'] = 'InstanceType'
-        end
-      end
+      # if params['type'] && !params['refType']
+      #   if params['type'].to_s.downcase == 'instance'
+      #     params['refType'] = 'InstanceType'
+      #   elsif params['type'].to_s.downcase == 'blueprint'
+      #     params['refType'] = 'AppTemplate'
+      #   elsif params['type'].to_s.downcase == 'workflow'
+      #     params['refType'] = 'OperationalWorkflow'
+      #   end
+      # end
       # convert config string to a map
       config = params['config']
       if config && config.is_a?(String)
@@ -261,14 +313,14 @@ EOT
           params['config'] = config_map
         end
       end
-      if params['optionTypes']
-        # todo: move to optionSource, so it will be /api/options/optionTypes  lol
-        prompt_results = prompt_for_option_types(params, options, @api_client)
-        if prompt_results[:success]
-          params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
-        else
-          return 1
-        end
+      # massage association params a bit
+      params['workflow'] = {'id' => params['workflow']}  if params['workflow'] && !params['workflow'].is_a?(Hash)
+      params['blueprint'] = {'id' => params['blueprint']}  if params['blueprint'] && !params['blueprint'].is_a?(Hash)
+      prompt_results = prompt_for_option_types(params, options, @api_client)
+      if prompt_results[:success]
+        params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+      else
+        return 1, "failed to parse optionTypes"
       end
       payload[catalog_item_type_object_key].deep_merge!(params)
     end
@@ -280,7 +332,7 @@ EOT
     json_response = @catalog_item_types_interface.create(payload)
     catalog_item_type = json_response[catalog_item_type_object_key]
     render_response(json_response, options, catalog_item_type_object_key) do
-      print_green_success "Added catalog item #{catalog_item_type['name']}"
+      print_green_success "Added catalog item type #{catalog_item_type['name']}"
       return _get(catalog_item_type["id"], {}, options)
     end
     return 0, nil
@@ -291,7 +343,7 @@ EOT
     params = {}
     payload = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[catalog item type] [options]")
+      opts.banner = subcommand_usage("[type] [options]")
       build_option_type_options(opts, options, update_catalog_item_type_option_types)
       opts.on('--config-file FILE', String, "Config from a local JSON or YAML file") do |val|
         options[:config_file] = val.to_s
@@ -333,7 +385,7 @@ EOT
       build_standard_update_options(opts, options)
       opts.footer = <<-EOT
 Update a catalog item type.
-[catalog item type] is required. This is the name or id of a catalog item type.
+[type] is required. This is the name or id of a catalog item type.
 EOT
     end
     optparse.parse!(args)
@@ -356,14 +408,7 @@ EOT
       params.deep_merge!(advanced_config)
       # convert checkbox "on" and "off" to true and false
       params.booleanize!
-      # convert type to refType until api accepts type
-      if params['type'] && !params['refType']
-        if params['type'].to_s.downcase == 'blueprint'
-          params['refType'] = 'AppTemplate'
-        else
-          params['refType'] = 'InstanceType'
-        end
-      end
+      
       # convert config string to a map
       config = params['config']
       if config && config.is_a?(String)
@@ -377,6 +422,18 @@ EOT
           params['config'] = config_map
         end
       end
+      if params['optionTypes']
+        # todo: move to optionSource, so it will be /api/options/optionTypes  lol
+        prompt_results = prompt_for_option_types(params, options, @api_client)
+        if prompt_results[:success]
+          params['optionTypes'] = prompt_results[:data] unless prompt_results[:data].nil?
+        else
+          return 1, "failed to parse optionTypes"
+        end
+      end
+      # massage association params a bit
+      params['workflow'] = {'id' => params['workflow']}  if params['workflow'] && !params['workflow'].is_a?(Hash)
+      params['blueprint'] = {'id' => params['blueprint']}  if params['blueprint'] && !params['blueprint'].is_a?(Hash)
       payload.deep_merge!({catalog_item_type_object_key => params})
       if payload[catalog_item_type_object_key].empty? # || options[:no_prompt]
         raise_command_error "Specify at least one option to update.\n#{optparse}"
@@ -390,7 +447,7 @@ EOT
     json_response = @catalog_item_types_interface.update(catalog_item_type['id'], payload)
     catalog_item_type = json_response[catalog_item_type_object_key]
     render_response(json_response, options, catalog_item_type_object_key) do
-      print_green_success "Updated catalog item #{catalog_item_type['name']}"
+      print_green_success "Updated catalog item type #{catalog_item_type['name']}"
       return _get(catalog_item_type["id"], {}, options)
     end
     return 0, nil
@@ -400,11 +457,11 @@ EOT
     options = {}
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[catalog item type] [options]")
+      opts.banner = subcommand_usage("[type] [options]")
       build_standard_remove_options(opts, options)
       opts.footer = <<-EOT
-Delete a catalog_item_type.
-[catalog item type] is required. This is the name or id of a catalog item type.
+Delete a catalog item type.
+[type] is required. This is the name or id of a catalog item type.
 EOT
     end
     optparse.parse!(args)
@@ -417,12 +474,12 @@ EOT
       print_dry_run @catalog_item_types_interface.dry.destroy(catalog_item_type['id'], params)
       return
     end
-    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the catalog item #{catalog_item_type['name']}?")
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the catalog item type #{catalog_item_type['name']}?")
       return 9, "aborted command"
     end
     json_response = @catalog_item_types_interface.destroy(catalog_item_type['id'], params)
     render_response(json_response, options) do
-      print_green_success "Removed catalog item #{catalog_item_type['name']}"
+      print_green_success "Removed catalog item type #{catalog_item_type['name']}"
     end
     return 0, nil
   end
@@ -436,6 +493,9 @@ EOT
       "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'] },
@@ -455,6 +515,7 @@ EOT
         out << (catalog_item_type['type']['name'] || catalog_item_type['type']['code']) rescue catalog_item_type['type'].to_s
       end
     else
+      # refType is not returned
       ref_type = catalog_item_type['refType']
       if ref_type == 'InstanceType'
         out << "Instance"
@@ -469,18 +530,24 @@ EOT
     out
   end
 
-  # this is not so simple, need to first choose select instance, host or provider
   def add_catalog_item_type_option_types
     [
+      {'code' => 'catalogItemType.type', 'shorthand' => '-t', 'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Instance', 'value' => 'instance'}, {'name' => 'Blueprint', 'value' => 'blueprint'}, {'name' => 'Workflow', 'value' => 'workflow'}], 'defaultValue' => 'instance', 'required' => true},
       {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true},
       {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text'},
-      {'fieldName' => 'type', 'fieldLabel' => 'Type', 'type' => 'select', 'selectOptions' => [{'name' => 'Instance', 'value' => 'instance'}, {'name' => 'Blueprint', 'value' => 'blueprint'}], 'defaultValue' => 'instance'},
       {'fieldName' => 'enabled', 'fieldLabel' => 'Enabled', 'type' => 'checkbox', 'defaultValue' => true},
       {'fieldName' => 'featured', 'fieldLabel' => 'Featured', 'type' => 'checkbox', 'defaultValue' => false},
       {'fieldName' => 'visibility', 'fieldLabel' => 'Visibility', 'type' => 'select', 'selectOptions' => [{'name' => 'Private', 'value' => 'private'}, {'name' => 'Public', 'value' => 'public'}], 'defaultValue' => 'private', 'required' => true},
       {'fieldName' => 'iconPath', 'fieldLabel' => 'Logo', 'type' => 'select', 'optionSource' => 'iconList'},
       #{'fieldName' => 'optionTypes', 'fieldLabel' => 'Option Types', 'type' => 'text', 'description' => 'Option Types to include, comma separated list of names or IDs.'},
-      {'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'required' => true, 'description' => 'JSON or YAML'}
+      {'dependsOnCode' => 'catalogItemType.type:instance', 'fieldName' => 'config', 'fieldLabel' => 'Config', 'type' => 'code-editor', 'description' => 'JSON or YAML', 'required' => true},
+      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'blueprint', 'fieldLabel' => 'Blueprint', 'type' => 'select', 'optionSource' => 'blueprints', 'description' => 'Choose a blueprint to apply to the catalog item.', 'required' => true, 'noParams' => true},
+      {'dependsOnCode' => 'catalogItemType.type:blueprint', 'fieldName' => 'appSpec', 'fieldLabel' => 'App Spec', 'type' => 'code-editor', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'required' => true},
+      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'workflow', 'fieldLabel' => 'Workflow', 'type' => 'select', 'optionSource' => 'operationWorkflows', 'description' => 'Enter a spec in the for the App, the Scribe YAML format', 'noParams' => true},
+      {'dependsOnCode' => 'catalogItemType.type:workflow', 'fieldName' => 'context', 'fieldLabel' => 'Context Type', 'type' => 'select', 'optionSource' => lambda { |api_client, api_params| 
+        [{'name' => "Select", 'value' => ""}, {'name' => "None", 'value' => "appliance"}, {'name' => "Instance", 'value' => "instance"}, {'name' => "Server", 'value' => "server"}]
+        }, 'description' => 'Context for operational workflow, determines target type', 'defaultValue' => 'Select', 'required' => false},
+      {'fieldName' => 'content', 'fieldLabel' => 'Content', 'type' => 'code-editor', 'description' => 'Wiki Page Content describing the catalog item'}
     ]
   end
 
@@ -489,11 +556,13 @@ EOT
   end
 
   def update_catalog_item_type_option_types
-    add_catalog_item_type_option_types.collect {|it|
+    list = add_catalog_item_type_option_types.collect {|it|
       it.delete('required')
       it.delete('defaultValue')
       it
     }
+    list = list.reject {|it| ["type"].include? it['fieldName'] }
+    list
   end
 
   def update_catalog_item_type_advanced_option_types
@@ -504,4 +573,50 @@ EOT
     }
   end
 
+  def catalog_item_type_object_key
+    'catalogItemType'
+  end
+
+  def catalog_item_type_list_key
+    'catalogItemTypes'
+  end
+
+  def find_catalog_item_type_by_name_or_id(val)
+    if val.to_s =~ /\A\d{1,}\Z/
+      return find_catalog_item_type_by_id(val)
+    else
+      return find_catalog_item_type_by_name(val)
+    end
+  end
+
+  def find_catalog_item_type_by_id(id)
+    begin
+      json_response = @catalog_item_types_interface.get(id.to_i)
+      return json_response[catalog_item_type_object_key]
+    rescue RestClient::Exception => e
+      if e.response && e.response.code == 404
+        print_red_alert "catalog item type not found by id '#{id}'"
+      else
+        raise e
+      end
+    end
+  end
+
+  def find_catalog_item_type_by_name(name)
+    json_response = @catalog_item_types_interface.list({name: name.to_s})
+    catalog_item_types = json_response[catalog_item_type_list_key]
+    if catalog_item_types.empty?
+      print_red_alert "catalog item type not found by name '#{name}'"
+      return nil
+    elsif catalog_item_types.size > 1
+      print_red_alert "#{catalog_item_types.size} catalog item types found by name '#{name}'"
+      puts_error as_pretty_table(catalog_item_types, [:id, :name], {color:red})
+      print_red_alert "Try using ID instead"
+      print reset,"\n"
+      return nil
+    else
+      return catalog_item_types[0]
+    end
+  end
+
 end