morpheus-cli 5.0.2 → 5.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25ca8fc7cabb51b4042eb212172b60191d6863cf9310ffce4e386d016692f7f1
-  data.tar.gz: d1183424bef986bb22123d60b45e97ed077c8ea30c5bfd249f8bf503c0a22d13
+  metadata.gz: 3798eb711a94541135bbefd28bbf1b33db18460ab70d7caf4d6f1cde90dafed3
+  data.tar.gz: b24f15db530f004a00899a86d8c609ee5dc44e71ee7b69cc821e33f91070b4f1
 SHA512:
-  metadata.gz: d006acc9447822675c3593de443679ac2eee514bf1ffe041ddfa5ddc44223e8edfbbeee9393056c59fb98c14d4beb240b0ce9725a3bcc56eb5e1095066d15d1c
-  data.tar.gz: ca41986fc3561f562b799971514b92dfe08027e06ad5443b0e116713fee9132d62b84905c929209be03a7dc0f3855e97adf7fe053e64832067addca692ef4268
+  metadata.gz: 165402498f461633ca18f4fd273e27cc5dcf7fddfd219722912563ea1c318a4412b9f6c6f5a014382e14bac1bfa060ffb4a794b72182739e57c1299ce685e7d2
+  data.tar.gz: 2305c2c67c28e206c9507abda3a95b2e62dadb0a6e73e44fd4b79a4feaa40f40fe713e47619f0383a30dfca22828ff439446063e5e7417746b658b08ced63804

data/.gitignore

@@ -21,3 +21,4 @@ tmp
 *.a
 mkmf.log
 .DS_Store
+.idea

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.4
 
 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
 
@@ -190,6 +190,27 @@ class Morpheus::InstancesInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def clone_image(id, payload)
+    url = "#{@base_url}/api/instances/#{id}/clone-image"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def lock(id, payload)
+    url = "#{@base_url}/api/instances/#{id}/lock"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def unlock(id, payload)
+    url = "#{@base_url}/api/instances/#{id}/unlock"
+    headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
   def firewall_disable(id)
     url = "#{@base_url}/api/instances/#{id}/security-groups/disable"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
@@ -218,6 +239,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/invoices_interface.rb

@@ -2,18 +2,27 @@ require 'morpheus/api/api_client'
 
 class Morpheus::InvoicesInterface < Morpheus::APIClient
 
+  def base_path
+    "/api/invoices"
+  end
+
   def list(params={})
-    execute(method: :get, url: "/api/invoices", headers: {params: params})
+    execute(method: :get, url: "#{base_path}", headers: {params: params})
   end
 
   def get(id, params={})
     raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
-    execute(method: :get, url: "/api/invoices/#{id}", headers: {params: params})
+    execute(method: :get, url: "#{base_path}/#{id}", headers: {params: params})
+  end
+
+  def update(id, payload)
+    validate_id!(id)
+    execute(url: "#{base_path}/#{id}", payload: payload.to_json, method: :put)
   end
 
   def refresh(params={}, payload={})
     headers = {:params => params, 'Content-Type' => 'application/json'}
-    execute(method: :post, url: "/api/invoices/refresh", headers: headers, payload: payload.to_json)
+    execute(method: :post, url: "#{base_path}/refresh", headers: headers, payload: payload.to_json)
   end
 
 end

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/budgets_command.rb

@@ -1,5 +1,6 @@
 require 'morpheus/cli/cli_command'
 require 'money' # ew, let's write our own
+require 'time'
 
 class Morpheus::Cli::BudgetsCommand
   include Morpheus::Cli::CliCommand
@@ -21,76 +22,72 @@ class Morpheus::Cli::BudgetsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_list_options(opts, options)
       opts.footer = "List budgets."
     end
     optparse.parse!(args)
