morpheus-cli 5.0.0 → 5.0.1

data/lib/morpheus/cli/deploy.rb

@@ -6,6 +6,7 @@ class Morpheus::Cli::Deploy
   include Morpheus::Cli::DeploymentsHelper
 
   set_command_name :deploy
+  set_command_description "Deploy to an instance from a morpheus.yml file."
 
   def connect(opts)
     @api_client = establish_remote_appliance_connection(opts)
@@ -18,30 +19,35 @@ class Morpheus::Cli::Deploy
     options={}
     optparse = Morpheus::Cli::OptionParser.new do|opts|
       opts.banner = "Usage: morpheus deploy [environment]"
-      build_common_options(opts, options, [:auto_confirm, :remote, :dry_run])
+      build_common_options(opts, options, [:auto_confirm, :quiet, :remote, :dry_run])
       opts.footer = <<-EOT
 Deploy to an instance using the morpheus.yml file, located in the working directory.
 [environment] is optional. Merge settings under environments.{environment}. Default is no environment.
 
-First this parses the morpheus.yml file and merges the specified environment settings.
-The specified instance must exist and the specified version must not exist.
-If the settings are valid, the new deployment version will be created and 
-all the specified files are uploaded to the new deployment version.
-Finally, it deploys the new version to the instance.
+First the morpheus.yml YAML file is parsed, merging the specified environment's nested settings.
+The specified instance must exist and the specified deployment version must not exist.
+If the settings are valid, the new deployment version will be created.
+If is a file type deployment, all the discovered files are uploaded to the new deployment version.
+Finally, it deploys the new version to the instance using any specified config options.
 
 The morpheus.yml should be located in the working directory.
-This file contains the information necessary to perform a deployment via the cli.
+This YAML file contains the settings that specify how to execute the deployment.
 
 File Settings
 ==================
 
-* name - (required) The instance name we are deploying to and, by default, name of the deployment being created.
+* name - (required) The instance name being deployed to, also the default name of the deployment.
 * version - (required) The version identifier of the deployment being created (userVersion)
 * deployment - The name of the deployment being created, name is used by default
-* script - The initial script to run before looking for files to upload.
-* files - List of file patterns to use for uploading files and their target destination. 
+* type - The type of deployment, file, 'git' or 'fetch', default is 'file'.
+* script - The initial script to run, happens before finding the files to be uploaded.
+* files - (required) List of file patterns to use for uploading files and their target destination. 
           Each item should contain path and pattern, path may be relative to the working directory, default pattern is: '**/*'
-* options - Map of deployment options depending on deployment type
+          only applies to type 'file'
+* url - (required) The url to fetch files from, only applies to types 'git' and 'fetch'.
+* ref - The git reference, default is master (main), only applies to type git.
+* config - Map of deployment config options depending on deployment type
+* options - alias for config
 * post_script - A post operation script to be run on the local machine
 * stage_only - If set to true the deploy will only be staged and not actually run
 * environments - Map of objects that contain nested properties for each environment name
@@ -51,7 +57,7 @@ It is possible to nest these properties in an "environments" map to override bas
 Example
 ==================
 
-name: neatsite
+name: mysite
 version: 5.0
 script: "rake build"
 files: 
@@ -60,6 +66,16 @@ environments:
   production:
     files:
     - path: production-build
+
+
+Git Example
+==================
+
+name: morpheus-apidoc
+version: 5.0.0
+type: git
+url: "https://github.com/gomorpheus/morpheus-apidoc"
+
 EOT
     end
     optparse.parse!(args)
@@ -106,45 +122,90 @@ EOT
     instance = instance_results['instances'][0]
     instance_id = instance['id']
 
+    # auto detect type, default to file
+    deploy_type = deploy_args['type'] || deploy_args['deployType']
+    if deploy_type.nil?
+      if deploy_args['gitUrl']
+        deploy_type = 'git'
+      elsif deploy_args['fetchUrl'] || deploy_args['url']
+        deploy_type = 'fetch'
+      end
+    end
+    if deploy_type.nil?
+      deploy_type = "file"
+    end
+    deploy_url = deploy_args['url'] || deploy_args['fetchUrl'] || deploy_args['gitUrl']
+    if deploy_url.nil? && (deploy_type == "git" || deploy_type == "fetch")
+      raise_command_error "Deploy type '#{deploy_type}' requires a url to be specified"
+    end
+    #deploy_type = "file" if deploy_type.to_s.downcase == "files"
+
+    deploy_config = deploy_args['options'] || deploy_args['config']
+
     # ok do it
     # fetch/create deployment, create deployment version, upload files, and deploy it to instance.
 
