rhc 1.13.6 → 1.14.7

data/features/env.feature

@@ -0,0 +1,35 @@
+@env_var @domain_required
+Feature: Environment Variables Operations
+
+#  @init
+#  Scenario: Application Creation
+#    When a php application is created
+#    Then the application should be accessible
+
+  Scenario: Environment variable is set
+    Given a php application is created
+    And the application should be accessible
+    When a new environment variable "FOO" is set as "BAR"
+    And the existing environment variables are listed
+    Then the output environment variables include "FOO=BAR"
+
+  Scenario: Environment variables are set
+    Given a php application is created
+    And the application should be accessible
+    When a new environment variable "FOO" is set as "BAR"
+    And a new environment variable "FOO2" is set as "BAR2"
+    And the existing environment variables are listed
+    Then the output environment variables include "FOO=BAR"
+    And the output environment variables include "FOO2=BAR2"
+
+  Scenario: Environment variable is unset
+    Given a php application is created
+    And the application should be accessible
+    When a new environment variable "FOO" is set as "BAR"
+    And the existing environment variables are listed
+    Then the output environment variables include "FOO=BAR"
+    When an existing environment variable with name "FOO" is unset
+    Then the output environment variables do not include "FOO=BAR"
+
+  # Scenario: Create app with environment variable
+  # Scenario: add cartridge with environment variable

data/features/lib/rhc_helper.rb

@@ -18,3 +18,4 @@ require 'rhc_helper/runnable'
 require 'rhc_helper/app'
 require 'rhc_helper/domain'
 require 'rhc_helper/sshkey'
+require 'rhc_helper/env'

data/features/lib/rhc_helper/commandify.rb

@@ -93,6 +93,8 @@ module RHCHelper
           # in RHCHelper::Sshkey, we pass *args to method_missing here, so that
           # we _know_ that arg0 is an Array.
           args << arg0.first if arg0.first
+        when /env/
+          args << arg0.first if arg0.first
       end
 
       args.rstrip.gsub(/([\\\$])/, "\\\\\\1")
@@ -187,7 +189,7 @@ module RHCHelper
   def domain_create_callback(exitcode, stdout, stderr, arg)
     @exitcode = exitcode
   end
-  
+
   def domain_update_callback(exitcode, stdout, stderr, arg)
     @exitcode = exitcode
   end
@@ -200,7 +202,7 @@ module RHCHelper
     @sshkey_output = stdout
     @exitcode = exitcode
   end
-  
+
   def sshkey_add_callback(exitcode, stdout, stderr, arg)
     @sshkey_output = stdout
     @exitcode = exitcode
@@ -215,7 +217,7 @@ module RHCHelper
     @sshkey_output = stdout
     @exitcode = exitcode
   end
-  
+
   def sshkey_update_callback(exitcode, stdout, stderr, arg)
     @sshkey_output = stdout
     @exitcode = exitcode
@@ -226,4 +228,24 @@ module RHCHelper
     @exitcode = exitcode
   end
 
+  def env_list_callback(exitcode, stdout, stderr, arg)
+    @env_output = stdout
+    @exitcode = exitcode
+  end
+
+  def env_show_callback(exitcode, stdout, stderr, arg)
+    @env_output = stdout
+    @exitcode = exitcode
+  end
+
+  def env_set_callback(exitcode, stdout, stderr, arg)
+    @env_output = stdout
+    @exitcode = exitcode
+  end
+
+  def env_unset_callback(exitcode, stdout, stderr, arg)
+    @env_output = stdout
+    @exitcode = exitcode
+  end
+
 end

data/features/lib/rhc_helper/env.rb

@@ -0,0 +1,29 @@
+require "rhc/rest"
+
+module RHCHelper
+
+  class Env
+    extend Runnable
+    extend Commandify
+
+    class << self
+      attr_accessor :env_output, :exitcode
+    end
+
+    def self.list(*args)
+      rhc_env_list args
+    end
+
+    def self.show(*args)
+      rhc_env_show args
+    end
+
+    def self.set(*args)
+      rhc_env_set args
+    end
+
+    def self.unset(*args)
+      rhc_env_unset args
+    end
+  end
+end

data/features/step_definitions/env_steps.rb

@@ -1 +1,32 @@
 include RHCHelper