-    if args.count != 0
-      raise_command_error "wrong number of arguments, expected 0 and got (#{args.count}) #{args}\n#{optparse}"
+    # 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
-      params.merge!(parse_list_options(options))
-      @budgets_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @budgets_interface.dry.list(params)
-        return 0
-      end
-      json_response = @budgets_interface.list(params)
-      render_result = render_with_format(json_response, options, 'budgets')
-      return 0 if render_result
-      budgets = json_response['budgets']
-      unless options[:quiet]
-        title = "Morpheus Budgets"
-        subtitles = []
-        subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles
-        if budgets.empty?
-          print cyan,"No budgets found.",reset,"\n"
-        else
-          columns = [
-            {"ID" => lambda {|budget| budget['id'] } },
-            {"NAME" => lambda {|budget| budget['name'] } },
-            {"DESCRIPTION" => lambda {|budget| truncate_string(budget['description'], 30) } },
-            # {"ENABLED" => lambda {|budget| format_boolean(budget['enabled']) } },
-            # {"SCOPE" => lambda {|it| format_budget_scope(it) } },
-            {"SCOPE" => lambda {|it| it['refName'] } },
-            {"PERIOD" => lambda {|it| it['year'] } },
-            {"INTERVAL" => lambda {|it| it['interval'].to_s.capitalize } },
-            # the UI doesn't consider timezone, so uhh do it this hacky way for now.
-            {"START DATE" => lambda {|it| 
-              if it['timezone'] == 'UTC'
-                ((parse_time(it['startDate'], "%Y-%m-%d").strftime("%x")) rescue it['startDate']) # + ' UTC'
-              else
-                format_local_date(it['startDate']) 
-              end
-            } },
-            {"END DATE" => lambda {|it| 
-              if it['timezone'] == 'UTC'
-                ((parse_time(it['endDate'], "%Y-%m-%d").strftime("%x")) rescue it['endDate']) # + ' UTC'
-              else
-                format_local_date(it['endDate']) 
-              end
-            } },
-            {"TOTAL" => lambda {|it| format_money(it['totalCost'], it['currency']) } },
-            {"AVERAGE" => lambda {|it| format_money(it['averageCost'], it['currency']) } },
-            # {"CREATED BY" => lambda {|budget| budget['createdByName'] ? budget['createdByName'] : budget['createdById'] } },
-            # {"CREATED" => lambda {|budget| format_local_dt(budget['dateCreated']) } },
-            # {"UPDATED" => lambda {|budget| format_local_dt(budget['lastUpdated']) } },
-          ]
-          if options[:include_fields]
-            columns = options[:include_fields]
-          end
-          print as_pretty_table(budgets, columns, options)
-          print_results_pagination(json_response)
+    
+    params.merge!(parse_list_options(options))
+    @budgets_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @budgets_interface.dry.list(params)
+      return 0
+    end
+    json_response = @budgets_interface.list(params)
+    budgets = json_response['budgets']
+    render_response(json_response, options, 'budgets') do
+      title = "Morpheus Budgets"
+      subtitles = []
+      subtitles += parse_list_subtitles(options)
+      print_h1 title, subtitles
+      if budgets.empty?
+        print cyan,"No budgets found.",reset,"\n"
+      else
+        columns = [
+          {"ID" => lambda {|budget| budget['id'] } },
+          {"NAME" => lambda {|budget| budget['name'] } },
+          {"DESCRIPTION" => lambda {|budget| truncate_string(budget['description'], 30) } },
+          # {"ENABLED" => lambda {|budget| format_boolean(budget['enabled']) } },
+          # {"SCOPE" => lambda {|it| format_budget_scope(it) } },
+          {"SCOPE" => lambda {|it| it['refName'] } },
+          {"PERIOD" => lambda {|it| it['year'] } },
+          {"INTERVAL" => lambda {|it| it['interval'].to_s.capitalize } },
+          # the UI doesn't consider timezone, so uhh do it this hacky way for now.
+          {"START DATE" => lambda {|it| 
+            if it['timezone'] == 'UTC'
+              ((parse_time(it['startDate'], "%Y-%m-%d").strftime("%x")) rescue it['startDate']) # + ' UTC'
+            else
+              format_local_date(it['startDate']) 
+            end
+          } },
+          {"END DATE" => lambda {|it| 
+            if it['timezone'] == 'UTC'
+              ((parse_time(it['endDate'], "%Y-%m-%d").strftime("%x")) rescue it['endDate']) # + ' UTC'
+            else
+              format_local_date(it['endDate']) 
+            end
+          } },
+          {"TOTAL" => lambda {|it| format_money(it['totalCost'], it['currency']) } },
+          {"AVERAGE" => lambda {|it| format_money(it['averageCost'], it['currency']) } },
+          # {"CREATED BY" => lambda {|budget| budget['createdByName'] ? budget['createdByName'] : budget['createdById'] } },
+          # {"CREATED" => lambda {|budget| format_local_dt(budget['dateCreated']) } },
+          # {"UPDATED" => lambda {|budget| format_local_dt(budget['lastUpdated']) } },
+        ]
+        if options[:include_fields]
+          columns = options[:include_fields]
         end
-        print reset,"\n"
+        print as_pretty_table(budgets, columns, options)
+        print_results_pagination(json_response)
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+      print reset,"\n"
     end
+    return budgets.empty? ? [3, "no budgets found"] : [0, nil]
   end
 
   def get(args)
@@ -98,37 +95,32 @@ class Morpheus::Cli::BudgetsCommand
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[budget]")
-      build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_standard_get_options(opts, options)
       opts.footer = "Get details about a budget.\n[budget] is required. Budget ID or name"
     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
-
+    verify_args!(args:args, optparse:optparse, count:1)
     connect(options)
-    begin
-      @budgets_interface.setopts(options)
-      if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @budgets_interface.dry.get(args[0], params)
-        else
-          print_dry_run @budgets_interface.dry.list({name: args[0].to_s})
-        end
-        return 0
-      end
-      budget = find_budget_by_name_or_id(args[0])
-      return 1 if budget.nil?
-      # skip reload if already fetched via get(id)
-      json_response = {'budget' => budget}
-      if args[0].to_s != budget['id'].to_s
-        json_response = @budgets_interface.get(budget['id'], params)
-        budget = json_response['budget']
+    params.merge!(parse_query_options(options))
+    @budgets_interface.setopts(options)
+    if options[:dry_run]
+      if args[0].to_s =~ /\A\d{1,}\Z/
+        print_dry_run @budgets_interface.dry.get(args[0], params)
+      else
+        print_dry_run @budgets_interface.dry.list({name: args[0].to_s})
       end
-      render_result = render_with_format(json_response, options, 'budget')
-      return 0 if render_result
-
+      return 0
+    end
+    budget = find_budget_by_name_or_id(args[0])
+    return 1 if budget.nil?
+    # skip reload if already fetched via get(id)
+    json_response = {'budget' => budget}
+    if args[0].to_s != budget['id'].to_s
+      json_response = @budgets_interface.get(budget['id'], params)
+      budget = json_response['budget']
+    end
+    
+    render_response(json_response, options, 'budget') do
       
       print_h1 "Budget Details"
       print cyan
@@ -140,52 +132,6 @@ class Morpheus::Cli::BudgetsCommand
         "Scope" => lambda {|it| format_budget_scope(it) },
         "Period" => lambda {|it| it['year'] },
         "Interval" => lambda {|it| it['interval'].to_s.capitalize },
