morpheus-cli 4.1.8 → 4.1.9

data/lib/morpheus/formatters.rb

@@ -1,5 +1,6 @@
 require 'time'
 require 'filesize'
+require 'money'
 
 DEFAULT_TIME_FORMAT = "%x %I:%M %p"
 
@@ -326,3 +327,24 @@ def format_number(n, opts={})
   end
   return out
 end
+
+def currency_sym(currency)
+  Money::Currency.new((currency || 'usd').to_sym).symbol
+end
+
+# returns currency amount formatted like "$4,5123.00". 0.00 is formatted as "$0"
+# this is not ideal
+def format_money(amount, currency='usd')
+  if amount.to_f == 0
+    return currency_sym(currency).to_s + "0"
+  else
+    rtn = amount.to_f.round(2).to_s
+    if rtn.index('.').nil?
+      rtn += '.00'
+    elsif rtn.split('.')[1].length < 2
+      rtn = rtn + (['0'] * (2 - rtn.split('.')[1].length) * '')
+    end
+    dollars,cents = rtn.split(".")
+    currency_sym(currency).to_s + format_number(dollars.to_i) + "." + cents
+  end
+end

data/morpheus-cli.gemspec

@@ -28,4 +28,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'mime-types'
   spec.add_dependency "http"
   spec.add_dependency "rubyzip"
+  spec.add_dependency "money"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 4.1.8
+  version: 4.1.9
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2020-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -139,6 +139,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Infrastructure agnostic cloud application management & orchestration
   CLI for Morpheus. Easily manage and orchestrate VMS on private or public infrastructure
   and containerized architectures.
@@ -169,6 +183,7 @@ files:
 - lib/morpheus/api/auth_interface.rb
 - lib/morpheus/api/backup_settings_interface.rb
 - lib/morpheus/api/blueprints_interface.rb
+- lib/morpheus/api/budgets_interface.rb
 - lib/morpheus/api/cloud_datastores_interface.rb
 - lib/morpheus/api/cloud_folders_interface.rb
 - lib/morpheus/api/cloud_policies_interface.rb
@@ -187,6 +202,7 @@ files:
 - lib/morpheus/api/file_copy_request_interface.rb
 - lib/morpheus/api/group_policies_interface.rb
 - lib/morpheus/api/groups_interface.rb
+- lib/morpheus/api/health_interface.rb
 - lib/morpheus/api/image_builder_boot_scripts_interface.rb
 - lib/morpheus/api/image_builder_image_builds_interface.rb
 - lib/morpheus/api/image_builder_interface.rb
@@ -221,19 +237,22 @@ files:
 - lib/morpheus/api/network_pool_servers_interface.rb
 - lib/morpheus/api/network_pools_interface.rb
 - lib/morpheus/api/network_proxies_interface.rb
+- lib/morpheus/api/network_security_servers_interface.rb
 - lib/morpheus/api/network_services_interface.rb
 - lib/morpheus/api/network_subnets_interface.rb
 - lib/morpheus/api/network_types_interface.rb
 - lib/morpheus/api/networks_interface.rb
-- lib/morpheus/api/old_cypher_interface.rb
 - lib/morpheus/api/option_type_lists_interface.rb
 - lib/morpheus/api/option_types_interface.rb
 - lib/morpheus/api/options_interface.rb
 - lib/morpheus/api/packages_interface.rb
 - lib/morpheus/api/policies_interface.rb
 - lib/morpheus/api/power_schedules_interface.rb
+- lib/morpheus/api/price_sets_interface.rb
+- lib/morpheus/api/prices_interface.rb
 - lib/morpheus/api/processes_interface.rb
 - lib/morpheus/api/provision_types_interface.rb
+- lib/morpheus/api/provisioning_settings_interface.rb
 - lib/morpheus/api/reports_interface.rb
 - lib/morpheus/api/roles_interface.rb
 - lib/morpheus/api/security_group_rules_interface.rb
@@ -259,7 +278,6 @@ files:
 - lib/morpheus/cli.rb
 - lib/morpheus/cli/access_token_command.rb
 - lib/morpheus/cli/account_groups_command.rb
-- lib/morpheus/cli/accounts.rb
 - lib/morpheus/cli/appliance_settings_command.rb
 - lib/morpheus/cli/approvals_command.rb
 - lib/morpheus/cli/apps.rb
