morpheus-cli 3.6.38 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6d83bc4ead195eec6c07b13e808adadbb2252faecb60ea09ef380c351a29439
-  data.tar.gz: ac48e6230def4ee50088e8b5a9872619d806aff93efde92a0834a6613461d8b5
+  metadata.gz: bca59b88ea028739f7cb9d7484a2c48c23603bbd804fb72226297c976cc498e3
+  data.tar.gz: 843cf1f628ddc9f1c090243edccc5c43bd978c2df802be2a3fbea4a395919ff2
 SHA512:
-  metadata.gz: fdc430523df174d81db58e7cadffa72fda83dfe97dd941b637b20469663c1e85608d4f973bf5abedc079ce1a402593c2d730b33e49e31741a074ec5e485b438a
-  data.tar.gz: 2c623442ca4e4bfca590acec732930d9698127172c7a9d4507ae7dcf007381b0385d28588dc5f486acb530896fc324c6a2f0a5e9a9dd375890e5c279ad2810a2
+  metadata.gz: d4ae8a45df624e4a89d0c29cd12649e2d3c752e243aff2bb919c3542fa70ba4d144a8da403e77d050c1b41885aa254901ebe6e99a2c69753d6d826e8e49be104
+  data.tar.gz: c69d3d7b235e1ca9178fb583858a317b6a64ea66bba115df28a1527aa3c45b75ba0318cd42c5fcd528c920e06773fe6fc7d5a55cf086cad2e3e977e6f7ecae77

data/lib/morpheus/api/api_client.rb

@@ -390,6 +390,10 @@ class Morpheus::APIClient
     Morpheus::NetworkPoolsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def network_pool_ips
+    Morpheus::NetworkPoolIpsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
   def network_services
     Morpheus::NetworkServicesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
@@ -402,6 +406,10 @@ class Morpheus::APIClient
     Morpheus::NetworkDomainsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end
 
+  def network_domain_records
+    Morpheus::NetworkDomainRecordsInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
+  end
+
   def network_proxies
     Morpheus::NetworkProxiesInterface.new(@access_token, @refresh_token, @expires_at, @base_url).setopts(@options)
   end

data/lib/morpheus/api/network_domain_records_interface.rb