-    print_h1 "Morpheus Deployment"
-
-    columns = {
-      "Instance" => :name,
-      "Deployment" => :deployment,
-      "Version" => :version,
-      "Script" => :script,
-      "Post Script" => :post_script,
-      "Files" => :files,
-      "Environment" => :environment,
-    }
-    pretty_file_config = deploy_args['files'].collect {|it|
-      [(it['path'] ? "path: #{it['path']}" : nil), (it['pattern'] ? "pattern: #{it['pattern']}" : nil)].compact.join(", ")
-    }.join(", ")
-    deploy_settings = {
-      :name => instance_name,
-      :deployment => deployment_name,
-      :version => version_number,
-      :script => deploy_args['script'],
-      :post_script => deploy_args['post_script'],
-      :files => pretty_file_config,
-      # :files => deploy_args['files'],
-      # :files => deploy_files.size,
-      # :file_config => (deploy_files.size == 1 ? deploy_files[0][:destination] : deploy_args['files'])
-      :environment => environment
-    }
-    columns.delete("Script") if deploy_settings[:script].nil?
-    columns.delete("Post Script") if deploy_settings[:post_script].nil?
-    columns.delete("Environment") if deploy_settings[:environment].nil?
-    print_description_list(columns, deploy_settings)
-    print reset, "\n"
+    unless options[:quiet]
+
+      print_h1 "Morpheus Deployment", options
+
+      columns = {
+        "Instance" => :name,
+        "Deployment" => :deployment,
+        "Version" => :version,
+        "Deploy Type" => :type,
+        "Script" => :script,
+        "Post Script" => :post_script,
+        "Files" => :files,
+        "Git Url" => :git_url,
+        "Git Ref" => :git_ref,
+        "Fetch Url" => :fetch_url,
+        "Environment" => :environment,
+      }
+      pretty_file_config = deploy_args['files'] ? deploy_args['files'].collect {|it|
+        [(it['path'] ? "path: #{it['path']}" : nil), (it['pattern'] ? "pattern: #{it['pattern']}" : nil)].compact.join(", ")
+      }.join(", ") : "(none)"
+      deploy_settings = {
+        :name => instance_name,
+        :deployment => deployment_name,
+        :version => version_number,
+        :script => deploy_args['script'],
+        :post_script => deploy_args['post_script'],
+        :files => pretty_file_config,
+        :type => format_deploy_type(deploy_type),
+        :git_url => deploy_args['gitUrl'] || (deploy_type == "git" ? deploy_args['url'] : nil),
+        :git_ref => deploy_args['gitRef'] || (deploy_type == "git" ? deploy_args['ref'] : nil),
+        :fetch_url => deploy_args['fetchUrl'] || (deploy_type == "fetch" ? deploy_args['url'] : nil),
+        # :files => deploy_args['files'],
+        # :files => deploy_files.size,
+        # :file_config => (deploy_files.size == 1 ? deploy_files[0][:destination] : deploy_args['files'])
+        :environment => environment
+      }
+      columns.delete("Script") if deploy_settings[:script].nil?
+      columns.delete("Post Script") if deploy_settings[:post_script].nil?
+      columns.delete("Environment") if deploy_settings[:environment].nil?
+      columns.delete("Files") if deploy_type != "file" && deploy_type != "files"
+      columns.delete("Git Url") if deploy_settings[:git_url].nil?
+      columns.delete("Git Ref") if deploy_settings[:git_ref].nil?
+      columns.delete("Fetch Url") if deploy_settings[:fetch_url].nil?
+      print_description_list(columns, deploy_settings)
+      print reset, "\n"
+
+      if deploy_config
+        print_h2 "Config Options", options
+        print cyan
+        puts as_json(deploy_config)
+        print "\n\n", reset
+      end
+
+    end # unless options[:quiet]
 
     if !deploy_args['script'].nil?
       # do this for dry run too since this is usually what creates the files to be uploaded
-      print cyan, "Executing Pre Deploy Script...", reset, "\n"
-      puts "running command: #{deploy_args['script']}"
+      unless options[:quiet]
+        print cyan, "Executing Pre Deploy Script...", reset, "\n"
+        puts "running command: #{deploy_args['script']}"
+      end
       if !system(deploy_args['script'])
         raise_command_error "Error executing pre script..."
       end
@@ -152,33 +213,71 @@ EOT
 
     # Find Files to Upload
     deploy_files = []
