morpheus-cli 3.3.1.4 → 3.3.2

data/lib/morpheus/api/servers_interface.rb

@@ -22,6 +22,10 @@ class Morpheus::ServersInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def list(options={})
+    get(options)
+  end
+
   def create(options)
     url = "#{@base_url}/api/servers"
     headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }

data/lib/morpheus/api/user_sources_interface.rb

@@ -0,0 +1,120 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::UserSourcesInterface < Morpheus::APIClient
+    def initialize(access_token, refresh_token, expires_at = nil, base_url=nil) 
+    @access_token = access_token
+    @refresh_token = refresh_token
+    @base_url = base_url
+    @expires_at = expires_at
+  end
+
+  def get(account_id, id)
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = build_url(account_id, id)
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
+  def list(account_id, options={})
+    url = build_url(account_id)
+    headers = { params: {}, authorization: "Bearer #{@access_token}" }
+    headers[:params].merge!(options)
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
+  # def feature_permissions(account_id, id)
+  #   url = build_url(account_id, id) + "/feature-permissions"
+  #   headers = { params: {}, authorization: "Bearer #{@access_token}" }
+  #   opts = {method: :get, url: url, timeout: 10, headers: headers}
+  #   execute(opts)
+  # end
+
+  # def available_roles(account_id, id=nil, options={})
+  #   url = build_url(account_id, id) + "/available-roles"
+  #   headers = { params: {}, authorization: "Bearer #{@access_token}" }
+  #   headers[:params].merge!(options)
+  #   opts = {method: :get, url: url, timeout: 10, headers: headers}
+  #   execute(opts)
+  # end
+
+  def create(account_id, options)
+    url = build_url(account_id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :post, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(account_id, id, options)
+    url = build_url(account_id, id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :put, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(account_id, id)
+    url = build_url(account_id, id)
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
+  def activate(account_id, id, options)
+    url = build_url(account_id, id) + "/activate"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :put, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def deactivate(account_id, id, options)
+    url = build_url(account_id, id) + "/deactivate"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :put, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update_subdomain(account_id, id, options)
+    url = build_url(account_id, id) + "/subdomain"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    payload = options
+    opts = {method: :put, url: url, timeout: 10, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  # move me to my own interface class
+  def list_types(params={})
+    url = "#{@base_url}/api/user-source-types"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
+  # move me to my own interface class
+  def get_type(id, params={})
+    url = "#{@base_url}/api/user-source-types/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, timeout: 10, headers: headers}
+    execute(opts)
+  end
+
+  private
+
+  def build_url(account_id=nil, user_id=nil)
+    url = "#{@base_url}/api"
+    if account_id
+      url += "/accounts/#{account_id}/user-sources"
+    else
+      url += "/user-sources"
+    end
+    if user_id
+      url += "/#{user_id}"
+    end
+    url
+  end
+
+end

data/lib/morpheus/api/virtual_images_interface.rb

@@ -71,6 +71,13 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
     execute(method: :post, url: url, headers: headers, payload: payload)
   end
 
+  def upload_by_url(id, file_url)
+    url = "#{@base_url}/api/virtual-images/#{id}/upload"
+    headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
+    headers[:params][:url] = file_url
+    execute(method: :post, url: url, headers: headers)
+  end
+
   def destroy_file(id, filename)
     url = "#{@base_url}/api/virtual-images/#{id}/files"
     #url = "#{@base_url}/api/virtual-images/#{id}/files/#{filename}"

data/lib/morpheus/cli.rb

@@ -49,6 +49,7 @@ module Morpheus
       # shell scripting commands
       load 'morpheus/cli/source_command.rb'
       load 'morpheus/cli/echo_command.rb'
+      load 'morpheus/cli/sleep_command.rb'
       load 'morpheus/cli/coloring_command.rb'
       load 'morpheus/cli/log_level_command.rb'
       load 'morpheus/cli/ssl_verification_command.rb'
@@ -81,10 +82,20 @@ module Morpheus
       load 'morpheus/cli/accounts.rb'
       load 'morpheus/cli/users.rb'
       load 'morpheus/cli/user_groups_command.rb'
+      load 'morpheus/cli/user_sources_command.rb'
       load 'morpheus/cli/roles.rb'
       load 'morpheus/cli/key_pairs.rb'
       load 'morpheus/cli/virtual_images.rb'
-      load 'morpheus/cli/library.rb'
+      # load 'morpheus/cli/library.rb' # gone until we collapse these again
+      load 'morpheus/cli/library_instance_types_command.rb'
+      load 'morpheus/cli/library_layouts_command.rb'
+      load 'morpheus/cli/library_upgrades_command.rb'
+      load 'morpheus/cli/library_container_types_command.rb'
+      load 'morpheus/cli/library_container_scripts_command.rb'
+      load 'morpheus/cli/library_container_templates_command.rb'
+      load 'morpheus/cli/library_option_types_command.rb'
+      load 'morpheus/cli/library_option_lists_command.rb'
+
       load 'morpheus/cli/version_command.rb'
       load 'morpheus/cli/alias_command.rb'
       # todo: combine checks, incidents, apps, and goups under monitoring?

data/lib/morpheus/cli/accounts.rb

@@ -10,7 +10,7 @@ require 'json'
 class Morpheus::Cli::Accounts
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::AccountsHelper
-  register_subcommands :list, :get, :add, :update, :remove
+  register_subcommands :list, :count, :get, :add, :update, :remove
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -31,17 +31,16 @@ class Morpheus::Cli::Accounts
 
   def list(args)
     options = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
-      build_common_options(opts, options, [:list, :json, :remote, :dry_run])
+      build_common_options(opts, options, [:list, :query, :json, :remote, :dry_run])
+      opts.footer = "List accounts."
     end
     optparse.parse!(args)
     connect(options)
     begin
       params = {}
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
       if options[:dry_run]
         print_dry_run @accounts_interface.dry.list(params)
         return
@@ -54,9 +53,7 @@ class Morpheus::Cli::Accounts
       else
         title = "Morpheus Accounts"
         subtitles = []
-        if params[:phrase]
-          subtitles << "Search: #{params[:phrase]}".strip
-        end
+        subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
         if accounts.empty?
           puts yellow,"No accounts found.",reset
@@ -72,6 +69,35 @@ class Morpheus::Cli::Accounts
     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 = OptionParser.new do|opts|

data/lib/morpheus/cli/cli_command.rb

@@ -286,6 +286,41 @@ module Morpheus
               options[:direction] = "desc"
             end
 
+            # arbitrary query parameters in the format -Q "category=web&phrase=nginx"
+            # opts.on( '-Q', '--query PARAMS', "Query parameters. PARAMS format is 'phrase=foobar&category=web'" ) do |val|
+            #   options[:query_filters_raw] = val
+            #   options[:query_filters] = {}
+            #   # todo: smarter parsing
+            #   val.split('&').each do |filter| 
+            #     k, v = filter.split('=')
+            #     # allow "woot:true instead of woot=true"
+            #     if (k.include?(":") && v == nil)
+            #       k, v = k.split(":")
+            #     end
+            #     if (!k.to_s.empty?)
+            #       options[:query_filters][k.to_s.strip] = v.to_s.strip
+            #     end
+            #   end
+            # end
+
+          when :query, :query_filters
+            # arbitrary query parameters in the format -Q "category=web&phrase=nginx"
+            opts.on( '-Q', '--query PARAMS', "Query parameters. PARAMS format is 'phrase=foobar&category=web'" ) do |val|
+              options[:query_filters_raw] = val
+              options[:query_filters] = {}
+              # todo: smarter parsing
+              val.split('&').each do |filter| 
+                k, v = filter.split('=')
+                # allow "woot:true instead of woot=true"
+                if (k.include?(":") && v == nil)
+                  k, v = k.split(":")
+                end
+                if (!k.to_s.empty?)
+                  options[:query_filters][k.to_s.strip] = v.to_s.strip
+                end
+              end
+            end
+
           when :last_updated
             # opts.on("--last-updated TIME", Time, "Filter by gte last updated") do |time|
             opts.on("--last-updated TIME", String, "Filter by Last Updated (gte)") do |time|
@@ -399,7 +434,7 @@ module Morpheus
             end
 
           when :fields
-            opts.on('--fields x,y,z', Array, "Filter Output to a limited set of fields. Default is all fields.") do |val|
+            opts.on('-F', '--fields x,y,z', Array, "Filter Output to a limited set of fields. Default is all fields.") do |val|
               options[:include_fields] = val
             end
 
@@ -425,7 +460,7 @@ module Morpheus
           Term::ANSIColor::coloring = false
         end
 
-        opts.on('-V','--debug', "Print extra output for debugging. ") do
+        opts.on('-V','--debug', "Print extra output for debugging.") do
           options[:debug] = true
           Morpheus::Logging.set_log_level(Morpheus::Logging::Logger::DEBUG)
           ::RestClient.log = Morpheus::Logging.debug? ? Morpheus::Logging::DarkPrinter.instance : nil
@@ -656,6 +691,51 @@ module Morpheus
         true
       end
 
+      # parse the parameters provided by the common :list options
+      # returns Hash of params the format {"phrase": => "foobar", "max": 100}
+      def parse_list_options(options={})
+        list_params = {}
+        [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
+          if options.key?(k)
+            list_params[k.to_s] = options[k]
+          elsif options.key?(k.to_s)
+            list_params[k.to_s] = options[k.to_s]
+          end
+        end
+        # arbitrary filters
+        if options[:query_filters]
+          options[:query_filters].each do |k, v|
+            if k
+              list_params[k] = v
+            end
+          end
+        end
+        return list_params
+      end
+
+      # parse the subtitles provided by the common :list options
+      # returns Array of subtitles as strings in the format ["Phrase: blah", "Max: 100"]
+      def parse_list_subtitles(options={})
+        subtitles = []
+        list_params = {}
+        [:phrase, :offset, :max, :sort, :direction, :lastUpdated].each do |k|
+          if options.key?(k)
+            subtitles << "#{k.to_s}: #{options[k]}"
+          elsif options.key?(k.to_s)
+            subtitles << "#{k.to_s}: #{options[k.to_s]}"
+          end
+        end
+        # arbitrary filters
+        if options[:query_filters]
+          formatted_filters = options[:query_filters].collect {|k,v| "#{k.to_s}=#{v}" }.join('&')
+          subtitles << "Query: #{formatted_filters}"
+          # options[:query_filters].each do |k, v|
+          #   subtitles << "#{k.to_s}: #{v}"
+          # end
+        end
+        return subtitles
+      end
+
       module ClassMethods
 
         def set_command_name(cmd_name)

data/lib/morpheus/cli/curl_command.rb

@@ -21,7 +21,7 @@ class Morpheus::Cli::CurlCommand
 This invokes the `curl` command with url "appliance_url/api/$0
 and includes the authorization header -H "Authorization: Bearer access_token"
 Arguments for the curl command should be passed after ' -- '
-Example: morpheus curl "/api/servers/1" -- -XGET -sV
+Example: morpheus curl "/api/servers/1" -- -XGET -sv
 
 EOT
     end

data/lib/morpheus/cli/echo_command.rb

@@ -50,7 +50,7 @@ class Morpheus::Cli::Echo
     end
     # print out 
     print cyan + out + reset
-    return true
+    return 0
   end
 
 end

data/lib/morpheus/cli/hosts.rb

@@ -10,7 +10,7 @@ require 'json'
 class Morpheus::Cli::Hosts
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::ProvisioningHelper
-  register_subcommands :list, :get, :stats, :add, :remove, :logs, :start, :stop, :resize, :run_workflow, {:'make-managed' => :install_agent}, :upgrade_agent, :server_types
+  register_subcommands :list, :count, :get, :stats, :add, :remove, :logs, :start, :stop, :resize, :run_workflow, {:'make-managed' => :install_agent}, :upgrade_agent, :server_types
   alias_subcommand :details, :get
   set_default_subcommand :list
 
@@ -36,7 +36,7 @@ class Morpheus::Cli::Hosts
   def list(args)
     options = {}
     params = {}
-    optparse = OptionParser.new do|opts|
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage()
       opts.on( '-g', '--group GROUP', "Group Name or ID" ) do |val|
         options[:group] = val
@@ -81,7 +81,8 @@ class Morpheus::Cli::Hosts
       opts.on( '', '--noagent', "Show only Servers with No agent" ) do |val|
         params[:agentInstalled] = false
       end
-      build_common_options(opts, options, [:list, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      build_common_options(opts, options, [:list, :query, :json, :yaml, :csv, :fields, :dry_run, :remote])
+      opts.footer = "List hosts."
     end
     optparse.parse!(args)
     connect(options)
@@ -98,15 +99,13 @@ class Morpheus::Cli::Hosts
         params['zoneId'] = cloud['id']
       end
 
-      [:phrase, :offset, :max, :sort, :direction].each do |k|
-        params[k] = options[k] unless options[k].nil?
-      end
+      params.merge!(parse_list_options(options))
 
       if options[:dry_run]
-        print_dry_run @servers_interface.dry.get(params)
+        print_dry_run @servers_interface.dry.list(params)
         return
       end
-      json_response = @servers_interface.get(params)
+      json_response = @servers_interface.list(params)
 
       if options[:json]
         if options[:include_fields]
@@ -140,9 +139,7 @@ class Morpheus::Cli::Hosts
         if cloud
           subtitles << "Cloud: #{cloud['name']}".strip
         end
-        if params[:phrase]
-          subtitles << "Search: #{params[:phrase]}".strip
-        end
+        subtitles += parse_list_subtitles(options)
         print_h1 title, subtitles
         if servers.empty?
           print yellow,"No hosts found.",reset,"\n"
@@ -206,6 +203,35 @@ class Morpheus::Cli::Hosts
     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 hosts."
+    end
+    optparse.parse!(args)
+    connect(options)
+    begin
+      params = {}
+      params.merge!(parse_list_options(options))
+      if options[:dry_run]
+        print_dry_run @servers_interface.dry.list(params)
+        return
+      end
+      json_response = @servers_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 = OptionParser.new do|opts|
@@ -230,7 +256,7 @@ class Morpheus::Cli::Hosts
         if arg.to_s =~ /\A\d{1,}\Z/
           print_dry_run @servers_interface.dry.get(arg.to_i)
         else
-          print_dry_run @servers_interface.dry.get({name: arg})
+          print_dry_run @servers_interface.dry.list({name: arg})
         end
         return
       end
@@ -310,7 +336,7 @@ class Morpheus::Cli::Hosts
         if arg.to_s =~ /\A\d{1,}\Z/
           print_dry_run @servers_interface.dry.get(arg.to_i)
         else
-          print_dry_run @servers_interface.dry.get({name: arg})
+          print_dry_run @servers_interface.dry.list({name: arg})
         end
         return
       end
@@ -970,7 +996,7 @@ class Morpheus::Cli::Hosts
   end
 
   def find_host_by_name(name)
-    results = @servers_interface.get({name: name})
+    results = @servers_interface.list({name: name})
     if results['servers'].empty?
       print_red_alert "Server not found by name #{name}"
       exit 1