morpheus-cli 4.2.21 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e42e74a1ee8d23e7b91134313dbcb6ba8b42857973c8b33057e8bb433a1d5f3
-  data.tar.gz: 05e7210bcd6a08b00feb395c04ea3b109c0c58c54b95c163d5c5ef84505dddc5
+  metadata.gz: 4f4b5a29dcfa1a915ab2d3fed9ad07197d2a760758b2bc3b76e72cf6899c4372
+  data.tar.gz: 59c981a5aede057b69e08f5c717d27c884bdd64aed84fb81361b35291b3aaf72
 SHA512:
-  metadata.gz: 6206a6bfdada390d10a4b7202794fdde6a0f0edafc5df7025e053c991d23b576be989f73d2cc95d51927600d5fb11f9393951659097c9038ce3d9a038a64b344
-  data.tar.gz: a08c1b2a452b868e15f30cae19d56ae4fd817fcf441cee05ab87fed718e7b933211430dd41dfb3060714526fe1d318865844d57bf2e8dea2cd0a489d7cec58f1
+  metadata.gz: 678ff7f73923c9883968ee8bba29b8d75d5464a4899ca812477ce943b25f758c74f187a481c781500928206c4d540d5153f858ee4e2242cfb24cc2604be1602d
+  data.tar.gz: c27881081abb71b05eceb4857280f51a4f838e9a568658baa34385afe7fc2b86be61eb31a070a4e3a9381000337ceb9b11f58fe8572fff8066882225133742ba

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -342,10 +342,18 @@ class Morpheus::APIClient
     Morpheus::AuthInterface.new({url: @base_url, client_id: @client_id}).setopts(@options)
   end
 
+  def forgot
+    Morpheus::ForgotPasswordInterface.new(common_interface_options).setopts(@options)
+  end
+
   def whoami
     Morpheus::WhoamiInterface.new(common_interface_options).setopts(@options)
   end
 
+  def search
+    Morpheus::SearchInterface.new(common_interface_options).setopts(@options)
+  end
+
   def user_settings
     Morpheus::UserSettingsInterface.new(common_interface_options).setopts(@options)
   end
@@ -764,6 +772,28 @@ class Morpheus::APIClient
     Morpheus::BackupJobsInterface.new(common_interface_options).setopts(@options)
   end
 
+  def catalog_item_types
+    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
+
+  def billing
+    Morpheus::BillingInterface.new(common_interface_options).setopts(@options)
+  end
+  
   # add new interfaces here
 
+  protected
+
+  def validate_id!(id)
+    raise "#{self.class} passed a blank id!" if id.to_s.strip.empty?
+  end
+
 end

data/lib/morpheus/api/billing_interface.rb

@@ -0,0 +1,34 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::BillingInterface < Morpheus::APIClient
+
+  def base_path
+    "/api/billing"
+  end
+
+  # this is an alias for /usage
+  def list(params={})
+    execute(method: :get, url: "#{base_path}", params: params)
+  end
+
+  def list_account(params={})
+    execute(method: :get, url: "#{base_path}/account", params: params)
+  end
+
+  def list_zones(params={})
+    execute(method: :get, url: "#{base_path}/zones", params: params)
+  end
+
+  def list_instances(params={})
+    execute(method: :get, url: "#{base_path}/instances", params: params)
+  end
+
+  def list_servers(params={})
+    execute(method: :get, url: "#{base_path}/servers", params: params)
+  end
+
+  def list_discovered_servers(params={})
+    execute(method: :get, url: "#{base_path}/discoveredServers", params: params)
+  end
+
+end

data/lib/morpheus/api/catalog_item_types_interface.rb

@@ -0,0 +1,9 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::CatalogItemTypesInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/catalog-item-types"
+  end
+
+end

data/lib/morpheus/api/deploy_interface.rb

@@ -18,7 +18,7 @@ class Morpheus::DeployInterface < Morpheus::APIClient
     execute(method: :get, url: "#{base_path}", params: params)
   end
 
-  def get(instance_id, id, params={})
+  def get(id, params={})
     validate_id!(id)
     execute(method: :get, url: "#{base_path}/#{id}", params: params)
   end

data/lib/morpheus/api/deployments_interface.rb

@@ -40,7 +40,8 @@ class Morpheus::DeploymentsInterface < Morpheus::RestInterface
     if destination.empty? || destination == "/" || destination == "." || destination.include?("../")
       raise "#{self.class}.upload_file() passed a bad destination: '#{destination}'"
     end
-    url = "#{@base_url}/#{base_path}/#{deployment_id}/versions/#{id}/files"
+    # url = "#{@base_url}/#{base_path}/#{deployment_id}/versions/#{id}/files"
+    url = "#{base_path}/#{deployment_id}/versions/#{id}/files"
     if !destination.to_s.empty?
       url += "/#{destination}"
     end
@@ -57,4 +58,22 @@ class Morpheus::DeploymentsInterface < Morpheus::RestInterface
     execute(method: :post, url: url, headers: headers, payload: payload, params: params, timeout: 172800)
   end
 
+  # upload a file without multipart
+  # local_file is the full absolute local filename
+  # destination should be the full remote file path, including the file name.
+  def destroy_file(deployment_id, id, destination, params={})
+    if destination.empty? || destination == "/" || destination == "." || destination.include?("../")
+      raise "#{self.class}.upload_file() passed a bad destination: '#{destination}'"
+    end
+    # url = "#{@base_url}/#{base_path}/#{deployment_id}/versions/#{id}/files"
+    url = "#{base_path}/#{deployment_id}/versions/#{id}/files"
+    if !destination.to_s.empty?
+      url += "/#{destination}"
+    end
+    # use URI to escape path
+    uri = URI.parse(url)
+    url = uri.path
+    execute(method: :delete, url: url, params: params)
+  end
+
 end