-    if deploy_args['files'].nil? || deploy_args['files'].empty? || !deploy_args['files'].is_a?(Array)
-      raise_command_error "Files not specified. Please specify files array, each item may specify a path or pattern of file(s) to upload"
-    else
-      #print "\n",cyan, "Finding Files...", reset, "\n"
-      current_working_dir = Dir.pwd
-      deploy_args['files'].each do |fmap|
-        Dir.chdir(fmap['path'] || current_working_dir)
-        files = Dir.glob(fmap['pattern'] || '**/*')
-        files.each do |file|
-          if File.file?(file)
-            destination = file.split("/")[0..-2].join("/")
-            # deploy_files << {filepath: File.expand_path(file), destination: destination}
-            deploy_files << {filepath: File.expand_path(file), destination: file}
+    if deploy_type == "file" || deploy_type == "files"
+      if deploy_args['files'].nil? || deploy_args['files'].empty? || !deploy_args['files'].is_a?(Array)
+        raise_command_error "Files not specified. Please specify the files to include, each item may specify a path or pattern of file(s) to upload"
+      else
+        #print "\n",cyan, "Finding Files...", reset, "\n"
+        current_working_dir = Dir.pwd
+        deploy_args['files'].each do |fmap|
+          Dir.chdir(fmap['path'] || current_working_dir)
+          files = Dir.glob(fmap['pattern'] || '**/*')
+          files.each do |file|
+            if File.file?(file)
+              destination = file.split("/")[0..-2].join("/")
+              # deploy_files << {filepath: File.expand_path(file), destination: destination}
+              deploy_files << {filepath: File.expand_path(file), destination: file}
+            end
           end
         end
+        #print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
+        Dir.chdir(current_working_dir)
       end
-      #print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
-      Dir.chdir(current_working_dir)
-    end
 
-    if deploy_files.empty?
-      raise_command_error "0 files found for: #{deploy_args['files'].inspect}"
-    else
-      print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
+      if deploy_files.empty?
+        raise_command_error "0 files found for: #{deploy_args['files'].inspect}"
+      else
+        unless options[:quiet]
+          print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
+        end
+      end
+    elsif deploy_type == "git"
+      # make it work with simpler config, url instead of gitUrl
+      if deploy_args['gitUrl'].nil? && deploy_args['url']
+        deploy_args['gitUrl'] = deploy_args['url'] # .delete('url') maybe?
+      end
+      if deploy_args['gitRef'].nil? && deploy_args['ref']
+        deploy_args['gitRef'] = deploy_args['ref'] # .delete('ref') maybe?
+      end
+      if deploy_args['gitRef'].nil?
+        raise_command_error "fetchUrl not specified. Please specify the git url to fetch the deploy files from."
+      end
+      if deploy_args['gitRef'].nil?
+        #raise_command_error "gitRef not specified. Please specify the git reference to use. eg. main"
+        # deploy_args['gitRef'] = "main"
+      end
+    elsif deploy_type == "git"
+      # make it work with simpler config, url instead of fetchUrl
+      if deploy_args['fetchUrl'].nil? && deploy_args['url']
+        deploy_args['fetchUrl'] = deploy_args['url'] # .delete('url') maybe?
+      end
+      if deploy_args['fetchUrl'].nil?
+        raise_command_error "fetchUrl not specified. Please specify the url to fetch the deploy files from."
+      end
+      
     end
 
-    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to create deployment version #{version_number} (#{deploy_files.size} #{deploy_files.size == 1 ? 'file' : 'files'}) and deploy it to instance #{instance['name']}?")
+    confirm_warning = ""
+    confirm_message = "Are you sure you want to perform this action?"
+    if deploy_type == "file" || deploy_type == "files"
+      confirm_warning = "This will create deployment #{deployment_name} version #{version_number} and deploy it to instance #{instance['name']}."
+    elsif deploy_type == "git"
+      confirm_warning = "This will create deployment #{deployment_name} version #{version_number} and deploy it to instance #{instance['name']}."
+    elsif deploy_type == "fetch"
+      confirm_warning = "This will create deployment #{deployment_name} version #{version_number} and deploy it to instance #{instance['name']}."
+    end
+    puts confirm_warning if !options[:quiet]
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm(confirm_message)
       return 9, "aborted command"
     end
     
@@ -242,7 +341,7 @@ EOT
       payload = {
         'version' => {
           'userVersion' => version_number,
-          'deployType' => (deploy_args['type'] || deploy_args['deployType'] || 'file')
+          'deployType' => deploy_type
         } 
       }
       payload['version']['fetchUrl'] = deploy_args['fetchUrl'] if deploy_args['fetchUrl']
@@ -261,31 +360,31 @@ EOT
 
     
     # Upload Files