-        # "Costs" => lambda {|it| it['costs'].inspect },
-      }
-      if budget['interval'] == 'year'
-        budget_columns.merge!({
-          "Annual" => lambda {|it| 
-            (it['costs'] && it['costs']['year']) ? format_money(it['costs']['year'], it['currency']) : '' 
-          },
-        })
-      elsif budget['interval'] == 'quarter'
-        budget_columns.merge!({
-          "Q1" => lambda {|it| (it['costs'] && it['costs']['q1']) ? format_money(it['costs']['q1'], it['currency']) : ''   },
-          "Q2" => lambda {|it| (it['costs'] && it['costs']['q2']) ? format_money(it['costs']['q2'], it['currency']) : ''  },
-          "Q3" => lambda {|it| (it['costs'] && it['costs']['q3']) ? format_money(it['costs']['q3'], it['currency']) : ''  },
-          "Q4" => lambda {|it| (it['costs'] && it['costs']['q4']) ? format_money(it['costs']['q4'], it['currency']) : ''  },
-        })
-      elsif budget['interval'] == 'month'
-        budget_columns.merge!({
-          "January" => lambda {|it| (it['costs'] && it['costs']['january']) ? format_money(it['costs']['january'], it['currency']) : ''  },
-          "February" => lambda {|it| (it['costs'] && it['costs']['february']) ? format_money(it['costs']['february'], it['currency']) : ''  },
-          "March" => lambda {|it| (it['costs'] && it['costs']['march']) ? format_money(it['costs']['march'], it['currency']) : ''  },
-          "April" => lambda {|it| (it['costs'] && it['costs']['april']) ? format_money(it['costs']['april'], it['currency']) : ''  },
-          "May" => lambda {|it| (it['costs'] && it['costs']['may']) ? format_money(it['costs']['may'], it['currency']) : ''  },
-          "June" => lambda {|it| (it['costs'] && it['costs']['june']) ? format_money(it['costs']['june'], it['currency']) : ''  },
-          "July" => lambda {|it| (it['costs'] && it['costs']['july']) ? format_money(it['costs']['july'], it['currency']) : ''  },
-          "August" => lambda {|it| (it['costs'] && it['costs']['august']) ? format_money(it['costs']['august'], it['currency']) : ''  },
-          "September" => lambda {|it| (it['costs'] && it['costs']['september']) ? format_money(it['costs']['september'], it['currency']) : ''  },
-          "October" => lambda {|it| (it['costs'] && it['costs']['october']) ? format_money(it['costs']['october'], it['currency']) : ''  },
-          "November" => lambda {|it| (it['costs'] && it['costs']['november']) ? format_money(it['costs']['nov'], it['currency']) : ''  },
-          "December" => lambda {|it| (it['costs'] && it['costs']['december']) ? format_money(it['costs']['december'], it['currency']) : ''  }
-        })
-      else
-        budget_columns.merge!({
-          "Costs" => lambda {|it| 
-            if it['costs'].is_a?(Array)
-              it['costs'] ? it['costs'].join(', ') : '' 
-            elsif it['costs'].is_a?(Hash)
-              it['costs'].to_s
-            else
-              it['costs'].to_s
-            end
-          },
-        })
-      end
-      budget_columns.merge!({
-        "Total" => lambda {|it| format_money(it['totalCost'], it['currency']) },
-        "Average" => lambda {|it| format_money(it['averageCost'], it['currency']) },
         # the UI doesn't consider timezone, so uhh do it this hacky way for now.
         "Start Date" => lambda {|it| 
           if it['timezone'] == 'UTC'
@@ -201,13 +147,19 @@ class Morpheus::Cli::BudgetsCommand
             format_local_date(it['endDate']) 
           end
         },
-        "Timezone" => lambda {|it| it['timezone'] },
-      })
-      budget_columns.merge!({
+        # "Costs" => lambda {|it| 
+        #   if it['costs'].is_a?(Array)
+        #     it['costs'] ? it['costs'].join(', ') : '' 
+        #   elsif it['costs'].is_a?(Hash)
+        #     it['costs'].to_s
+        #   else
+        #     it['costs'].to_s
+        #   end
+        # },
         "Created By" => lambda {|it| it['createdByName'] ? it['createdByName'] : it['createdById'] },
         "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
         "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
-      })
+      }
       print_description_list(budget_columns, budget, options)
       # print reset,"\n"
 
@@ -221,33 +173,17 @@ class Morpheus::Cli::BudgetsCommand
           }
           budget_row = {label:"Budget"}
           actual_row = {label:"Actual"}
-          # budget['stats']['intervals'].each do |stat_interval|
-          #   interval_key = (stat_interval["shortName"] || stat_interval["shortYear"]).to_s.upcase
-          #   if interval_key == "Y1" && budget['year']
-          #     interval_key = "Year #{budget['year']}"
-          #   end
-          #   budget_summary_columns[interval_key] = lambda {|it| 
-          #     display_val = format_money(it[interval_key], budget['stats']['currency'])
-          #     over_budget = actual_row[interval_key] && (actual_row[interval_key] > (budget_row[interval_key] || 0))
-          #     if over_budget
-          #       "#{red}#{display_val}#{cyan}"
-          #     else
-          #       "#{cyan}#{display_val}#{cyan}"
-          #     end
-          #   }
-          #   budget_row[interval_key] = stat_interval["budget"].to_f
-          #   actual_row[interval_key] = stat_interval["cost"].to_f
-          # end
-          budget['stats']['intervals'].each do |stat_interval|
+          multi_year = false
+          if budget['startDate'] && budget['endDate'] && parse_time(budget['startDate']).year != parse_time(budget['endDate']).year
+            multi_year = true
+          end
+          budget['stats']['intervals'].each do |it|
             currency = budget['currency'] || budget['stats']['currency']
