morpheus-cli 5.3.4 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7e1172b58bb99b6348f15121c97f5c3d8db818c25fa977cd33835f7a3645da44
-  data.tar.gz: bd216d539aadf61f968cee0dabb6d36361bd79dbdd4ac86527a80872f64620ec
+  metadata.gz: '09fb64a860681d1b04e678410b8f69cd981e950c476a52377c0d9630cdc9af92'
+  data.tar.gz: c9d15338a5e8e801608b0098345656d6bd9a19ade174005aba2948596ef289b5
 SHA512:
-  metadata.gz: 24e82961eae144b2b9a00f555313ae653b6c1f844a9be549553481c7e91789011858075acfc76efabfeb3a503f211f4ddc76c79a8a33cff1d4bf07a355179753
-  data.tar.gz: 0cf97e82534466142e81d7a20ff7672578de00179cfab36a1e94e6900a24193090e1dd1c91d6c6d409000ac92623ed06ae9e6f5f346937c2912b42b5fedac561
+  metadata.gz: ae7e456cf6c52ef57ee80d1ae77601a5297ae48612bd5088cffb8a74ec8f170da14850de931e7a34bc16a4aecedd69b0c2191ad4b981200c82cf53a24ed7b662
+  data.tar.gz: 25d57f2dbc6350fd59209a1422a1820203cb51060bd57ab538b12b8f47daf5fe0a781672eb733d3b5ebdc973fc82a3dc6d01d5724eb3ece09414b7fc6138704d

data/Dockerfile

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

data/lib/morpheus/api/api_client.rb

@@ -1,7 +1,8 @@
 require 'json'
 require 'uri'
 require 'cgi'
-require 'rest-client'
+require 'morpheus/rest_client'
+# require 'rest-client'
 
 class Morpheus::APIClient
 
@@ -844,6 +845,18 @@ class Morpheus::APIClient
     Morpheus::NetworkServersInterface.new(common_interface_options).setopts(@options)
   end
 
+  def network_edge_clusters
+    Morpheus::NetworkEdgeClustersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def network_dhcp_servers
+    Morpheus::NetworkDhcpServersInterface.new(common_interface_options).setopts(@options)
+  end
+
+  def network_dhcp_relays
+    Morpheus::NetworkDhcpRelaysInterface.new(common_interface_options).setopts(@options)
+  end
+
   def rest(endpoint)
     Morpheus::RestInterface.new(common_interface_options).setopts(@options.merge({base_path: "#{@base_url}/api/#{endpoint}"}))
   end

data/lib/morpheus/api/health_interface.rb

@@ -49,6 +49,13 @@ class Morpheus::HealthInterface < Morpheus::APIClient
     execute(opts)
   end
 
+  def notifications(params={})
+    url = "#{@base_url}/api/health/notifications"
+    headers = { params: params, authorization: "Bearer #{@access_token}" }
+    opts = {method: :get, url: url, headers: headers}
+    execute(opts)
+  end
+
   def logs(params={})
     url = "#{@base_url}/api/health/logs"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
@@ -56,11 +63,38 @@ class Morpheus::HealthInterface < Morpheus::APIClient
     execute(opts)
   end
 
-  def notifications(params={})
-    url = "#{@base_url}/api/health/notifications"
+  def export_logs(outfile, params={})
+    url = "#{@base_url}/api/health/logs/export"
     headers = { params: params, authorization: "Bearer #{@access_token}" }
     opts = {method: :get, url: url, headers: headers}