-    if deploy_files && !deploy_files.empty?
-      print "\n",cyan, "Uploading #{deploy_files.size} Files...", reset, "\n"
-      current_working_dir = Dir.pwd
-      deploy_files.each do |f|
-        destination = f[:destination]
-        if options[:dry_run]
-          print_dry_run @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
-        else
-          print cyan,"  - Uploading #{f[:destination]} ...", reset if !options[:quiet]
-          upload_result = @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
-          #print green + "SUCCESS" + reset + "\n" if !options[:quiet]
-          print reset, "\n" if !options[:quiet]
+    if deploy_type == "file" || deploy_type == "files"
+      if deploy_files && !deploy_files.empty?
+        print "\n",cyan, "Uploading #{deploy_files.size} Files...", reset, "\n" if !options[:quiet]
+        current_working_dir = Dir.pwd
+        deploy_files.each do |f|
+          destination = f[:destination]
+          if options[:dry_run]
+            print_dry_run @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
+          else
+            print cyan,"  - Uploading #{f[:destination]} ...", reset if !options[:quiet]
+            upload_result = @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
+            #print green + "SUCCESS" + reset + "\n" if !options[:quiet]
+            print reset, "\n" if !options[:quiet]
+          end
         end
+        print cyan, "Upload Complete!", reset, "\n" if !options[:quiet]
+        Dir.chdir(current_working_dir)
+      else
+        print "\n",cyan, "0 files to upload", reset, "\n" if !options[:quiet]
       end
-      print cyan, "Upload Complete!", reset, "\n"
-      Dir.chdir(current_working_dir)
-    else
-      print "\n",cyan, "0 files to upload", reset, "\n"
     end
 
-    # TODO: support deploying other deployTypes too, git and fetch
-
     if !deploy_args['post_script'].nil?
-      print cyan, "Executing Post Script...", reset, "\n"
-      puts "running command: #{deploy_args['post_script']}"
+      print cyan, "Executing Post Script...", reset, "\n" if !options[:quiet]
+      puts "running command: #{deploy_args['post_script']}" if !options[:quiet]
       if !system(deploy_args['post_script'])
         raise_command_error "Error executing post script..."
       end
@@ -314,10 +413,14 @@ EOT
     end
     # stageOnly means do not actually deploy yet, can invoke @deploy_interface.deploy(deployment['id']) later
     # there is no cli command for that yet though..
-    stage_only = deploy_args['stage_deploy'] || deploy_args['stage_only'] || deploy_args['stageOnly']
+    stage_only = deploy_args['stage'] || deploy_args['stage_deploy'] || deploy_args['stage_only'] || deploy_args['stageOnly']
     if stage_only
       payload['appDeploy']['stageOnly'] = true
     end
+    # config/options to apply to deployment
+    if deploy_config
+      payload['appDeploy']['config'] = deploy_config
+    end
     app_deploy_id = nil
     if options[:dry_run]
       print_dry_run @deploy_interface.dry.create(instance_id, payload)
@@ -325,11 +428,17 @@ EOT
       app_deploy_id = ':appDeployId'
     else
       # Create a new appDeploy record, without stageOnly, this actually does the deployment
-      print cyan, "Deploying #{deployment_name} version #{version_number} to instance #{instance_name} ...", reset, "\n"
+      #print cyan, "Deploying #{deployment_name} version #{version_number} to instance #{instance_name} ...", reset, "\n"
       deploy_result = @deploy_interface.create(instance_id, payload)
       app_deploy = deploy_result['appDeploy']
       app_deploy_id = app_deploy['id']
-      print_green_success "Deploy Successful!"
+      if !options[:quiet]
+        if app_deploy['status'] == 'staged'
+          print_green_success "Staged Deploy #{deployment_name} version #{version_number} to instance #{instance_name}"
+        else
+          print_green_success "Deploying #{deployment_name} version #{version_number} to instance #{instance_name}"
+        end
+      end
     end
     return 0, nil
   end

data/lib/morpheus/cli/deployments.rb

@@ -4,8 +4,11 @@ class Morpheus::Cli::Deployments
   include Morpheus::Cli::CliCommand
   include Morpheus::Cli::DeploymentsHelper
 
+  set_command_description "View and manage deployments, including versions and files."
+
   register_subcommands :list, :get, :add, :update, :remove
   register_subcommands :list_versions, :get_version, :add_version, :update_version, :remove_version
+  register_subcommands :list_files, :upload, :remove_file
   alias_subcommand :versions, :'list-versions'
 
   def initialize()
@@ -81,7 +84,7 @@ EOT
       if id.to_s =~ /\A\d{1,}\Z/
         id
       else
-        deployment = find_deployment_by_name(id)
+        deployment = find_deployment_by_name_or_id(id)
         if deployment
           deployment['id']
         else
@@ -275,6 +278,9 @@ EOT
     connect(options)
     deployment = find_deployment_by_name_or_id(args[0])
     return 1 if deployment.nil?
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the deployment #{deployment['name']}?")
+      return 9, "aborted command"
+    end
     @deployments_interface.setopts(options)
     if options[:dry_run]
       print_dry_run @deployments_interface.dry.destroy(deployment['id'], params)