-            interval_key = (stat_interval["shortName"] || stat_interval["shortYear"]).to_s.upcase
-            if interval_key == "Y1" && budget['year']
-              interval_key = "Year #{budget['year']}"
-            end
-            # add simple column definition, just use the key
+            interval_key = format_budget_interval_label(budget, it).to_s.upcase
+            # interval_date = parse_time(it["startDate"]) rescue nil
             budget_summary_columns[interval_key] = interval_key
-            budget_cost = stat_interval["budget"].to_f
-            actual_cost = stat_interval["cost"].to_f
+            budget_cost = it["budget"].to_f
+            actual_cost = it["cost"].to_f
             over_budget = actual_cost > 0 && actual_cost > budget_cost
             if over_budget
               budget_row[interval_key] = "#{cyan}#{format_money(budget_cost, currency)}#{cyan}"
@@ -262,44 +198,65 @@ class Morpheus::Cli::BudgetsCommand
           print reset,"\n"
         rescue => ex
           print red,"Failed to render budget summary.",reset,"\n"
+          raise ex
         end
       else
         print cyan,"No budget stat data found.",reset,"\n"
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
     end
+    return 0, nil
   end
 
   def add(args)
     options = {}
     params = {}
-    costs = {}
+    costs = []
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [options]")
       build_option_type_options(opts, options, add_budget_option_types)
-      opts.on('--cost [amount]', String, "Budget cost amount, for use with default year interval.") do |val|
-        costs['year'] = (val.nil? || val.empty?) ? 0 : val.to_f
+      # opts.on('--cost [amount]', String, "Budget cost amount, for use with default year interval.") do |val|
+      #   costs['year'] = (val.nil? || val.empty?) ? 0 : val.to_f
+      # end
+      opts.on('--costs LIST', String, "Budget cost amounts, one for each interval in the budget. eg \"350\" for one year, \"25,25,25,100\" for quarters, and \"10,10,10,10,10,10,10,10,10,10,10,50\" for each month") do |val|
+        val = val.to_s.gsub('[', '').gsub(']', '')
+        costs = val.to_s.split(',').collect {|it| parse_cost_amount(it) }
+      end
+      (1..12).each.with_index do |cost_index, i|
+        opts.on("--cost#{cost_index} VALUE", String, "Cost #{cost_index.to_s.capitalize} amount") do |val|
+          #params["cost#{cost_index.to_s}"] = parse_cost_amount(val)
+          costs[i] = parse_cost_amount(val)
+        end
+        opts.add_hidden_option("--cost#{cost_index}")
       end
-      [:q1,:q2,:q3,:q4,
-      ].each do |quarter|
-        opts.on("--#{quarter.to_s} [amount]", String, "#{quarter.to_s.capitalize} cost amount, use with quarter interval.") do |val|
-          costs[quarter.to_s] = parse_cost_amount(val)
+      [:q1,:q2,:q3,:q4,].each.with_index do |quarter, i|
+        opts.on("--#{quarter.to_s} VALUE", String, "#{quarter.to_s.capitalize} cost amount, use with quarter interval.") do |val|
+          costs[i] = parse_cost_amount(val)
         end
+        opts.add_hidden_option("--#{quarter.to_s}")
       end
-      [:january,:february,:march,:april,:may,:june,:july,:august,:september,:october,:november,:december
-      ].each do |month|
-        opts.on("--#{month.to_s} [amount]", String, "#{month.to_s.capitalize} cost amount, use with month interval.") do |val|
-          costs[month.to_s] = parse_cost_amount(val)
+      [:january,:february,:march,:april,:may,:june,:july,:august,:september,:october,:november,:december].each_with_index do |month, i|
+        opts.on("--#{month.to_s} VALUE", String, "#{month.to_s.capitalize} cost amount, use with month interval.") do |val|
+          costs[i] = parse_cost_amount(val)
         end
+        opts.add_hidden_option("--#{month.to_s}")
       end
       opts.on('--enabled [on|off]', String, "Can be used to disable a policy") do |val|
         params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s.empty?
       end
-      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :remote])
-      opts.footer = "Create budget."
+      build_standard_add_options(opts, options)
+      opts.footer = <<-EOT
+Create a budget.
+The default period is the current year, eg. "#{Time.now.year}"
+and the default interval is "year".
+Costs can be passed as an array of values, one for each interval. eg. --costs "[999]"
+
+Examples:
+budgets add example-budget --interval "year" --costs "[2500]"
+budgets add example-qtr-budget --interval "quarter" --costs "[500,500,500,1000]"
+budgets add example-monthly-budget --interval "month" --costs "[400,100,100,100,100,100,100,100,100,100,400,800]"
+budgets add example-future-budget --year "2022" --interval "year" --costs "[5000]"
+budgets add example-custom-budget --year "custom" --interval "year" --start "2021-01-01" --end "2023-12-31" --costs "[2500,5000,10000]"
+EOT
     end
     optparse.parse!(args)
     if args.count > 1
@@ -322,21 +279,37 @@ class Morpheus::Cli::BudgetsCommand
           }
         }
         # allow arbitrary -O options
-        passed_options.delete('costs')
+        #passed_options.delete('costs')
         passed_options.delete('tenant')
         passed_options.delete('group')
         passed_options.delete('cloud')
         passed_options.delete('user')
         payload.deep_merge!({'budget' => passed_options}) unless passed_options.empty?
         # prompt for options
-        if !costs.empty?
-          options[:options]['costs'] ||= {}
-          options[:options]['costs'].deep_merge!(costs)
-        end
-        options[:options]['interval'] = options[:options]['interval'].to_s.downcase if options[:options]['interval']
         v_prompt = Morpheus::Cli::OptionTypes.prompt(add_budget_option_types, options[:options], @api_client)
         params.deep_merge!(v_prompt)