@@ -268,6 +286,7 @@ files:
 - lib/morpheus/cli/backup_settings_command.rb
 - lib/morpheus/cli/blueprints_command.rb
 - lib/morpheus/cli/boot_scripts_command.rb
+- lib/morpheus/cli/budgets_command.rb
 - lib/morpheus/cli/change_password_command.rb
 - lib/morpheus/cli/cli_command.rb
 - lib/morpheus/cli/cli_registry.rb
@@ -312,6 +331,7 @@ files:
 - lib/morpheus/cli/expression_parser.rb
 - lib/morpheus/cli/file_copy_request_command.rb
 - lib/morpheus/cli/groups.rb
+- lib/morpheus/cli/health_command.rb
 - lib/morpheus/cli/hosts.rb
 - lib/morpheus/cli/image_builder_command.rb
 - lib/morpheus/cli/instance_types.rb
@@ -356,20 +376,23 @@ files:
 - lib/morpheus/cli/network_proxies_command.rb
 - lib/morpheus/cli/network_services_command.rb
 - lib/morpheus/cli/networks_command.rb
-- lib/morpheus/cli/old_cypher_command.rb
 - lib/morpheus/cli/option_parser.rb
 - lib/morpheus/cli/option_types.rb
 - lib/morpheus/cli/packages_command.rb
 - lib/morpheus/cli/policies_command.rb
 - lib/morpheus/cli/power_schedules_command.rb
 - lib/morpheus/cli/preseed_scripts_command.rb
+- lib/morpheus/cli/price_sets_command.rb
+- lib/morpheus/cli/prices_command.rb
 - lib/morpheus/cli/processes_command.rb
+- lib/morpheus/cli/provisioning_settings_command.rb
 - lib/morpheus/cli/recent_activity_command.rb
 - lib/morpheus/cli/remote.rb
 - lib/morpheus/cli/reports_command.rb
 - lib/morpheus/cli/roles.rb
 - lib/morpheus/cli/security_group_rules.rb
 - lib/morpheus/cli/security_groups.rb
+- lib/morpheus/cli/service_plans_command.rb
 - lib/morpheus/cli/shell.rb
 - lib/morpheus/cli/storage_providers_command.rb
 - lib/morpheus/cli/subnets_command.rb

data/lib/morpheus/cli/accounts.rb