@@ -0,0 +1,47 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkDomainRecordsInterface < 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(domain_id, id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/networks/domains/#{domain_id}/records/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(domain_id, params={})
+    url = "#{@base_url}/api/networks/domains/#{domain_id}/records"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(domain_id, payload)
+    url = "#{@base_url}/api/networks/domains/#{domain_id}/records"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(domain_id, id, payload)
+    url = "#{@base_url}/api/networks/domains/#{domain_id}/records/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(domain_id, id, params={})
+    url = "#{@base_url}/api/networks/domains/#{domain_id}/records/#{id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+
+end

data/lib/morpheus/api/network_pool_ips_interface.rb

@@ -0,0 +1,47 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkPoolIpsInterface < 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(pool_id, id, params={})
+    raise "#{self.class}.get() passed a blank id!" if id.to_s == ''
+    url = "#{@base_url}/api/networks/pools/#{pool_id}/ips/#{id}"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def list(pool_id, params={})
+    url = "#{@base_url}/api/networks/pools/#{pool_id}/ips"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
+  def create(pool_id, payload)
+    url = "#{@base_url}/api/networks/pools/#{pool_id}/ips"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :post, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def update(pool_id, id, payload)
+    url = "#{@base_url}/api/networks/pools/#{pool_id}/ips/#{id}"
+    headers = { :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :put, url: url, headers: headers, payload: payload.to_json}
+    execute(opts)
+  end
+
+  def destroy(pool_id, id, params={})
+    url = "#{@base_url}/api/networks/pools/#{pool_id}/ips/#{id}"
+    headers = { :params => params, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/json' }
+    opts = {method: :delete, url: url, headers: headers}
+    execute(opts)
+  end
+
+end

data/lib/morpheus/cli/apps.rb

@@ -15,14 +15,14 @@ class Morpheus::Cli::Apps
   include Morpheus::Cli::ProcessesHelper
   set_command_name :apps
   set_command_description "View and manage apps."
-  register_subcommands :list, :count, :get, :add, :update, :remove, :add_instance, :remove_instance, :logs, :security_groups, :apply_security_groups, :history
+  register_subcommands :list, :count, :get, :view, :add, :update, :remove, :add_instance, :remove_instance, :logs, :security_groups, :apply_security_groups, :history
   register_subcommands :stop, :start, :restart
   register_subcommands :wiki, :update_wiki
   #register_subcommands :firewall_disable, :firewall_enable
   #register_subcommands :validate # add --validate instead
   alias_subcommand :details, :get
   set_default_subcommand :list
-  
+
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end
@@ -184,8 +184,8 @@ class Morpheus::Cli::Apps
       opts.on('--validate','--validate', "Validate Only. Validates the configuration and skips creating it.") do
         options[:validate_only] = true
       end
-      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is 5 seconds.") do |val|
-        options[:refresh_interval] = val.to_s.empty? ? 5 : val.to_f
+      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
+        options[:refresh_interval] = val.to_s.empty? ? default_refresh_interval : val.to_f
       end
       build_common_options(opts, options, [:options, :payload, :json, :yaml, :dry_run, :quiet])
       opts.footer = "Create a new app.\n" +
@@ -506,11 +506,8 @@ class Morpheus::Cli::Apps
           end
         end
         # print details
-        if options[:refresh_interval]
-          get([app['id'], '--refresh', options[:refresh_interval].to_s])
-        else
-          get([app['id']])
-        end
+        get_args = [app['id']] + (options[:remote] ? ["-r",options[:remote]] : []) + (options[:refresh_interval] ? ['--refresh', options[:refresh_interval].to_s] : [])
+        get(get_args)
       end
       return 0
     rescue RestClient::Exception => e
@@ -551,7 +548,7 @@ class Morpheus::Cli::Apps
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[app]")
-      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is 5 seconds.") do |val|
+      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "running,failed"
         if !val.to_s.empty?
           options[:refresh_interval] = val.to_f
@@ -694,11 +691,11 @@ class Morpheus::Cli::Apps
       # refresh until a status is reached
       if options[:refresh_until_status]
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
-          options[:refresh_interval] = 5
+          options[:refresh_interval] = default_refresh_interval
         end
         statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
         if !statuses.include?(app['status'])
-          print cyan, "Refreshing in #{options[:refresh_interval]} seconds"
+          print cyan, "Refreshing in #{options[:refresh_interval] > 1 ? options[:refresh_interval].to_i : options[:refresh_interval]} seconds"
           sleep_with_dots(options[:refresh_interval])
           print "\n"
           _get(arg, options)
@@ -790,9 +787,9 @@ class Morpheus::Cli::Apps
         print "\n"
       else
         print_green_success "Updated app #{app['name']}"
-        list([])
-        # details_options = [payload['app']['name']]
-        # details(details_options)
+        # print details
+        get_args = [app['id']] + (options[:remote] ? ["-r",options[:remote]] : [])
+        get(get_args)
       end
 
     rescue RestClient::Exception => e
@@ -1489,6 +1486,64 @@ class Morpheus::Cli::Apps
     end
   end
 
+  def view(args)
+    options = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[app]")
+      opts.on('-w','--wiki', "Open the wiki tab for this app") do
+        options[:link_tab] = "wiki"
+      end
+      opts.on('--tab VALUE', String, "Open a specific tab") do |val|
+        options[:link_tab] = val.to_s
+      end
+      build_common_options(opts, options, [:dry_run, :remote])
+      opts.footer = "View an app in a web browser" + "\n" +
+                    "[app] is required. This is the name or id of an app. Supports 1-N [app] arguments."
+    end
+    optparse.parse!(args)
+    if args.count != 1
+      raise_command_error "wrong number of arguments, expected 1 and got (#{args.count}) #{args.join(' ')}\n#{optparse}"
+    end
+    connect(options)
+    id_list = parse_id_list(args)
+    return run_command_for_each_arg(id_list) do |arg|
+      _view(arg, options)
+    end
+  end
+
+  def _view(arg, options={})
+    begin
+      app = find_app_by_name_or_id(arg)
+      return 1 if app.nil?
+
+      link = "#{@appliance_url}/login/oauth-redirect?access_token=#{@access_token}\\&redirectUri=/provisioning/apps/#{app['id']}"
+      if options[:link_tab]
+        link << "#!#{options[:link_tab]}"
+      end
+
+      open_command = nil
+      if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
+        open_command = "start #{link}"
+      elsif RbConfig::CONFIG['host_os'] =~ /darwin/
+        open_command = "open #{link}"
+      elsif RbConfig::CONFIG['host_os'] =~ /linux|bsd/
+        open_command = "xdg-open #{link}"
+      end
+
+      if options[:dry_run]
+        puts "system: #{open_command}"
+        return 0
+      end
+
+      system(open_command)
+      
+      return 0
+    rescue RestClient::Exception => e
+      print_rest_exception(e, options)
+      exit 1
+    end
+  end
+
   def wiki(args)
     options = {}
     params = {}

data/lib/morpheus/cli/cli_command.rb

@@ -556,11 +556,7 @@ module Morpheus
               options[:border_style] = :thin
             end
             
-          when :outfile
-            opts.on('--out FILE', String, "Write standard output to a file instead of the terminal.") do |val|
-              # could validate directory is writable..
-              options[:outfile] = val
-            end
+          
 
           when :dry_run
             opts.on('-d','--dry-run', "Dry Run, print the API request instead of executing it") do
@@ -586,7 +582,25 @@ module Morpheus
             opts.on(nil,'--scrub', "Mask secrets in output, such as the Authorization header. For use with --curl and --dry-run.") do
               options[:scrub] = true
             end
+            # dry run comes with hidden outfile options
             #opts.add_hidden_option('--scrub') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.on('--out FILE', String, "Write standard output to a file instead of the terminal.") do |val|
+              # could validate directory is writable..
+              options[:outfile] = val
+            end
+            opts.add_hidden_option('--out') if opts.is_a?(Morpheus::Cli::OptionParser)
+            opts.on('--overwrite', '--overwrite', "Overwrite output file if it already exists.") do
+              options[:overwrite] = true
+            end
+            opts.add_hidden_option('--overwrite') if opts.is_a?(Morpheus::Cli::OptionParser)
+
+          when :outfile
+            opts.on('--out FILE', String, "Write standard output to a file instead of the terminal.") do |val|
+              options[:outfile] = val
+            end
+            opts.on('--overwrite', '--overwrite', "Overwrite output file if it already exists.") do |val|
+              options[:overwrite] = true
+            end
           when :quiet
             opts.on('-q','--quiet', "No Output, do not print to stdout") do
               options[:quiet] = true
@@ -662,6 +676,10 @@ module Morpheus
         self.class.default_subcommand
       end
 
+      def default_refresh_interval
+        self.class.default_refresh_interval
+      end
+
       def usage
         if !subcommands.empty?
           "Usage: morpheus #{command_name} [command] [options]"
@@ -909,21 +927,6 @@ module Morpheus
         return subtitles
       end
 
-      def print_to_file(txt, filename)
-        Morpheus::Logging::DarkPrinter.puts "Writing #{txt.to_s.bytesize} bytes to file #{filename}" if Morpheus::Logging.debug?
-        outfile = nil
-        begin
-          outfile = File.open(File.expand_path(filename), 'w')
-          outfile.print(txt)
-          return 0
-        rescue => ex
-          puts_error "Error printing to outfile '#{filename}'. Error: #{ex}"
-          return 1
-        ensure
-          outfile.close if outfile
-        end
-      end
-
       # basic rendering for options :json, :yaml, :csv, :fields, and :outfile
       # returns the string rendered, or nil if nothing was rendered.
       def render_with_format(json_response, options, object_key=nil)
@@ -938,7 +941,7 @@ module Morpheus
         end
         if output
           if options[:outfile]
-            print_to_file(output, options[:outfile])
+            print_to_file(output, options[:outfile], options[:overwrite])
           else
             puts output
           end
@@ -967,7 +970,8 @@ module Morpheus
         def set_command_hidden(val=true)
           @hidden_command = val
         end
-        
+        # alias :command_name= :set_command_name
+
         def hidden_command
           !!@hidden_command
         end
@@ -979,10 +983,18 @@ module Morpheus
         def set_command_description(val)
           @command_description = val
         end
-
-        # alias :command_name= :set_command_name
         # alias :command_description= :set_command_description
 
+        def default_refresh_interval
+          @default_refresh_interval ||= 30
+        end
+
+        def set_default_refresh_interval(seconds)
+          @default_refresh_interval = seconds
+        end
+        #alias :default_refresh_interval= :set_default_refresh_interval
+        
+
         # construct map of command name => instance method
         def register_subcommands(*cmds)
           @subcommands ||= {}

data/lib/morpheus/cli/containers_command.rb

@@ -32,7 +32,7 @@ class Morpheus::Cli::ContainersCommand
       opts.on( nil, '--actions', "Display Available Actions" ) do
         options[:include_available_actions] = true
       end
-      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is 5 seconds.") do |val|
+      opts.on('--refresh [SECONDS]', String, "Refresh until status is running,failed. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_status] ||= "running,failed"
         if !val.to_s.empty?
           options[:refresh_interval] = val.to_f
@@ -97,6 +97,7 @@ class Morpheus::Cli::ContainersCommand
         "Type" => lambda {|it| it['containerType'] ? it['containerType']['name'] : '' },
         "Plan" => lambda {|it| it['plan'] ? it['plan']['name'] : '' },
         "Instance" => lambda {|it| it['instance'] ? it['instance']['name'] : '' },
+        "Host" => lambda {|it| it['server'] ? it['server']['name'] : '' },
         "Cloud" => lambda {|it| it['cloud'] ? it['cloud']['name'] : '' },
         "Location" => lambda {|it| format_container_connection_string(it) },
         # "Description" => 'description',
@@ -134,12 +135,12 @@ class Morpheus::Cli::ContainersCommand
       # refresh until a status is reached
       if options[:refresh_until_status]
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
-          options[:refresh_interval] = 5
+          options[:refresh_interval] = default_refresh_interval
         end
         statuses = options[:refresh_until_status].to_s.downcase.split(",").collect {|s| s.strip }.select {|s| !s.to_s.empty? }
         if !statuses.include?(container['status'])
           print cyan
-          print cyan, "Refreshing in #{options[:refresh_interval]} seconds"
+          print cyan, "Refreshing in #{options[:refresh_interval] > 1 ? options[:refresh_interval].to_i : options[:refresh_interval]} seconds"
           sleep_with_dots(options[:refresh_interval])
           print "\n"
           _get(arg, options)

data/lib/morpheus/cli/execution_request_command.rb

@@ -13,6 +13,7 @@ class Morpheus::Cli::ExecutionRequestCommand
   #register_subcommands :'execute-against-lease' => :execute_against_lease
   
   # set_default_subcommand :list
+
   
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
@@ -37,7 +38,7 @@ class Morpheus::Cli::ExecutionRequestCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[uid]")
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is 5 seconds.") do |val|
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_finished] = true
         if !val.to_s.empty?
           options[:refresh_interval] = val.to_f
@@ -78,7 +79,7 @@ class Morpheus::Cli::ExecutionRequestCommand
       # refresh until a status is reached
       if options[:refresh_until_finished]
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
-          options[:refresh_interval] = 5
+          options[:refresh_interval] = default_refresh_interval
         end
         if execution_request['exitCode'] || ['complete','failed','expired'].include?(execution_request['status'])
           # it is finished

data/lib/morpheus/cli/file_copy_request_command.rb

@@ -13,7 +13,7 @@ class Morpheus::Cli::FileCopyRequestCommand
   #register_subcommands :'execute-against-lease' => :execute_against_lease
   
   # set_default_subcommand :list
-  
+
   def initialize()
     # @appliance_name, @appliance_url = Morpheus::Cli::Remote.active_appliance
   end
@@ -37,7 +37,7 @@ class Morpheus::Cli::FileCopyRequestCommand
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[uid]")
       build_common_options(opts, options, [:query, :json, :yaml, :csv, :fields, :dry_run, :remote])
-      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is 5 seconds.") do |val|
+      opts.on('--refresh [SECONDS]', String, "Refresh until execution is finished. Default interval is #{default_refresh_interval} seconds.") do |val|
         options[:refresh_until_finished] = true
         if !val.to_s.empty?
           options[:refresh_interval] = val.to_f
@@ -78,7 +78,7 @@ class Morpheus::Cli::FileCopyRequestCommand
       # refresh until a status is reached
       if options[:refresh_until_finished]
         if options[:refresh_interval].nil? || options[:refresh_interval].to_f < 0
-          options[:refresh_interval] = 5
+          options[:refresh_interval] = default_refresh_interval
         end
         if ['complete','failed','expired'].include?(file_copy_request['status'])
           # it is finished