-        params['costs'] = prompt_costs(params, options)
+        # downcase year 'custom' always
+        if params['year']
+          params['interval'] = params['interval'].to_s.downcase
+        end
+        # downcase interval always
+        if params['interval']
+          params['interval'] = params['interval'].to_s.downcase
+        end
+        # parse MM/DD/YY but need to convert to to ISO format YYYY-MM-DD for api
+        standard_start_date = (params['startDate'] ? Time.strptime(params['startDate'], "%x") : nil) rescue nil
+        if standard_start_date
+          params['startDate'] = format_date(standard_start_date, {format:"%Y-%m-%d"})
+        end
+        standard_end_date = (params['endDate'] ? Time.strptime(params['endDate'], "%x") : nil) rescue nil
+        if standard_end_date
+          params['endDate'] = format_date(standard_end_date, {format:"%Y-%m-%d"})
+        end
+        if !costs.empty?
+          params['costs'] = costs
+        else
+          params['costs'] = prompt_costs(params, options)
+        end
         # budgets api expects scope prefixed parameters like this
         if params['tenant'].is_a?(String) || params['tenant'].is_a?(Numeric)
           params['scopeTenantId'] = params.delete('tenant')
@@ -377,30 +350,45 @@ class Morpheus::Cli::BudgetsCommand
   def update(args)
     options = {}
     params = {}
-    costs = {}
+    costs = []
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[budget] [options]")
       build_option_type_options(opts, options, update_budget_option_types)
-      opts.on('--cost [amount]', String, "Budget cost amount, for use with default year interval.") do |val|
-        costs['year'] = (val.nil? || val.empty?) ? 0 : val.to_f
+      # opts.on('--cost [amount]', String, "Budget cost amount, for use with default year interval.") do |val|
+      #   costs['year'] = (val.nil? || val.empty?) ? 0 : val.to_f
+      # end
+      opts.on('--costs COSTS', String, "Budget cost amounts, one for each interval in the budget. eg. [999]") do |val|
+        val = val.to_s.gsub('[', '').gsub(']', '')
+        costs = val.to_s.split(',').collect {|it| parse_cost_amount(it) }
       end
-      [:q1,:q2,:q3,:q4,
-      ].each do |quarter|
-        opts.on("--#{quarter.to_s} [amount]", String, "#{quarter.to_s.capitalize} cost amount, use with quarter interval.") do |val|
-          costs[quarter.to_s] = parse_cost_amount(val)
+      (1..12).each.with_index do |cost_index, i|
+        opts.on("--cost#{cost_index} VALUE", String, "Cost #{cost_index.to_s.capitalize} amount") do |val|
+          #params["cost#{cost_index.to_s}"] = parse_cost_amount(val)
+          costs[i] = parse_cost_amount(val)
         end
+        opts.add_hidden_option("--cost#{cost_index}")
       end
-      [:january,:february,:march,:april,:may,:june,:july,:august,:september,:october,:november,:december
-      ].each do |month|
-        opts.on("--#{month.to_s} [amount]", String, "#{month.to_s.capitalize} cost amount, use with month interval.") do |val|
-          costs[month.to_s] = parse_cost_amount(val)
+      [:q1,:q2,:q3,:q4,].each.with_index do |quarter, i|
+        opts.on("--#{quarter.to_s} VALUE", String, "#{quarter.to_s.capitalize} cost amount, use with quarter interval.") do |val|
+          costs[i] = parse_cost_amount(val)
         end
+        opts.add_hidden_option("--#{quarter.to_s}")
+      end
+      [:january,:february,:march,:april,:may,:june,:july,:august,:september,:october,:november,:december].each_with_index do |month, i|
+        opts.on("--#{month.to_s} VALUE", String, "#{month.to_s.capitalize} cost amount, use with month interval.") do |val|
+          costs[i] = parse_cost_amount(val)
+        end
+        opts.add_hidden_option("--#{month.to_s}")
       end
       opts.on('--enabled [on|off]', String, "Can be used to disable a policy") do |val|
         params['enabled'] = val.to_s == 'on' || val.to_s == 'true' || val.to_s.empty?
       end
-      build_common_options(opts, options, [:payload, :options, :json, :dry_run, :remote])
-      opts.footer = "Update budget.\n[budget] is required. Budget ID or name"
+      build_standard_update_options(opts, options)
+      opts.footer = <<-EOT
+Update a budget.
+[budget] is required. Budget ID or name
+EOT
+      opts.footer = "Update a budget.\n[budget] is required. Budget ID or name"
     end
     optparse.parse!(args)
 
@@ -409,78 +397,99 @@ class Morpheus::Cli::BudgetsCommand
     end
 
     connect(options)
-    begin
+    
+    budget = find_budget_by_name_or_id(args[0])
+    return 1 if budget.nil?
 