@@ -1,335 +0,0 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'morpheus/cli/cli_command'
-require 'morpheus/cli/option_types'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'json'
-
-class Morpheus::Cli::Accounts
-  include Morpheus::Cli::CliCommand
-  include Morpheus::Cli::AccountsHelper
-
-  # deprecated and replaced with tenants, remove soon
-  set_command_hidden
-  
-  register_subcommands :list, :count, :get, :add, :update, :remove
-  alias_subcommand :details, :get
-  set_default_subcommand :list
-
-  # account-groups is under this namespace for now
-  register_subcommands :'groups' => :account_groups
-
-  def initialize()
-    @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
-  end
-
-  def connect(opts)
-    @api_client = establish_remote_appliance_connection(opts)
-    @users_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).users
-    @accounts_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).accounts
-    @roles_interface = Morpheus::APIClient.new(@access_token,nil,nil, @appliance_url).roles
-  end
-
-  def handle(args)
-    print_error "#{yellow}DEPRECATION WARNING: `morpheus accounts` has been replaced with `morpheus tenants`. Please use `tenants` instead.#{reset}\n"
-    handle_subcommand(args)
-  end
-
-  def account_groups(args)
-    Morpheus::Cli::AccountGroupsCommand.new.handle(args)
-  end
-
-  def list(args)
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :query, :json, :remote, :dry_run])
-      opts.footer = "List accounts."
-    end
-    optparse.parse!(args)
-    connect(options)
-    begin
-      params = {}
-      params.merge!(parse_list_options(options))
-      if options[:dry_run]
-        print_dry_run @accounts_interface.dry.list(params)
-        return
-      end
-      json_response = @accounts_interface.list(params)
-      accounts = json_response['accounts']
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
-        title = "Morpheus Accounts"
-        subtitles = []
-        subtitles += parse_list_subtitles(options)
-        print_h1 title, subtitles
-        if accounts.empty?
-          puts yellow,"No accounts found.",reset
-        else
-          print_accounts_table(accounts)
-          print_results_pagination(json_response)
-        end
-        print reset,"\n"
-      end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
-  def count(args)
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[options]")
-      build_common_options(opts, options, [:query, :remote, :dry_run])
-      opts.footer = "Get the number of accounts."
-    end
-    optparse.parse!(args)
-    connect(options)
-    begin
-      params = {}
-      params.merge!(parse_list_options(options))
-      if options[:dry_run]
-        print_dry_run @accounts_interface.dry.list(params)
-        return
-      end
-      json_response = @accounts_interface.list(params)
-      # print number only
-      if json_response['meta'] && json_response['meta']['total']
-        print cyan, json_response['meta']['total'], reset, "\n"
-      else
-        print yellow, "unknown", reset, "\n"
-      end
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
-  def get(args)
-    options = {}
-    optparse = Morpheus::Cli::OptionParser.new do |opts|
-      opts.banner = subcommand_usage("[name]")
-      build_common_options(opts, options, [:json, :remote, :dry_run])
-    end
-    optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
-    connect(options)
-    begin
-      if options[:dry_run]
-        if args[0].to_s =~ /\A\d{1,}\Z/
-          print_dry_run @accounts_interface.dry.get(args[0].to_i)
-        else
-          print_dry_run @accounts_interface.dry.list({name:args[0]})
-        end
-        return
-      end
-      account = find_account_by_name_or_id(args[0])
-      exit 1 if account.nil?
-
-      if options[:json]
-        print JSON.pretty_generate({account: account})
-        print "\n"
-      else
-        print_h1 "Account Details"
-        print cyan
-        puts "ID: #{account['id']}"
-        puts "Name: #{account['name']}"
-        puts "Description: #{account['description']}"
-        puts "Subdomain: #{account['subdomain']}" if !account['subdomain'].to_s.empty?
-        puts "Currency: #{account['currency']}"
-        # puts "# Users: #{account['usersCount']}"
-        # puts "# Instances: #{account['instancesCount']}"
-        puts "Date Created: #{format_local_dt(account['dateCreated'])}"
-        puts "Last Updated: #{format_local_dt(account['lastUpdated'])}"
-        status_state = nil
-        if account['active']
-          status_state = "#{green}ACTIVE#{cyan}"
-        else
-          status_state = "#{red}INACTIVE#{cyan}"
-        end
-        puts "Status: #{status_state}"
-        print_h2 "Account Instance Limits"
-        print cyan
-        puts "Max Storage (bytes): #{account['instanceLimits'] ? account['instanceLimits']['maxStorage'] : 0}"
-        puts "Max Memory (bytes): #{account['instanceLimits'] ? account['instanceLimits']['maxMemory'] : 0}"
-        puts "CPU Count: #{account['instanceLimits'] ? account['instanceLimits']['maxCpu'] : 0}"
-        print reset,"\n"
-      end
-    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("[options]")
-      build_option_type_options(opts, options, add_account_option_types)
-      build_common_options(opts, options, [:options, :json, :remote, :dry_run])
-    end
-    optparse.parse!(args)
-    connect(options)
-    begin
-      params = Morpheus::Cli::OptionTypes.prompt(add_account_option_types, options[:options], @api_client, options[:params])
-      #puts "parsed params is : #{params.inspect}"
-      account_keys = ['name', 'description', 'currency']
-      account_payload = params.select {|k,v| account_keys.include?(k) }
-      account_payload['currency'] = account_payload['currency'].to_s.empty? ? "USD" : account_payload['currency'].upcase
-      if !account_payload['instanceLimits']
-        account_payload['instanceLimits'] = {}
-        account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-        account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-        account_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
-      end
-      if params['role'].to_s != ''
-        role = find_role_by_name(nil, params['role'])
-        exit 1 if role.nil?
-        account_payload['role'] = {id: role['id']}
-      end
-      request_payload = {account: account_payload}
-      if options[:dry_run]
-        print_dry_run @accounts_interface.dry.create(request_payload)
-        return
-      end
-      json_response = @accounts_interface.create(request_payload)
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
-        print_green_success "Account #{account_payload['name']} added"
-        get([account_payload["name"]])
-      end
-
-    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("[name] [options]")
-      build_option_type_options(opts, options, update_account_option_types)
-      build_common_options(opts, options, [:options, :json, :remote, :dry_run])
-    end
-    optparse.parse!(args)
-    if args.count < 1
-      print_red_alert "Specify at least one option to update"
-      puts optparse
-      exit 1
-    end
-    connect(options)
-    begin
-      account = find_account_by_name_or_id(args[0])
-      exit 1 if account.nil?
-
-      #params = Morpheus::Cli::OptionTypes.prompt(update_account_option_types, options[:options], @api_client, options[:params])
-      params = options[:options] || {}
-
-      if params.empty?
-        puts optparse
-        exit 1
-      end
-
-      #puts "parsed params is : #{params.inspect}"
-      account_keys = ['name', 'description', 'currency', 'instanceLimits']
-      account_payload = params.select {|k,v| account_keys.include?(k) }
-      account_payload['currency'] = account_payload['currency'].upcase unless account_payload['currency'].to_s.empty?
-      if !account_payload['instanceLimits']
-        account_payload['instanceLimits'] = {}
-        account_payload['instanceLimits']['maxStorage'] = params['instanceLimits.maxStorage'].to_i if params['instanceLimits.maxStorage'].to_s.strip != ''
-        account_payload['instanceLimits']['maxMemory'] = params['instanceLimits.maxMemory'].to_i if params['instanceLimits.maxMemory'].to_s.strip != ''
-        account_payload['instanceLimits']['maxCpu'] = params['instanceLimits.maxCpu'].to_i if params['instanceLimits.maxCpu'].to_s.strip != ''
-      end
-      if params['role'].to_s != ''
-        role = find_role_by_name(nil, params['role'])
-        exit 1 if role.nil?
-        account_payload['role'] = {id: role['id']}
-      end
-      request_payload = {account: account_payload}
-      if options[:dry_run]
-        print_dry_run @accounts_interface.dry.update(account['id'], request_payload)
-        return
-      end
-      json_response = @accounts_interface.update(account['id'], request_payload)
-
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
-        account_name = account_payload['name'] || account['name']
-        print_green_success "Account #{account_name} updated"
-        get([account_name])
-      end
-    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("[name]")
-      build_common_options(opts, options, [:auto_confirm, :json, :remote, :dry_run])
-    end
-    optparse.parse!(args)
-    if args.count < 1
-      puts optparse
-      exit 1
-    end
-    connect(options)
-    begin
-      # allow finding by ID since name is not unique!
-      account = find_account_by_name_or_id(args[0])
-      exit 1 if account.nil?
-      unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the account #{account['name']}?")
-        exit
-      end
-      if options[:dry_run]
-        print_dry_run @accounts_interface.dry.destroy(account['id'])
-        return
-      end
-      json_response = @accounts_interface.destroy(account['id'])
-      if options[:json]
-        print JSON.pretty_generate(json_response)
-        print "\n"
-      else
-        print_green_success "Account #{account['name']} removed"
-      end
-
-    rescue RestClient::Exception => e
-      print_rest_exception(e, options)
-      exit 1
-    end
-  end
-
-  private
-
-  def add_account_option_types
-    [
-      {'fieldName' => 'name', 'fieldLabel' => 'Name', 'type' => 'text', 'required' => true, 'displayOrder' => 1},
-      {'fieldName' => 'description', 'fieldLabel' => 'Description', 'type' => 'text', 'displayOrder' => 2},
-      {'fieldName' => 'role', 'fieldLabel' => 'Base Role', 'type' => 'text', 'displayOrder' => 3},
-      {'fieldName' => 'currency', 'fieldLabel' => 'Currency', 'type' => 'text', 'displayOrder' => 4},
-      {'fieldName' => 'instanceLimits.maxStorage', 'fieldLabel' => 'Max Storage (bytes)', 'type' => 'text', 'displayOrder' => 5},
-      {'fieldName' => 'instanceLimits.maxMemory', 'fieldLabel' => 'Max Memory (bytes)', 'type' => 'text', 'displayOrder' => 6},
-      {'fieldName' => 'instanceLimits.maxCpu', 'fieldLabel' => 'CPU Count', 'type' => 'text', 'displayOrder' => 7},
-    ]
-  end
-
-  def update_account_option_types
-    add_account_option_types
-  end
-
-end