+
+When /^'rhc env (\S+)( .*?)?'(?: command)? is run$/ do |subcommand, rest|
+  if subcommand =~ /^(list|show|set|unset)$/
+    Env.send subcommand.to_sym, rest
+    @env_output = Env.env_output
+    @exitcode = Env.exitcode
+  end
+end
+
+When /^a new environment variable "(.*?)" is set as "(.*)"$/ do |name, value|
+  pending "no application provided"  if @app == nil
+  step "'rhc env set --env #{name}=#{value} --app #{@app.name}' is run"
+end
+
+When /^an existing environment variable with name "(.*?)" is unset$/ do |name|
+  pending "no application provided"  if @app == nil
+  step "'rhc env unset --env #{name} --app #{@app.name}' is run"
+end
+
+Given "the existing environment variables are listed" do
+  pending "no application provided"  if @app == nil
+  step "'rhc env list --app #{@app.name}' is run"
+end
+
+Then /^the output environment variables (do not )?include "(.*)"$/ do |exclude, str|
+  if exclude
+    @env_output.should_not match(str)
+  else
+    @env_output.should match(str)
+  end
+end

data/features/support/platform_support.rb

@@ -1,18 +1,8 @@
-if $target_os == 'fedora-18'
-  CARTRIDGE_MAP = {
-    "php"         => { type: "php-5.4", name: "PHP 5.4" },
-    "mysql"       => { type: "mysql-5.1", name: "MySQL Database 5.1" },
-    "phpmyadmin"  => { type: "phpmyadmin-3", name: "phpMyAdmin 3" },
-    "mongodb"     => { type: "mongodb-2.2", name: "MongoDB NoSQL Database 2.2" },
-    "postgresql"  => { type: "postgresql-9.2", name: "PostgreSQL Database 9.2" },
-    "cron"        => { type: "cron-1.4", name: "Cron 1.4" },
-    "haproxy"     => { type: "haproxy-1.4", name: "" }
-  }
-elsif $target_os == 'fedora-19'
+if $target_os == 'fedora-19'
   CARTRIDGE_MAP = {
       "php"         => { type: "php-5.5", name: "PHP 5.5" },
       "mysql"       => { type: "mariadb-5.5", name: "MariaDB 5.5" },
-      "phpmyadmin"  => { type: "phpmyadmin-3", name: "phpMyAdmin 3" },
+      "phpmyadmin"  => { type: "phpmyadmin-4", name: "phpMyAdmin 4.0" },
       "mongodb"     => { type: "mongodb-2.2", name: "MongoDB NoSQL Database 2.2" },
       "postgresql"  => { type: "postgresql-9.2", name: "PostgreSQL Database 9.2" },
       "cron"        => { type: "cron-1.4", name: "Cron 1.4" },
@@ -22,7 +12,7 @@ else
   CARTRIDGE_MAP = {
     "php"         => { type: "php-5.3", name: "PHP 5.3" },
     "mysql"       => { type: "mysql-5.1", name: "MySQL Database 5.1" },
-    "phpmyadmin"  => { type: "phpmyadmin-3", name: "phpMyAdmin 3" },
+    "phpmyadmin"  => { type: "phpmyadmin-4", name: "phpMyAdmin 4.0" },
     "mongodb"     => { type: "mongodb-2.2", name: "MongoDB NoSQL Database 2.2" },
     "postgresql"  => { type: "postgresql-8.4", name: "PostgreSQL Database 8.4" },
     "cron"        => { type: "cron-1.4", name: "Cron 1.4" },

data/lib/rhc/cartridge_helpers.rb

@@ -47,9 +47,11 @@ module RHC
         search = search.to_s.downcase.gsub(/[_\-\s]/,' ')
         [
            cart.name,
-           cart.description,
           (cart.tags || []).join(' '),
-        ].compact.any?{ |s| s.present? && s.downcase.gsub(/[_\-\s]/,' ').include?(search) }
+        ].compact.any?{ |s| s.present? && s.downcase.gsub(/[_\-\s]/,' ').include?(search) } || 
+        search.length > 2 && [
+          cart.description
+        ].compact.any?{ |s| s.present? && !s.downcase.match(/\b#{search}\b/).nil? }
       end
 
       def web_carts_only

data/lib/rhc/commands.rb

@@ -21,11 +21,15 @@ module Commander
       proxy_options.inject Options.new do |options, (option, value)|
         # options that are present will evaluate to true
         value = true if value.nil?
+        # if multiple values were specified for this option, collect it as an
+        # array. on 'fill_arguments' we will decide between stick with the array
+        # (if :option_type => :list) or just take the last value from array.
+        # not part of the backported method.
         if proxy_options.select{ |item| item[0] == option }.length > 1
           if options[option]
             options[option] << value
           else
-          options.__send__ :"#{option}=", [value]
+            options.__send__ :"#{option}=", [value]
           end
         else
           options.__send__ :"#{option}=", value

data/lib/rhc/commands/app.rb

@@ -30,13 +30,13 @@ module RHC::Commands
       these cartridges receive no security updates.  Note that not
       all OpenShift servers allow downloaded cartridges.
 
-      When your application is created, a domain name that is a combination
-      of the name of your app and the namespace of your domain will be
-      registered in DNS.  A copy of the code for your application
-      will be checked out locally into a folder with the same name as
-      your application.  Note that different types of applications may
-      require different structures - check the README provided with the
-      cartridge if you have questions.
+      When your application is created, a URL combining the name of
+      your app and the name of your domain will be registered in DNS.
+      A copy of the code for your application will be checked out locally
+      into a folder with the same name as your application.  Note that
+      different types of applications may require different folder
+      structures - check the README provided with the cartridge if
+      you have questions.
 
       OpenShift runs the components of your application on small virtual
       servers called "gears".  Each account or plan is limited to a number
@@ -47,7 +47,7 @@ module RHC::Commands
       may be specified to change the gears used.
 
       DESC
-    syntax "<name> <cartridge> [... <cartridge>] [-n namespace]"
+    syntax "<name> <cartridge> [... <cartridge>] [... VARIABLE=VALUE] [-n namespace]"
     option ["-n", "--namespace NAME"], "Namespace for the application"
     option ["-g", "--gear-size SIZE"], "Gear size controls how much memory and CPU your cartridges can use."
     option ["-s", "--scaling"], "Enable scaling for the web cartridge."
@@ -66,6 +66,8 @@ module RHC::Commands
 
       check_name!(name)
 
+      arg_envs, cartridges = cartridges.partition{|item| item.match(env_var_regex_pattern)}
+
       cartridges = check_cartridges(cartridges, &require_one_web_cart)
 
       options.default \
@@ -82,7 +84,11 @@ module RHC::Commands
         c.usage_rate? ? "#{c.short_name} (addtl. costs may apply)" : c.short_name
       end.join(', ')
 
-      environment_variables = collect_env_vars(options.env)
+      if rest_domain.supports_add_application_with_env_vars?
+        environment_variables = collect_env_vars(arg_envs.concat(Array(options.env)))
+      else
+        warn "Server does not support environment variables."
+      end
 
       paragraph do
         header "Application Options"
@@ -182,8 +188,7 @@ module RHC::Commands
                 ['URL:', rest_app.app_url],
                 ['SSH to:', rest_app.ssh_string],
                 ['Git remote:', rest_app.git_url],
-                (['Cloned to:', repo_dir] if repo_dir),
-                (['Environment variables:', environment_variables.map{|item| "#{item.name}=#{item.value}"}.sort.join(', ')] if environment_variables.present?)
+                (['Cloned to:', repo_dir] if repo_dir)
               ].compact
           end
         end
@@ -220,7 +225,7 @@ module RHC::Commands
     summary "Start the application"
     syntax "<app> [--namespace NAME] [--app NAME]"
     argument :app, "The name of the application you are starting", ["-a", "--app NAME"], :context => :app_context
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
     def start(app)
       app_action app, :start
 
@@ -231,7 +236,7 @@ module RHC::Commands
     summary "Stop the application"
     syntax "<app> [--namespace NAME] [--app NAME]"
     argument :app, "The name of the application you are stopping", ["-a", "--app NAME"], :context => :app_context
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
     def stop(app)
       app_action app, :stop
 
@@ -242,7 +247,7 @@ module RHC::Commands
     summary "Stops all application processes"
     syntax "<app> [--namespace NAME] [--app NAME]"
     argument :app, "The name of the application you are stopping", ["-a", "--app NAME"], :context => :app_context
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
     def force_stop(app)
       app_action app, :stop, true
 
@@ -253,7 +258,7 @@ module RHC::Commands
     summary "Restart the application"
     syntax "<app> [--namespace NAME] [--app NAME]"
     argument :app, "The name of the application you are restarting", ["-a", "--app NAME"], :context => :app_context
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
     def restart(app)
       app_action app, :restart
 
@@ -264,7 +269,7 @@ module RHC::Commands
     summary "Reload the application's configuration"
     syntax "<app> [--namespace NAME] [--app NAME]"
     argument :app, "The name of the application you are reloading", ["-a", "--app NAME"], :context => :app_context
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
     def reload(app)
       app_action app, :reload
 
@@ -305,7 +310,7 @@ module RHC::Commands
       DESC
     syntax "<app> [--namespace NAME]"
     argument :app, "The name of the application you are getting information on", ["-a", "--app NAME"], :context => :app_context
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
     option ["--state"], "Get the current state of the cartridges in this application"
     option ["--gears [quota|ssh]"], "Show information about the cartridges on each gear in this application. Pass 'quota' to see per gear disk usage and limits. Pass 'ssh' to print only the SSH connection strings of each gear."
     def show(app_name)
@@ -368,6 +373,9 @@ module RHC::Commands
       include RHC::CartridgeHelpers
       include RHC::SSHHelpers
 
+      MAX_RETRIES = 7
+      DEFAULT_DELAY_THROTTLE = 2.0
+
       def require_one_web_cart
         lambda{ |carts|
           match, ambiguous = carts.partition{ |c| not c.is_a?(Array) }

data/lib/rhc/commands/cartridge.rb

@@ -69,7 +69,7 @@ module RHC::Commands
 
     summary "Add a cartridge to your application"
     syntax "<cartridge_type> [--namespace NAME] [--app NAME]"
-    option ["-n", "--namespace NAME"], "Namespace of the application you are adding the cartridge to", :context => :namespace_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
     option ["-a", "--app NAME"], "Application you are adding the cartridge to", :context => :app_context, :required => true
     option ["-e", "--env VARIABLE=VALUE"], "Environment variable(s) to be set on this cartridge, or path to a file containing environment variables", :option_type => :list
     argument :cart_type, "The type of the cartridge you are adding (run 'rhc cartridge list' to obtain a list of available cartridges)", ["-c", "--cartridge cart_type"]
@@ -83,7 +83,8 @@ module RHC::Commands
 
       rest_app = rest_client.find_application(options.namespace, options.app, :include => :cartridges)
 
-      cart.environment_variables = collect_env_vars(options.env).map { |item| item.to_hash } if options.env
+      supports_env_vars = rest_app.supports_add_cartridge_with_env_vars?
+      cart.environment_variables = collect_env_vars(options.env).map { |item| item.to_hash } if options.env && supports_env_vars
 
       rest_cartridge = rest_app.add_cartridge(cart)
 
@@ -92,7 +93,8 @@ module RHC::Commands
       rest_cartridge.environment_variables = cart.environment_variables if cart.environment_variables.present?
 
       paragraph{ display_cart(rest_cartridge) }
-      paragraph{ say "Use 'rhc env --help' to manage environment variable(s) on this cartridge and application." }
+      paragraph{ say "Use 'rhc env --help' to manage environment variable(s) on this cartridge and application." } if cart.environment_variables.present?
+      paragraph{ warn "Server does not support environment variables." if options.env && !supports_env_vars  }
       paragraph{ rest_cartridge.messages.each { |msg| success msg } }
 
       0
@@ -100,8 +102,8 @@ module RHC::Commands
 
     summary "Show useful information about a cartridge"
     syntax "<cartridge> [--namespace NAME] [--app NAME]"
-    option ["-n", "--namespace NAME"], "Namespace of the application you are adding the cartridge to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application you are adding the cartridge to", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     argument :cartridge, "The name of the cartridge", ["-c", "--cartridge cart_type"]
     def show(cartridge)
       rest_app = rest_client.find_application(options.namespace, options.app, :include => :cartridges)
@@ -115,8 +117,8 @@ module RHC::Commands
     summary "Remove a cartridge from your application"
     syntax "<cartridge> [--namespace NAME] [--app NAME]"
     argument :cartridge, "The name of the cartridge you are removing", ["-c", "--cartridge cartridge"]
-    option ["-n", "--namespace NAME"], "Namespace of the application you are removing the cartridge from", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application you are removing the cartridge from", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     option ["--confirm"], "Pass to confirm removing the cartridge"
     alias_action :"app cartridge remove", :root_command => true, :deprecated => true
     def remove(cartridge)
@@ -137,8 +139,8 @@ module RHC::Commands
     summary "Start a cartridge"
     syntax "<cartridge> [--namespace NAME] [--app NAME]"
     argument :cart_type, "The name of the cartridge you are stopping", ["-c", "--cartridge cartridge"]
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application the cartridge", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     alias_action :"app cartridge start", :root_command => true, :deprecated => true
     def start(cartridge)
       cartridge_action(cartridge, :start, 'Starting %s ... ')
@@ -148,8 +150,8 @@ module RHC::Commands
     summary "Stop a cartridge"
     syntax "<cartridge> [--namespace NAME] [--app NAME]"
     argument :cart_type, "The name of the cartridge you are stopping", ["-c", "--cartridge cartridge"]
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     alias_action :"app cartridge stop", :root_command => true, :deprecated => true
     def stop(cartridge)
       cartridge_action(cartridge, :stop, 'Stopping %s ... ')
@@ -159,8 +161,8 @@ module RHC::Commands
     summary "Restart a cartridge"
     syntax "<cartridge_type> [--namespace NAME] [--app NAME]"
     argument :cart_type, "The name of the cartridge you are restarting", ["-c", "--cartridge cartridge"]
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     alias_action :"app cartridge restart", :root_command => true, :deprecated => true
     def restart(cartridge)
       cartridge_action(cartridge, :restart, 'Restarting %s ... ')
@@ -170,8 +172,8 @@ module RHC::Commands
     summary "Get current the status of a cartridge"
     syntax "<cartridge> [--namespace NAME] [--app NAME]"
     argument :cart_type, "The name of the cartridge you are getting the status of", ["-c", "--cartridge cartridge"]
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     alias_action :"app cartridge status", :root_command => true, :deprecated => true
     def status(cartridge)
       rest_app = rest_client.find_application(options.namespace, options.app, :include => :cartridges)
@@ -183,8 +185,8 @@ module RHC::Commands
     summary "Reload the cartridge's configuration"
     syntax "<cartridge> [--namespace NAME] [--app NAME]"
     argument :cart_type, "The name of the cartridge you are reloading", ["-c", "--cartridge cartridge"]
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     alias_action :"app cartridge reload", :root_command => true, :deprecated => true
     def reload(cartridge)
       cartridge_action(cartridge, :reload, 'Reloading %s ... ')
@@ -208,8 +210,8 @@ module RHC::Commands
     syntax "<cartridge> [multiplier] [--namespace NAME] [--app NAME] [--min min] [--max max]"
     argument :cartridge, "The name of the cartridge you are scaling", ["-c", "--cartridge cartridge"]
     argument :multiplier, "The number of instances of this cartridge you need", [], :optional => true, :hide => true
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     option ["--min min", Integer], "Minimum scaling value"
     option ["--max max", Integer], "Maximum scaling value"
     def scale(cartridge, multiplier)
@@ -243,8 +245,8 @@ module RHC::Commands
     summary 'View/manipulate storage on a cartridge'
     syntax '<cartridge> -a app [--show] [--add|--remove|--set amount] [--namespace NAME]'
     argument :cart_type, "The name of the cartridge", ["-c", "--cartridge cart_type"], :arg_type => :list
-    option ["-n", "--namespace NAME"], "Namespace of the application the cartridge belongs to", :context => :namespace_context, :required => true
-    option ["-a", "--app NAME"], "Application the cartridge belongs to", :context => :app_context, :required => true
+    option ["-n", "--namespace NAME"], "Application's domain name", :context => :namespace_context, :required => true
+    option ["-a", "--app NAME"], "Application name", :context => :app_context, :required => true
     option ["--show"], "Show the current base and additional storage capacity"
     option ["--add amount"], "Add the indicated amount to the additional storage capacity"
     option ["--remove amount"], "Remove the indicated amount from the additional storage capacity"