-      budget = find_budget_by_name_or_id(args[0])
-      return 1 if budget.nil?
+    original_year = budget['year']
+    original_interval = budget['interval']
+    original_costs = budget['costs'].is_a?(Array) ? budget['costs'] : 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!({'budget' => passed_options}) unless passed_options.empty?
-      else
-        payload = {
-          'budget' => {
-          }
+    # 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!({'budget' => passed_options}) unless passed_options.empty?
+    else
+      payload = {
+        'budget' => {
         }
-        # allow arbitrary -O options
-        passed_options.delete('costs')
-        passed_options.delete('tenant')
-        passed_options.delete('group')
-        passed_options.delete('cloud')
-        passed_options.delete('user')
-        payload.deep_merge!({'budget' => passed_options}) unless passed_options.empty?
-        # prompt for options
-        #params = Morpheus::Cli::OptionTypes.prompt(update_budget_option_types, options[:options], @api_client, options[:params])
-        v_prompt = Morpheus::Cli::OptionTypes.prompt(update_budget_option_types, options[:options].merge(:no_prompt => true), @api_client)
-        params.deep_merge!(v_prompt)
-        # v_costs = prompt_costs({'interval' => budget['interval']}.merge(params), options.merge(:no_prompt => true))
-        # if v_costs && !v_costs.empty?
-        #   params['costs'] = v_costs
-        # end
-        if !costs.empty?
-          params['costs'] = costs
-        end
-        # budgets api expects scope prefixed parameters like this
-        if params['tenant'].is_a?(String) || params['tenant'].is_a?(Numeric)
-          params['scopeTenantId'] = params.delete('tenant')
-        end
-        if params['group'].is_a?(String) || params['group'].is_a?(Numeric)
-          params['scopeGroupId'] = params.delete('group')
-        end
-        if params['cloud'].is_a?(String) || params['cloud'].is_a?(Numeric)
-          params['scopeCloudId'] = params.delete('cloud')
+      }
+      # allow arbitrary -O options
+      #passed_options.delete('costs')
+      passed_options.delete('tenant')
+      passed_options.delete('group')
+      passed_options.delete('cloud')
+      passed_options.delete('user')
+      payload.deep_merge!({'budget' => passed_options}) unless passed_options.empty?
+      # prompt for options
+      #params = Morpheus::Cli::OptionTypes.prompt(update_budget_option_types, options[:options], @api_client, options[:params])
+      v_prompt = Morpheus::Cli::OptionTypes.prompt(update_budget_option_types, options[:options].merge(:no_prompt => true), @api_client)
+      params.deep_merge!(v_prompt)
+      # downcase year 'custom' always
+      if params['year']
+        params['interval'] = params['interval'].to_s.downcase
+      end
+      # downcase interval always
+      if params['interval']
+        params['interval'] = params['interval'].to_s.downcase
+      end
+      # parse MM/DD/YY but need to convert to to ISO format YYYY-MM-DD for api
+      if params['startDate']
+        params['startDate'] = format_date(parse_time(params['startDate']), {format:"%Y-%m-%d"})
+      end
+      if params['endDate']
+        params['endDate'] = format_date(parse_time(params['endDate']), {format:"%Y-%m-%d"})
+      end
+      if !costs.empty?
+        params['costs'] = costs
+        # merge original costs in on update unless interval is changing too, should check original_year too probably if going to custom...
+        if params['interval'] && params['interval'] != original_interval
+          original_costs = nil
         end
-        if params['user'].is_a?(String) || params['user'].is_a?(Numeric)
-          params['scopeUserId'] = params.delete('user')
+        if original_costs
+          original_costs.each_with_index do |original_cost, i|
+            if params['costs'][i].nil?
+              params['costs'][i] = original_cost
+            end
+          end
         end
-        payload.deep_merge!({'budget' => params}) unless params.empty?
-
-        if payload.empty? || payload['budget'].empty?
-          raise_command_error "Specify at least one option to update.\n#{optparse}"
+      else
+        if params['interval'] && params['interval'] != original_interval
+          raise_command_error "Changing interval requires setting the costs as well.\n#{optparse}"
         end
       end
-      @budgets_interface.setopts(options)
-      if options[:dry_run]
-        print_dry_run @budgets_interface.dry.update(budget['id'], payload)
-        return
+      # budgets api expects scope prefixed parameters like this
+      if params['tenant'].is_a?(String) || params['tenant'].is_a?(Numeric)
+        params['scopeTenantId'] = params.delete('tenant')
       end
-      json_response = @budgets_interface.update(budget['id'], payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
-        display_name = json_response['budget'] ? json_response['budget']['name'] : ''
-        print_green_success "Budget #{display_name} updated"
-        get([json_response['budget']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      if params['group'].is_a?(String) || params['group'].is_a?(Numeric)
+        params['scopeGroupId'] = params.delete('group')
       end
-      return 0
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
+      if params['cloud'].is_a?(String) || params['cloud'].is_a?(Numeric)
+        params['scopeCloudId'] = params.delete('cloud')
+      end
+      if params['user'].is_a?(String) || params['user'].is_a?(Numeric)
+        params['scopeUserId'] = params.delete('user')
+      end
+      payload.deep_merge!({'budget' => params}) unless params.empty?
+      if payload.empty? || payload['budget'].empty?
+        raise_command_error "Specify at least one option to update.\n#{optparse}"
+      end
+    end
+    @budgets_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @budgets_interface.dry.update(budget['id'], payload)
+      return
+    end
+    json_response = @budgets_interface.update(budget['id'], payload)
+    render_response(json_response, options, 'budget') do
+      display_name = json_response['budget'] ? json_response['budget']['name'] : ''
+      print_green_success "Budget #{display_name} updated"
+      get([json_response['budget']['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
     end
+    return 0, nil
   end
 
   def remove(args)
@@ -582,75 +591,125 @@ class Morpheus::Cli::BudgetsCommand
       {'fieldName' => 'cloud', 'fieldLabel' => 'Cloud', 'type' => 'select', 'optionSource' => lambda {|api_client, api_params| 
         @options_interface.options_for_source("clouds", {})['data']
       }, 'required' => true, 'dependsOnCode' => 'budget.scope:cloud', 'displayOrder' => 7},
-      {'fieldName' => 'year', 'fieldLabel' => 'Period', 'type' => 'text', 'required' => true, 'defaultValue' => Time.now.year, 'description' => "The period (year) the budget applies to. Default is the current year.", 'displayOrder' => 8},
-      {'fieldName' => 'interval', 'fieldLabel' => 'Interval', 'type' => 'select', 'selectOptions' => [{'name'=>'Year','value'=>'year'},{'name'=>'Quarter','value'=>'quarter'},{'name'=>'Month','value'=>'month'}], 'defaultValue' => 'year', 'required' => true, 'displayOrder' => 9}
+      {'fieldName' => 'year', 'fieldLabel' => 'Period', 'code' => 'budget.year', 'type' => 'text', 'required' => true, 'defaultValue' => Time.now.year, 'description' => "The period (year) the budget applies, YYYY or 'custom' to enter Start Date and End Date manually", 'displayOrder' => 8},
+      {'fieldName' => 'startDate', 'fieldLabel' => 'Start Date', 'type' => 'text', 'required' => true, 'description' => 'The Start Date for custom period budget eg. 2021-01-01', 'dependsOnCode' => 'budget.year:custom', 'displayOrder' => 9},
+      {'fieldName' => 'endDate', 'fieldLabel' => 'End Date', 'type' => 'text', 'required' => true, 'description' => 'The End Date for custom period budget eg. 2023-12-31 (must be 1, 2 or 3 years from Start Date)', 'dependsOnCode' => 'budget.year:custom', 'displayOrder' => 10},
+      {'fieldName' => 'interval', 'fieldLabel' => 'Interval', 'type' => 'select', 'selectOptions' => [{'name'=>'Year','value'=>'year'},{'name'=>'Quarter','value'=>'quarter'},{'name'=>'Month','value'=>'month'}], 'defaultValue' => 'year', 'required' => true, 'description' => 'The budget interval, determines cost amounts: "year", "quarter" or "month"', 'displayOrder' => 11}
     ]
   end
 
   def update_budget_option_types
     list = add_budget_option_types()
     # list = list.reject {|it| ["interval"].include? it['fieldName'] }
-    list.each {|it| it.delete('required') }
-    list.each {|it| it.delete('defaultValue') }
+    list.each {|it| 
+      it.delete('required') 
+      it.delete('defaultValue')
+      it.delete('dependsOnCode')
+    }
     list
   end
 
   def prompt_costs(params={}, options={})
+    # user did -O costs="[3.50,3.50,3.50,5.00]" so just pass through
+    default_costs = []
+    if options[:options]['costs'] && options[:options]['costs'].is_a?(Array)
+      default_costs = options[:options]['costs']
+      default_costs.each_with_index do |default_cost, i|
+        interval_index =  i + 1
+        if !default_cost.nil?
+          options[:options]["cost#{interval_index}"] = default_cost
+        end
+      end
+    end
+    # prompt for each Period Cost based on interval [year|quarter|month]
+    budget_period_year = (params['year'] || params['periodValue'])
+    is_custom = budget_period_year == 'custom'
     interval = params['interval'] #.to_s.downcase
-    options[:options]||={}
-    costs = {}
-    costs_val = nil
-    #costs_val = params['costs'] ? params['costs'] : options[:options]['costs']
-    if costs_val.is_a?(Array)
-      costs = costs_val
-    elsif costs_val.is_a?(String)
-      costs = costs_val.to_s.split(',').collect {|it| it.to_s.strip.to_f }
+    total_years = 1
+    total_months = 12
+    costs = []
+    # custom timeframe so prompt from start to end by interval
+    start_date = nil
+    end_date = nil
+
+    if is_custom
+      start_date = parse_time(params['startDate'])
+      if start_date.nil?
+        raise_command_error "startDate is required for custom period budgets"
+      end
+      end_date = parse_time(params['endDate'])
+      if end_date.nil?
+        raise_command_error "endDate is required for custom period budgets"
+      end
     else
-      if interval == 'year'
-        cost_option_types = [
-          {'fieldContext' => 'costs', 'fieldName' => 'year', 'fieldLabel' => 'Annual Cost', 'type' => 'text', 'defaultValue' => 0}
-        ]
-        values = Morpheus::Cli::OptionTypes.prompt(cost_option_types, options[:options], @api_client)
-        costs = values['costs'] ? values['costs'] : {}
-        # costs = {
-        #   year: values['cost']
-        # }
-      elsif interval == 'quarter'
-        cost_option_types = [
-          {'fieldContext' => 'costs', 'fieldName' => 'q1', 'fieldLabel' => 'Q1', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 1},
-          {'fieldContext' => 'costs', 'fieldName' => 'q2', 'fieldLabel' => 'Q2', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 2},
-          {'fieldContext' => 'costs', 'fieldName' => 'q3', 'fieldLabel' => 'Q3', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 3},
-          {'fieldContext' => 'costs', 'fieldName' => 'q4', 'fieldLabel' => 'Q4', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 4}
-        ]
-        values = Morpheus::Cli::OptionTypes.prompt(cost_option_types, options[:options], @api_client)
-        costs = values['costs'] ? values['costs'] : {}
-        # costs = {
-        #   q1: values['q1'], q2: values['q2'], q3: values['q3'], q4: values['q4']
-        # }
-      elsif interval == 'month'
-        cost_option_types = [
-          {'fieldContext' => 'costs', 'fieldName' => 'january', 'fieldLabel' => 'January', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 1},
-          {'fieldContext' => 'costs', 'fieldName' => 'february', 'fieldLabel' => 'February', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 2},
-          {'fieldContext' => 'costs', 'fieldName' => 'march', 'fieldLabel' => 'March', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 3},
-          {'fieldContext' => 'costs', 'fieldName' => 'april', 'fieldLabel' => 'April', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 4},
-          {'fieldContext' => 'costs', 'fieldName' => 'may', 'fieldLabel' => 'May', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 5},
-          {'fieldContext' => 'costs', 'fieldName' => 'june', 'fieldLabel' => 'June', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 6},
-          {'fieldContext' => 'costs', 'fieldName' => 'july', 'fieldLabel' => 'July', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 7},
-          {'fieldContext' => 'costs', 'fieldName' => 'august', 'fieldLabel' => 'August', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 8},
-          {'fieldContext' => 'costs', 'fieldName' => 'september', 'fieldLabel' => 'September', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 9},
-          {'fieldContext' => 'costs', 'fieldName' => 'october', 'fieldLabel' => 'October', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 10},
-          {'fieldContext' => 'costs', 'fieldName' => 'november', 'fieldLabel' => 'November', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 11},
-          {'fieldContext' => 'costs', 'fieldName' => 'december', 'fieldLabel' => 'December', 'type' => 'text', 'defaultValue' => 0, 'displayOrder' => 12},
-        ]
-        values = Morpheus::Cli::OptionTypes.prompt(cost_option_types, options[:options], @api_client)
-        costs = values['costs'] ? values['costs'] : {}
-        # costs = {
-        #   january: values['january'], february: values['february'], march: values['march'],
-        #   april: values['april'], may: values['may'], june: values['june'],
-        #   july: values['july'], august: values['august'], september: values['september'],
-        #   october: values['october'], november: values['november'], december: values['december']
-        # }
+      budget_year = budget_period_year ? budget_period_year.to_i : Time.now.year.to_i
+      start_date = Time.new(budget_year, 1, 1)
+      end_date = Time.new(budget_year, 12, 31)
+    end
+    epoch_start_month = (start_date.year * 12) + start_date.month
+    epoch_end_month = (end_date.year * 12) + end_date.month
+    # total_months gets + 1 because endDate is same year, on last day of the month, Dec 31 by default
+    total_months = (epoch_end_month - epoch_start_month) + 1
+    total_years = (total_months / 12)
+    cost_option_types = []
+    interval_count = total_months
+    if interval == 'year'
+      interval_count = total_months / 12
+    elsif interval == 'quarter'
+      interval_count = total_months / 3
+    end
+    
+    is_fiscal = start_date.month != 1 || start_date.day != 1
+
+    # debug budget shenanigans
+    # puts "START: #{start_date}"
+    # puts "END: #{end_date}"
+    # puts "EPOCH MONTHS: #{epoch_start_month} - #{epoch_end_month}"
+    # puts "TOTAL MONTHS: #{total_months}"
+    # puts "INTERVAL COUNT IS: #{interval_count}"
+
+    if total_months < 0
+      raise_command_error "budget cannot end (#{end_date}) before it starts (#{start_date})"
+    end
+    if (total_months % 12) != 0 || (total_months > 36)
+      raise_command_error "budget custom period must be 12, 24, or 36 months."
+    end
+    if interval == 'year'
+      (1..interval_count).each_with_index do |interval_index, i|
+        interval_start_month = epoch_start_month + (i * 12)
+        interval_date = Time.new((interval_start_month / 12), (interval_start_month % 12) == 0 ? 12 : (interval_start_month % 12), 1)
+        display_year = is_fiscal ? "FY #{interval_date.year + 1}" : interval_date.year.to_s
+        field_name = "cost#{interval_index}"
+        field_label = "#{display_year} Cost"
+        cost_option_types << {'fieldName' => field_name, 'fieldLabel' => field_label, 'type' => 'text', 'required' => true, 'defaultValue' => (default_costs[i] || 0).to_s}
+      end
+    elsif interval == 'quarter'
+      (1..interval_count).each_with_index do |interval_index, i|
+        interval_start_month = epoch_start_month + (i * 3)
+        interval_date = Time.new((interval_start_month / 12), (interval_start_month % 12) == 0 ? 12 : (interval_start_month % 12), 1)
+        interval_end_date = Time.new((interval_start_month / 12), (interval_start_month % 12) == 0 ? 12 : (interval_start_month % 12), 1)
+        display_year = is_fiscal ? "FY #{interval_date.year + 1}" : interval_date.year.to_s
+        field_name = "cost#{interval_index}"
+        # field_label = "Q#{interval_index} Cost"
+        field_label = "Q#{(i % 4) + 1} #{display_year} Cost"
+        cost_option_types << {'fieldName' => field_name, 'fieldLabel' => field_label, 'type' => 'text', 'required' => true, 'defaultValue' => (default_costs[i] || 0).to_s}
       end
+    elsif interval == 'month'
+      (1..interval_count).each_with_index do |interval_index, i|
+        interval_start_month = epoch_start_month + i
+        interval_date = Time.new((interval_start_month / 12), (interval_start_month % 12) == 0 ? 12 : (interval_start_month % 12), 1)
+        display_year = is_fiscal ? "FY #{interval_date.year + 1}" : interval_date.year.to_s
+        field_name = "cost#{interval_index}"
+        # field_label = "#{interval_date.strftime('%B %Y')} Cost"
+        field_label = "#{interval_date.strftime('%B')} #{display_year} Cost"
+        cost_option_types << {'fieldName' => field_name, 'fieldLabel' => field_label, 'type' => 'text', 'required' => true, 'defaultValue' => (default_costs[i] || 0).to_s}
+      end
+    end
+    # values is a Hash like {"cost1": 99.0, "cost2": 55.0}
+    values = Morpheus::Cli::OptionTypes.prompt(cost_option_types, options[:options], @api_client)
+    values.each do |k,v|
+      interval_index = k[4..-1].to_i
+      costs[interval_index-1] = parse_cost_amount(v).to_f
     end
     return costs
   end
@@ -665,8 +724,19 @@ class Morpheus::Cli::BudgetsCommand
     end
   end
 
+  # convert String like "$5,499.99" to Float 5499.99
   def parse_cost_amount(val)
-    val.to_s.gsub(",","").to_f
+    val.to_s.gsub(",","").gsub('$','').strip.to_f
+  end
+
+  def format_budget_interval_label(budget, budget_interval)
+    label = ""
+    if budget_interval['chartName']
+      label = budget_interval['chartName']
+    else
+      label = (budget_interval['shortName'] || budget_interval['shortYear']).to_s
+    end
+    return label
   end
 
 end