-    execute(opts)
+    # execute(opts, {parse_json: false})
+    if Dir.exists?(outfile)
+      raise "outfile is invalid. It is the name of an existing directory: #{outfile}"
+    end
+    # if @verify_ssl == false
+    #   opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
+    # end
+    if @dry_run
+      return opts
+    end
+    http_response = nil
+    bad_body = nil
+    File.open(outfile, 'w') {|f|
+      block = proc { |response|
+        if response.code.to_i == 200
+          response.read_body do |chunk|
+              #puts "writing to #{outfile} ..."
+              f.write chunk
+          end
+        else
+          # puts_error (#{response.inspect}) #{chunk} ..."
+          bad_body = response.body.to_s
+        end
+      }
+      opts[:block_response] = block
+      http_response = Morpheus::RestClient.execute(opts)
+    }
+    return http_response, bad_body
   end
 
 end

data/lib/morpheus/api/network_dhcp_relays_interface.rb

@@ -0,0 +1,36 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkDhcpRelaysInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def get_dhcp_relay(server_id, dhcp_relay_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, headers: headers)
+  end
+
+  def list_dhcp_relays(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-relays", params: params, headers: headers)
+  end
+
+  def create_dhcp_relay(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/dhcp-relays", params: params, payload: payload, headers: headers)
+  end
+
+  def update_dhcp_relay(server_id, dhcp_relay_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def delete_dhcp_relay(server_id, dhcp_relay_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_relay_id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/dhcp-relays/#{dhcp_relay_id}", params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/network_dhcp_servers_interface.rb

@@ -0,0 +1,36 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkDhcpServersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def get_dhcp_server(server_id, dhcp_server_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, headers: headers)
+  end
+
+  def list_dhcp_servers(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/dhcp-servers", params: params, headers: headers)
+  end
+
+  def create_dhcp_server(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/dhcp-servers", params: params, payload: payload, headers: headers)
+  end
+
+  def update_dhcp_server(server_id, dhcp_server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, payload: payload, headers: headers)
+  end
+
+  def delete_dhcp_server(server_id, dhcp_server_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(dhcp_server_id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/dhcp-servers/#{dhcp_server_id}", params: params, headers: headers)
+  end
+end

data/lib/morpheus/api/network_edge_clusters_interface.rb

@@ -0,0 +1,26 @@
+require 'morpheus/api/api_client'
+
+class Morpheus::NetworkEdgeClustersInterface < Morpheus::RestInterface
+
+  def base_path
+    "/api/networks/servers"
+  end
+
+  def list_edge_clusters(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/edge-clusters", params: params, headers: headers)
+  end
+
+  def get_edge_cluster(server_id, edge_cluster_id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(edge_cluster_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/edge-clusters/#{edge_cluster_id}", params: params, headers: headers)
+  end
+
+  def update_edge_cluster(server_id, edge_cluster_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(edge_cluster_id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/edge-clusters/#{edge_cluster_id}", params: params, payload: payload, headers: headers)
+  end
+
+end

data/lib/morpheus/api/network_servers_interface.rb

@@ -11,10 +11,10 @@ class Morpheus::NetworkServersInterface < Morpheus::RestInterface
     execute(method: :get, url: "#{base_path}/#{server_id}/scopes", params: params, headers: headers)
   end
 
-  def get_scope(server_id, scope_id, params={}, headers={})
+  def get_scope(server_id, id, params={}, headers={})
     validate_id!(server_id)
-    validate_id!(scope_id)
-    execute(method: :get, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, headers: headers)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, headers: headers)
   end
 
   def create_scope(server_id, payload, params={}, headers={})
@@ -22,21 +22,77 @@ class Morpheus::NetworkServersInterface < Morpheus::RestInterface
     execute(method: :post, url: "#{base_path}/#{server_id}/scopes", params: params, payload: payload, headers: headers)
   end
 
-  def update_scope(server_id, scope_id, payload, params={}, headers={})
+  def update_scope(server_id, id, payload, params={}, headers={})
     validate_id!(server_id)
-    validate_id!(scope_id)
-    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, payload: payload, headers: headers)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, payload: payload, headers: headers)
   end
 
-  def destroy_scope(server_id, scope_id, params={}, headers={})
+  def destroy_scope(server_id, id, params={}, headers={})
     validate_id!(server_id)
-    validate_id!(scope_id)
-    execute(method: :delete, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", params: params, headers: headers)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/scopes/#{id}", params: params, headers: headers)
   end
 
-  def update_scope_permissions(server_id, scope_id, payload, params={}, headers={})
+  def update_scope_permissions(server_id, id, payload, params={}, headers={})
     validate_id!(server_id)
-    validate_id!(scope_id)
-    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{scope_id}", payload: payload.to_json, params: params, headers: headers)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/scopes/#{id}", payload: payload.to_json, params: params, headers: headers)
+  end
+
+  def list_firewall_rules(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rules", params: params, headers: headers)
+  end
+
+  def get_firewall_rule(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, headers: headers)
+  end
+
+  def create_firewall_rule(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/firewall-rules", params: params, payload: payload, headers: headers)
+  end
+
+  def update_firewall_rule(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_firewall_rule(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/firewall-rules/#{id}", params: params, headers: headers)
+  end
+
+  def list_firewall_rule_groups(server_id, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rule-groups", params: params, headers: headers)
+  end
+
+  def get_firewall_rule_group(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :get, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, headers: headers)
+  end
+
+  def create_firewall_rule_group(server_id, payload, params={}, headers={})
+    validate_id!(server_id)
+    execute(method: :post, url: "#{base_path}/#{server_id}/firewall-rule-groups", params: params, payload: payload, headers: headers)
+  end
+
+  def update_firewall_rule_group(server_id, id, payload, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :put, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, payload: payload, headers: headers)
+  end
+
+  def destroy_firewall_rule_group(server_id, id, params={}, headers={})
+    validate_id!(server_id)
+    validate_id!(id)
+    execute(method: :delete, url: "#{base_path}/#{server_id}/firewall-rule-groups/#{id}", params: params, headers: headers)
   end
 end

data/lib/morpheus/api/roles_interface.rb

@@ -92,6 +92,13 @@ class Morpheus::RolesInterface < Morpheus::APIClient
     execute(method: :put, url: url, headers: headers, payload: payload.to_json)
   end
 
+  def update_report_type(account_id, id, options)
+    url = build_url(account_id, id) + "/update-report-type"
+    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/cli/cli_command.rb

@@ -1,15 +1,14 @@
-require 'yaml'
-require 'json'
-require 'fileutils'
 require 'morpheus/logging'
 require 'morpheus/benchmarking'
-require 'morpheus/cli/option_parser'
+require 'morpheus/terminal'
 require 'morpheus/cli/cli_registry'
+require 'morpheus/cli/option_parser'
+require 'morpheus/cli/option_types'
 require 'morpheus/cli/mixins/print_helper'
 require 'morpheus/cli/credentials'
+#require 'morpheus/cli/commands/shell'
+#require 'morpheus/cli/commands/remote'
 require 'morpheus/api/api_client'
-require 'morpheus/cli/remote'
-require 'morpheus/terminal'
 
 module Morpheus
   module Cli
@@ -1412,14 +1411,14 @@ module Morpheus
         end
 
         def set_command_name(cmd_name)
-          @command_name = cmd_name
+          @command_name = cmd_name.to_sym
           Morpheus::Cli::CliRegistry.add(self, self.command_name)
         end
 
         def default_command_name
           class_name = self.name.split('::')[-1]
           #class_name.sub!(/Command$/, '')
-          Morpheus::Cli::CliRegistry.cli_ize(class_name)
+          Morpheus::Cli::CliRegistry.cli_ize(class_name).to_sym
         end
         
         def command_name

data/lib/morpheus/cli/cli_registry.rb

@@ -4,6 +4,7 @@ require 'morpheus/logging'
 require 'morpheus/cli/errors'
 require 'morpheus/cli/error_handler'
 require 'morpheus/cli/expression_parser'
+require 'morpheus/ext/string'
 
 module Morpheus
   module Cli

data/lib/morpheus/cli/{access_token_command.rb → commands/access_token_command.rb}

@@ -75,7 +75,7 @@ class Morpheus::Cli::AccessTokenCommand
       "Refresh Token" => lambda {|wallet| wallet['refresh_token'] },
       "Login Date" => lambda {|wallet| format_local_dt(wallet['login_date']) },
       "Expire Date" => lambda {|wallet| wallet['expire_date'] ? format_local_dt(wallet['expire_date']) : "" },
-      # "Remote" => lambda {|wallet| display_appliance(@appliance_name, @appliance_url) },
+      "Remote" => lambda {|wallet| display_appliance(@appliance_name, @appliance_url) },
     }
     print cyan
     puts as_description_list(@wallet, description_cols)

data/lib/morpheus/cli/{account_groups_command.rb → commands/account_groups_command.rb}

@@ -1,12 +1,4 @@
-require 'fileutils'
-require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'morpheus/cli/mixins/infrastructure_helper'
-require 'morpheus/logging'
 
 class Morpheus::Cli::AccountGroupsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/commands/{standard/alias_command.rb → alias_command.rb}

@@ -1,7 +1,4 @@
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/shell'
-require 'json'
 
 # This command allows the creation of an alias
 # these aliases are stored in the $MORPHEUS_CLI_HOME/.morpheusrc

data/lib/morpheus/cli/{apps.rb → commands/apps.rb}

@@ -1,13 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/accounts_helper'
-require 'morpheus/cli/mixins/provisioning_helper'
-require 'morpheus/cli/mixins/processes_helper'
-require 'morpheus/cli/mixins/logs_helper'
 
 class Morpheus::Cli::Apps
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{archives_command.rb → commands/archives_command.rb}

@@ -1,9 +1,3 @@
-require 'fileutils'
-require 'json'
-require 'yaml'
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::ArchivesCommand

data/lib/morpheus/cli/commands/{standard/benchmark_command.rb → benchmark_command.rb}

@@ -1,7 +1,4 @@
-require 'morpheus/logging'
-require 'morpheus/benchmarking'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/cli_registry'
 
 class Morpheus::Cli::BenchmarkCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{boot_scripts_command.rb → commands/boot_scripts_command.rb}

@@ -1,6 +1,3 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
 
 class Morpheus::Cli::BootScriptsCommand

data/lib/morpheus/cli/commands/change_password_command.rb

@@ -0,0 +1,132 @@
+require 'morpheus/cli/cli_command'
+
+class Morpheus::Cli::ChangePasswordCommand
+  include Morpheus::Cli::CliCommand
+  include Morpheus::Cli::AccountsHelper
+
+  set_command_name :passwd
+
+  def connect(opts)
+    @api_client = establish_remote_appliance_connection(opts)
+    @whoami_interface = @api_client.whoami
+    @users_interface = @api_client.users
+    @accounts_interface = @api_client.accounts
+    @roles_interface = @api_client.roles
+  end
+
+  def handle(args)
+    change_password(args)
+  end
+
+  def change_password(args)
+    options = {}
+    username = nil
+    new_password = nil
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[username] [options]")
+      opts.on('--username USERNAME', String, "Username. Default is your own.") do |val|
+        username = val
+      end
+      opts.on('--password VALUE', String, "New password") do |val|
+        new_password = val
+      end
+      build_common_options(opts, options, [:account, :options, :json, :dry_run, :remote, :quiet, :auto_confirm], [:username,:password])
+      opts.footer = "Change your password or the password of another user.\n" +
+                    "[username] is optional. This is the username of the user to update. Default is your own.\n" +
+                    "Be careful with this command, the default behavior is to update your own password."
+    end
+    optparse.parse!(args)
+
+    if args.count > 1
+      print_error Morpheus::Terminal.angry_prompt
+      puts_error  "wrong number of arguments, expected 0-1 and got #{args.count} #{args}\n#{optparse}"
+      return 1
+    end
+
+    connect(options)
+    @current_remote = @appliance_name ? ::Morpheus::Cli::Remote.load_remote(@appliance_name) : ::Morpheus::Cli::Remote.load_active_remote()
+
+    if args[0]
+      username = args[0]
+    end
+    if username.nil?
+      if !@current_remote
+        raise_command_error "No current appliance, see `remote use`."
+      end
+      if !@current_remote[:username]
+        raise_command_error "You are not currently logged in to #{display_appliance(@current_remote[:name], @current_remote[:url])}"
+      end
+      username = @current_remote[:username]
+    end
+
+    account = find_account_from_options(options)
+    account_id = account ? account['id'] : nil
+
+    user = find_user_by_username_or_id(account_id, username)
+    return 1 if user.nil?
+
+    if @current_remote && @current_remote[:username] == username
+      if !options[:quiet]
+        if options[:dry_run]
+          print cyan,bold,  "DRY RUN. This is just a dry run, the password is not being updated.",reset,"\n"
+        else
+          print cyan,bold,  "WARNING! You are about to update your own password!",reset,"\n"
+          print yellow,bold,"WARNING! You are about to update your own password!",reset,"\n"
+          print reset,bold, "WARNING! You are about to update your own password!",reset,"\n"
+        end
+      end
+    end
+
+    if !options[:quiet]
+      print cyan, "Changing password for #{user['username']}", reset, "\n"
+    end
+
+    if new_password.nil? && options[:options]['password']
+      new_password = options[:options]['password']
+    end
+    if new_password.nil?
+      password_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'password', 'fieldLabel' => 'New Password', 'type' => 'password', 'required' => true}], options[:options], @api_client)
+      new_password = password_prompt['password']
+      confirm_prompt = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'passwordConfirmation', 'fieldLabel' => 'Confirm Password', 'type' => 'password', 'required' => true}], options[:options], @api_client)
+      confirm_password = confirm_prompt['passwordConfirmation']
+      if confirm_password != new_password
+        print_red_alert "Confirm password did not match."
+        return 1
+      end
+    end
+
+    if new_password.nil? || new_password.empty?
+      print_red_alert "A new password is required"
+      return 1
+    end
+
+    payload = {
+      'user' => {
+        'password' => new_password
+      } 
+    }
+    @users_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @users_interface.dry.update(account_id, user['id'], payload)
+      return 0
+    end
+
+    unless options[:yes]
+      unless ::Morpheus::Cli::OptionTypes::confirm("Are you sure you would like to update the password for user #{user['username']}?", options)
+        return 9, "aborted command"
+      end
+    end
+
+    json_response = @users_interface.update(account_id, user['id'], payload)
+    if options[:json]
+      puts as_json(json_response)
+    elsif !options[:quiet]
+      print_green_success "Updated password for user #{user['username']}"
+    end
+    return 0
+  end
+
+  private
+
+
+end

data/lib/morpheus/cli/{cloud_datastores_command.rb → commands/cloud_datastores_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::CloudDatastoresCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{cloud_folders_command.rb → commands/cloud_folders_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::CloudFoldersCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{cloud_resource_pools_command.rb → commands/cloud_resource_pools_command.rb}

@@ -1,8 +1,4 @@
-require 'rest_client'
-require 'optparse'
-require 'filesize'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
 
 class Morpheus::Cli::CloudResourcePoolsCommand
   include Morpheus::Cli::CliCommand

data/lib/morpheus/cli/{clouds.rb → commands/clouds.rb}

@@ -1,11 +1,4 @@
-# require 'yaml'
-require 'io/console'
-require 'rest_client'
-require 'optparse'
 require 'morpheus/cli/cli_command'
-require 'morpheus/cli/mixins/infrastructure_helper'
-require 'morpheus/cli/mixins/provisioning_helper'
-require 'morpheus/cli/option_types'
 
 class Morpheus::Cli::Clouds
   include Morpheus::Cli::CliCommand