@@ -292,6 +298,9 @@ EOT
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[deployment] [version] [options]")
+      opts.on(nil, '--no-files', "Do not show files") do
+        options[:no_files] = true
+      end
       build_option_type_options(opts, options, add_deployment_version_option_types)
       build_option_type_options(opts, options, add_deployment_version_advanced_option_types)
       build_standard_add_options(opts, options)
@@ -311,7 +320,7 @@ EOT
     if id.to_s =~ /\A\d{1,}\Z/
       id = id.to_i
     else
-      deployment_version = find_deployment_version_by_name(deployment['id'], id)
+      deployment_version = find_deployment_version_by_name_or_id(deployment['id'], id)
       if deployment_version
         id = deployment_version['id']
       else
@@ -326,6 +335,13 @@ EOT
     end
     json_response = @deployments_interface.get_version(deployment['id'], id, params)
     deployment_version = json_response['version']
+    deploy_type = deployment_version['deployType'] || deployment_version['type']
+    deployment_files_response = nil
+    deployment_files = nil
+    if options[:no_files] != true
+      deployment_files_response = @deployments_interface.list_files(deployment['id'], deployment_version['id'], params)
+      deployment_files = deployment_files_response.is_a?(Array) ? deployment_files_response : deployment_files_response['files']
+    end
     render_response(json_response, options, 'version') do
       # print_h1 "Deployment Version Details", [deployment['name']], options
       print_h1 "Deployment Version Details", [], options
@@ -334,26 +350,17 @@ EOT
       columns = {
         "ID" => 'id',
         "Deployment" => lambda {|it| deployment['name'] },
-        "Version" => 'userVersion',
+        "Version" => lambda {|it| format_deployment_version_number(it) },
         "Deploy Type" => lambda {|it| it['deployType'] },
-        "URL" => lambda {|it| 
-          if it['deployType'] == 'fetch'
-            "#{it['fetchUrl']}"
-          elsif it['deployType'] == 'git'
-            "#{it['gitUrl']}"
-          end
-        },
-        "Ref" => lambda {|it| 
-          if it['deployType'] == 'git'
-            "#{it['gitRef']}"
-          end
-        },
+        "URL" => lambda {|it| it['fetchUrl'] || it['gitUrl'] || it['url'] },
+        "Ref" => lambda {|it| it['gitRef'] || it['ref'] },
         "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
         "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
       }
       if deployment_version['deployType'] == 'git'
-        columns['Git URL'] = columns['URL']
+        options[:no_files] = true
       elsif deployment_version['deployType'] == 'fetch'
+        options[:no_files] = true
         columns['Fetch URL'] = columns['URL']
         columns.delete('Ref')
       else
@@ -362,6 +369,18 @@ EOT
       end
       print_description_list(columns, deployment_version)
       print reset,"\n"
+
+      if options[:no_files] != true
+        print_h2 "Deployment Files", options
+        if !deployment_files || deployment_files.empty?
+          print cyan,"No files found.",reset,"\n"
+        else
+          print as_pretty_table(deployment_files, deployment_file_column_definitions.upcase_keys!, options)
+          print_results_pagination({size:deployment_files.size,total:deployment_files.size.to_i})
+        end
+        print reset,"\n"
+      end
+
     end
     return 0, nil
   end
@@ -371,7 +390,11 @@ EOT
     params = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[deployment] [version] [options]")
+      opts.on('-t', '--type CODE', String, "Deploy Type, file, git or fetch, default is file.") do |val|
+        options[:options]['deployType'] = val
+      end
       build_option_type_options(opts, options, add_deployment_version_option_types)
+      opts.add_hidden_option('--deployType')
       build_option_type_options(opts, options, add_deployment_version_advanced_option_types)
       build_standard_add_options(opts, options)
       opts.footer = <<-EOT
@@ -485,28 +508,304 @@ EOT
     verify_args!(args:args, optparse:optparse, count:2)
     connect(options)
     deployment = find_deployment_by_name_or_id(args[0])
-    return 1 if deployment.nil?
+    return 1, "deployment not found" if deployment.nil?
     id = args[1]
+    deployment_version = find_deployment_version_by_name_or_id(deployment['id'], id)
+    return 1, "version not found" if deployment_version.nil?
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the deployment version #{format_deployment_version_number(deployment_version)}?")
+      return 9, "aborted command"
+    end
+    @deployments_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @deployments_interface.dry.destroy_version(deployment['id'], deployment_version['id'], params)
+      return
+    end
+    json_response = @deployments_interface.destroy_version(deployment['id'], deployment_version['id'], params)
+    render_response(json_response, options) do
+      print_green_success "Removed deployment #{deployment['name']} version #{format_deployment_version_number(deployment_version)}"
+    end
+    return 0, nil
+  end
 