data/lib/morpheus/api/forgot_password_interface.rb

@@ -0,0 +1,17 @@
+require 'morpheus/api/api_client'
+# There is no Authorization required for this API.
+class Morpheus::ForgotPasswordInterface < Morpheus::APIClient
+
+  def authorization_required?
+    false
+  end
+
+  def send_email(payload, params={})
+    execute(method: :post, url: "/api/forgot/send-email", params: params, payload: payload.to_json)
+  end
+
+  def reset_password(payload, params={})
+    execute(method: :post, url: "/api/forgot/reset-password", params: params, payload: payload.to_json)
+  end
+
+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,20 @@ 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}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def import_snapshot(id, params={}, payload={})
     url = "#{@base_url}/api/instances/#{id}/import-snapshot"
     headers = {:authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/rest_interface.rb

@@ -31,10 +31,4 @@ class Morpheus::RestInterface < Morpheus::APIClient
     execute(method: :delete, url: "#{base_path}/#{id}", params: params)
   end
 
-  protected
-
-  def validate_id!(id)
-    raise "#{self.class} passed a blank id!" if id.to_s.strip.empty?
-  end
-
 end

data/lib/morpheus/api/roles_interface.rb

@@ -77,6 +77,20 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def update_catalog_item_type(account_id, id, options)
+    url = build_url(account_id, id) + "/update-catalog-item-type"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
+  def update_persona(account_id, id, options)
+    url = build_url(account_id, id) + "/update-persona"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    execute(method: :put, url: url, headers: headers, payload: payload.to_json)
+  end
+
   private
 
   def build_url(account_id=nil, role_id=nil)

data/lib/morpheus/api/search_interface.rb

@@ -0,0 +1,13 @@
+require 'morpheus/api/rest_interface'
+
+class Morpheus::SearchInterface < Morpheus::APIClient
+
+  def base_path
+    "/api/search"
+  end
+
+  def list(params={})
+    execute(method: :get, url: "#{base_path}", params: params)
+  end
+
+end

data/lib/morpheus/api/servers_interface.rb

@@ -169,4 +169,18 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
   
+  def snapshots(id, params={})
+    url = "#{@base_url}/api/servers/#{id}/snapshots"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    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/api/usage_interface.rb

@@ -0,0 +1,18 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::UsageInterface < Morpheus::APIClient
+
+  def base_path
+    "/api/usage" # not /usages ?
+  end
+
+  def list(params={})
+    execute(method: :get, url: "#{base_path}", params: params)
+  end
+
+  def get(id, params={})
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{id}", params: params)
+  end
+
+end

data/lib/morpheus/cli.rb

@@ -67,8 +67,6 @@ module Morpheus
       # all standard commands
       Dir[File.dirname(__FILE__)  + "/cli/commands/standard/**/*.rb"].each {|file| load file }
 
-      # shell scripting commands
-
       # all the known commands
       load 'morpheus/cli/remote.rb'
       load 'morpheus/cli/doc.rb'
@@ -76,9 +74,11 @@ module Morpheus
       load 'morpheus/cli/setup.rb'
       load 'morpheus/cli/login.rb'
       load 'morpheus/cli/logout.rb'
+      load 'morpheus/cli/forgot_password.rb'
       load 'morpheus/cli/whoami.rb'
       load 'morpheus/cli/access_token_command.rb'
       load 'morpheus/cli/user_settings_command.rb'
+      load 'morpheus/cli/search_command.rb'
       load 'morpheus/cli/dashboard_command.rb'
       load 'morpheus/cli/recent_activity_command.rb' # deprecated, removing soon
       load 'morpheus/cli/activity_command.rb'
@@ -96,11 +96,12 @@ module Morpheus
       load 'morpheus/cli/tasks.rb'
       load 'morpheus/cli/workflows.rb'
       load 'morpheus/cli/deployments.rb'
+      load 'morpheus/cli/deploy.rb'
+      load 'morpheus/cli/deploys.rb'
       load 'morpheus/cli/instances.rb'
       load 'morpheus/cli/containers_command.rb'
       load 'morpheus/cli/apps.rb'
       load 'morpheus/cli/blueprints_command.rb'
-      load 'morpheus/cli/deploys.rb'
       load 'morpheus/cli/license.rb'
       load 'morpheus/cli/instance_types.rb'
       load 'morpheus/cli/jobs_command.rb'
@@ -174,6 +175,9 @@ 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_item_types_command.rb' # catalog-types
+      load 'morpheus/cli/service_catalog_command.rb' # catalog
+      load 'morpheus/cli/usage_command.rb'
       # add new commands here...
 
     end

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,14 +85,16 @@ 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
     optparse.parse!(args)
-    if args.count != 0
-      print_error Morpheus::Terminal.angry_prompt
-      puts_error  "#{command_name} list expects 0 arguments and received #{args.count}: #{args}\n#{optparse}"
-      return 1
+    # verify_args!(args:args, optparse:optparse, count:0)
+    if args.count > 0
+      options[:phrase] = args.join(" ")
     end
     connect(options)
     begin
@@ -2186,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