-    if id.to_s =~ /\A\d{1,}\Z/
-      id = id.to_i
+  def list_files(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[deployment] [version] [path] [options]")
+      build_standard_list_options(opts, options)
+      opts.footer = <<-EOT
+List files in a deployment version.
+[deployment] is required. This is the name or id of a deployment.
+[version] is required. This is the deployment version identifier
+[path] is optional. This is a the directory to search for files under.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:2, max: 3)
+    connect(options)
+    params.merge!(parse_list_options(options))
+    deployment = find_deployment_by_name_or_id(args[0])
+    return 1, "deployment not found for '#{args[0]}'" if deployment.nil?
+    deployment_version = find_deployment_version_by_name_or_id(deployment['id'], args[1])
+    return 1, "deployment version not found for '#{args[1]}'" if deployment_version.nil?
+    if args[2]
+      params['filePath'] = args[2]
+    end
+    @deployments_interface.setopts(options)
+    if options[:dry_run]
+      print_dry_run @deployments_interface.dry.list_files(deployment['id'], deployment_version['id'], params)
+      return
+    end
+    json_response = @deployments_interface.list_files(deployment['id'], deployment_version['id'], params)
+    # odd, api used to just return an array
+    deployment_files = json_response.is_a?(Array) ? json_response : json_response['files']
+    render_response(json_response, options) do
+      print_h1 "Deployment Files", ["#{deployment['name']} #{format_deployment_version_number(deployment_version)}"]
+      if !deployment_files || deployment_files.empty?
+        print cyan,"No files found.",reset,"\n"
+      else
+        print as_pretty_table(deployment_files, deployment_file_column_definitions.upcase_keys!, options)
+        #print_results_pagination(json_response)
+        print_results_pagination({size:deployment_files.size,total:deployment_files.size.to_i})
+      end
+      print reset,"\n"
+    end
+    return 0, nil
+  end
+
+  def upload(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[deployment] [version] [files]")
+      opts.on('--files LIST', String, "Files to upload") do |val|
+        val_list = val.to_s.split(",").collect {|it| it.to_s.strip }.select { |it| it != "" }
+        options[:files] ||= []
+        options[:files] += val_list
+      end
+      opts.on('--workdir DIRECTORY', String, "Working directory to switch to before uploading files, determines the paths of the uploaded files. The current working directory of your terminal is used by default.") do |val|
+        options[:workdir] = File.expand_path(val)
+        if !File.directory?(options[:workdir])
+          raise_command_error "invalid directory: #{val}"
+        end
+      end
+      opts.on('--destination FILEPATH', String, "Destination filepath for file being uploaded, should include full filename and extension. Only applies when uploading a single file.") do |val|
+        options[:destination] = val
+      end
+      build_standard_update_options(opts, options, [:auto_confirm])
+      opts.footer = <<-EOT
+Upload one or more files or directories to a deployment version.
+[deployment] is required. This is the name or id of a deployment.
+[version] is required. This is the deployment version identifier
+[files] is required. This is a list of files or directories to be uploaded. Glob pattern format supported eg. build/*.html
+EOT
+    end
+    optparse.parse!(args)
+    # verify_args!(args:args, optparse:optparse, min:0, max:2)
+    connect(options)
+
+    # fetch deployment
+    deployment = nil
+    if args[0]
+      deployment = find_deployment_by_name_or_id(args[0])
+      return 1 if deployment.nil?
     else
-      deployment_version = find_deployment_version_by_name(deployment['id'], id)
-      if deployment_version
-        id = deployment_version['id']
+      all_deployments = @deployments_interface.list(max:10000)['deployments']
+      deployment_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'deployment', 'fieldLabel' => 'Deployment', 'type' => 'select', 'required' => true, 'description' => 'Deployment identifier (name or ID)', 'optionSource' => lambda { |api_client, api_params|
+        all_deployments.collect {|it| {'name' => it['name'], 'value' => it['id']} }
+      }}], options[:options])['deployment']
+      deployment = all_deployments.find {|it| deployment_id == it['id'] || deployment_id == it['name'] }
+      raise_command_error "Deployment not found for '#{deployment_id}'" if deployment.nil?
+    end
+
+    # fetch deployment version
+    deployment_version = nil
+    if args[1]
+      deployment_version = find_deployment_version_by_name_or_id(deployment['id'], args[1])
+      return 1 if deployment_version.nil?
+    else
+      all_deployment_versions = @deployments_interface.list_versions(deployment['id'], {max:10000})['versions']
+      deployment_version_id = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'version', 'fieldLabel' => 'Version', 'type' => 'select', 'required' => true, 'description' => 'Deployment Version identifier (version or ID) to upload files to', 'optionSource' => lambda { |api_client, api_params|
+        all_deployment_versions.collect {|it| {'name' => it['version'] || it['userVersion'], 'value' => it['id']} }
+      }}], options[:options])['version']
+      deployment_version = all_deployment_versions.find {|it| deployment_version_id == it['id'] || deployment_version_id == it['userVersion'] || deployment_version_id == it['version'] }
+      raise_command_error "Deployment Version not found for '#{deployment_version_id}'" if deployment_version.nil?
+    end
+
+
+    # Determine which files to find
+    file_patterns = []
+    # [files] is args 3 - N
+    if args.size > 2
+      file_patterns += args[2..-1]
+    end
+    if options[:files]
+      file_patterns += options[:files]
+    end
+    if file_patterns.empty?
+      #raise_command_error "Files not specified. Please specify files array, each item may specify a path or pattern of file(s) to upload", args, optparse
+      file_patterns = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'files', 'fieldLabel' => 'Files', 'type' => 'text', 'required' => true, 'description' => 'Files or directories to upload'}], options[:options])['files'].to_s.split(",").collect {|it| it.to_s.strip }.select { |it| it != "" }
+    end
+
+    # Find Files to Upload
+    deploy_files = []
+    
+    #print "\n",cyan, "Finding Files...", reset, "\n" unless options[:quiet]
+    original_working_dir = Dir.pwd
+    base_working_dir = options[:workdir] || original_working_dir
+    begin
+      file_patterns.each do |file_pattern|
+        # start in the working directory
+        # to preserve relative paths in upload file destinations
+        # allow passing just build  instead  build/**/*
+        Dir.chdir(base_working_dir)
+        fmap = nil
+        full_file_pattern = File.expand_path(file_pattern)
+        if File.exists?(full_file_pattern)
+          if File.directory?(full_file_pattern)
+            fmap = {'path' => full_file_pattern, 'pattern' => '**/*'}
+          else
+            fmap = {'path' => File.dirname(full_file_pattern), 'pattern' => File.basename(full_file_pattern)}
+          end
+        else
+          fmap = {'path' => nil, 'pattern' => file_pattern}
+        end
+        if fmap['path']
+          Dir.chdir(File.expand_path(fmap['path']))
+        end
+        files = Dir.glob(fmap['pattern'] || '**/*')
+        if files.empty?
+          raise_command_error "Found 0 files for file pattern '#{file_pattern}'"
+        end
+        files.each do |file|
+          if File.file?(file)
+            destination = file.split("/")[0..-2].join("/")
+            # deploy_files << {filepath: File.expand_path(file), destination: destination}
+            # absolute path was given, so no path is given to the destination file
+            # maybe apply options[:destination] as prefix here
+            # actually just do destination.sub!(base_working_dir, '')
+            if file[0].chr == "/"
+              deploy_files << {filepath: File.expand_path(file), destination: File.basename(file)}
+            else
+              deploy_files << {filepath: File.expand_path(file), destination: file}
+            end
+          end
+        end
+      end
+      #print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
+    rescue => ex
+      # does not happen, just in case
+      #print_error "An error occured while searching for files to upload: #{ex}"
+      raise ex
+    ensure
+      Dir.chdir(original_working_dir)
+    end
+      
+    # make sure we have something to upload.
+    if deploy_files.empty?
+      raise_command_error "0 files found for: #{file_patterns.join(', ')}"
+    else
+      unless options[:quiet]
+        print cyan, "Found #{deploy_files.size} Files to Upload!", reset, "\n"
+      end
+    end
+
+    # support uploading a local file to a custom destination
+    # this only works for a single file right now, should be better
+    # could try to add destination + filename
+    # for now expect filename to be included in destination
+    if options[:destination]
+      if deploy_files.size == 1
+        deploy_files[0][:destination] = options[:destination]
       else
-        # raise_command_error "deployment not found for '#{id}'"
-        return 1, "deployment version not found for '#{id}'"
+        raise_command_error "--destination can only specified for a single file upload, not #{deploy_files} files.", args, optparse
       end
     end
+
+    confirm_message = "Are you sure you want to upload #{deploy_files.size} files to deployment #{deployment['name']} #{format_deployment_version_number(deployment_version)}?"
+    if deploy_files.size == 1
+      confirm_message = "Are you sure you want to upload file #{deploy_files[0][:destination]} to deployment #{deployment['name']} #{format_deployment_version_number(deployment_version)}?"
+    end
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm(confirm_message)
+      return 9, "aborted command"
+    end
+
+    @deployments_interface.setopts(options)
+
+    # Upload Files
+    if deploy_files && !deploy_files.empty?
+      print "\n",cyan, "Uploading #{deploy_files.size} Files...", reset, "\n" if !options[:quiet]
+      deploy_files.each do |f|
+        destination = f[:destination]
+        if options[:dry_run]
+          print_dry_run @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
+        else
+          print cyan,"  - Uploading #{f[:destination]} ...", reset if !options[:quiet]
+          upload_result = @deployments_interface.upload_file(deployment['id'], deployment_version['id'], f[:filepath], f[:destination])
+          #print green + "SUCCESS" + reset + "\n" if !options[:quiet]
+          print reset, "\n" if !options[:quiet]
+        end
+      end
+      if options[:dry_run]
+        return 0, nil
+      end
+      #print cyan, "Upload Complete!", reset, "\n" if !options[:quiet]
+      if options[:quiet]
+        return 0, nil
+      else
+        print_green_success "Upload Complete!"
+        return get_version([deployment["id"], deployment_version['id']] + (options[:remote] ? ["-r",options[:remote]] : []))
+      end
+    else
+      raise_command_error "No files to upload!"
+    end
+  end
+
+  def remove_file(args)
+    options = {}
+    params = {}
+    optparse = Morpheus::Cli::OptionParser.new do |opts|
+      opts.banner = subcommand_usage("[deployment] [version] [file] [options]")
+      opts.on( '-R', '--recursive', "Delete a directory and all of its files. This must be passed if specifying a directory." ) do
+        # do_recursive = true
+        params['force'] = true
+      end
+      opts.on( '-f', '--force', "Force delete, this will do a recursive delete of directories." ) do
+        params['force'] = true
+      end
+      build_standard_remove_options(opts, options)
+      opts.footer = <<-EOT
+Delete a deployment file.
+[deployment] is required. This is the name or id of a deployment.
+[version] is required. This is the version identifier of a deployment version.
+[file] is required. This is the name of the file to be deleted.
+EOT
+    end
+    optparse.parse!(args)
+    verify_args!(args:args, optparse:optparse, min:2, max:3)
+    connect(options)
+    deployment = find_deployment_by_name_or_id(args[0])
+    return 1, "deployment not found" if deployment.nil?
+    id = args[1]
+    deployment_version = find_deployment_version_by_name_or_id(deployment['id'], id)
+    return 1, "version not found" if deployment_version.nil?
+    # could look it up here, or allow a directory instead of a single file
+    filename = args[2]
+    if filename.nil?
+      #raise_command_error "Files not specified. Please specify files array, each item may specify a path or pattern of file(s) to upload", args, optparse
+      filename = Morpheus::Cli::OptionTypes.prompt([{'fieldName' => 'file', 'fieldLabel' => 'Files', 'type' => 'text', 'required' => true, 'description' => 'Files or directories to upload'}], options[:options])['file'].to_s #.split(",").collect {|it| it.to_s.strip }.select { |it| it != "" }
+    end
+    unless options[:yes] || Morpheus::Cli::OptionTypes.confirm("Are you sure you want to delete the file #{filename}?")
+      return 9, "aborted command"
+    end
     @deployments_interface.setopts(options)
     if options[:dry_run]
-      print_dry_run @deployments_interface.dry.destroy(deployment['id'], params)
+      print_dry_run @deployments_interface.dry.destroy_file(deployment['id'], deployment_version['id'], filename, params)
       return
     end
-    json_response = @deployments_interface.destroy(deployment['id'], params)
+    json_response = @deployments_interface.destroy_file(deployment['id'], deployment_version['id'], filename, params)
     render_response(json_response, options) do
-      print_green_success "Removed deployment version #{deployment_version['userVersion']}"
+      print_green_success "Removed deployment file #{filename}"
     end
     return 0, nil
   end
@@ -557,7 +856,7 @@ EOT
   def deployment_version_column_definitions
     {
       "ID" => 'id',
-      "Version" => 'userVersion',
+      "Version" => lambda {|it| format_deployment_version_number(it) },
       "Deploy Type" => lambda {|it| it['deployType'] },
       "URL" => lambda {|it| 
         if it['deployType'] == 'fetch'
@@ -607,4 +906,18 @@ EOT
     }
   end
 
+  # Deployment Files
+
+  def deployment_file_column_definitions
+    {
+      #"ID" => 'id',
+      "Name" => 'name',
+      "Type" => lambda {|it| (it['directory'] || it['isDirectory']) ? "directory" : (it["contentType"] || "file") },
+      "Size" => lambda {|it| (it['directory'] || it['isDirectory']) ? "" : format_bytes_short(it['contentLength']) },
+      #"Content Type" => lambda {|it| it['contentType'] },
+      # "Created" => lambda {|it| format_local_dt(it['dateCreated']) },
+      # "Updated" => lambda {|it| format_local_dt(it['lastUpdated']) },
+    }
+  end
+
 end