convox_installer 2.0.0 → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9b7140386f111c59db16b8db7429b2fb3a5c1a48372a2559e2e2c5499d59dd2
-  data.tar.gz: 6e94e2c459c01426f8b6d2adc7d232f630e9711722947d2899b20ea509089c47
+  metadata.gz: c08b32666153594de1c3464ab4c8ea4f324952115facc72fc159d75de7d1a85e
+  data.tar.gz: 2f162d039ab30ebea6ecd8086bc88b30da9c50234c614594c43725036f75f2cb
 SHA512:
-  metadata.gz: 64741ea4bd8a4e03d30172d366976e7d18c99cd2dff1f27ceaf5106d86de56c46fc0302fed774669f5a513d3b5cd8212b3b94e54687a539b235e545b3a9c90cb
-  data.tar.gz: 67966065258259f0b64c7572895ee884f4e34c55e4f9c1ddbff90cf431e8da78984706955b406655d8f0128f4edd21842559129aa5b7dde73a745a121ad44ce1
+  metadata.gz: cdaf7159e5bebdde39ffed648fab4be85c5d2a556818b30ec8587ba52e920de44c09434edd654e894501ecb8a68c756c1c64e9de8939412d320dc753ab156163
+  data.tar.gz: 219b697d883f91bd173e214402af2d3f5ec988881a025e894f4e3aafef1970af61a1bb2905b886fac437788a18812f9dbbc1e6307aa2d80f1997fdc0d800f0be

data/.rubocop.yml

@@ -8,7 +8,7 @@ Style/MixinUsage:
   Exclude:
     - examples/**/*
 
-Metrics/LineLength:
+Layout/LineLength:
   Max: 100
 
 Style/StringLiterals:

data/.vscode/settings.json

@@ -1,4 +1,5 @@
 {
-  "editor.formatOnSave": false,
-  "editor.formatOnSaveTimeout": 5000
+  "editor.formatOnSave": true,
+  "editor.formatOnSaveTimeout": 5000,
+  "ruby.rubocop.executePath": "/usr/local/bin/rubocop-daemon-wrapper/"
 }

data/Gemfile

@@ -9,6 +9,7 @@ group :test do
   gem 'pry-byebug', require: false
   gem 'rspec'
   gem 'rubocop'
+  gem 'rubocop-daemon'
   gem 'rubocop-rspec'
   gem 'vcr'
   gem 'webmock'

data/README.md

@@ -1,10 +1,22 @@
 # Convox Installer
 
-A Ruby gem that makes it easier to build a Convox installation script. This is like Chef/Ansible/Terraform for your initial Convox setup.
+A Ruby gem that makes it easier to build a Convox installation script. The main purpose of this gem is to make it easier to set up on-premise installations of your app for enterprise users.
 
-# Requirements: Convox v2
+This gem provides a DSL so that you can write a script that walks your users through setting up Convox and getting your app and running, setting up S3 buckets, etc.
+
+## Requirements
+
+- MacOS
+- Convox v3 CLI
+
+_Please let us know if you need to run this script on Linux. Linux support should not be too difficult to implement, but unfortunately we probably won't be able to support Windows._
+
+### Requires Convox >= 3
+
+This version of `convox_installer` is only designed to work with Convox 3 and later. You can run `convox version` to check your version. Please install the Convox v3 CLI by following the instructions here: https://docs.convox.com/getting-started/introduction/
+
+_If you want to set up a Convox v2 rack (deprecated), the last version of `convox_installer` that supports the v2 CLI is `1.0.9`. (Take a look at [the `convox2` branch](https://github.com/DocSpring/convox_installer/tree/convox2).)_
 
-This version of `convox_installer` is only designed to work with Convox v2. Please install the v2 CLI by following the instructions at their old documentation site: https://docsv2.convox.com/introduction/installation
 ## USE AT YOUR OWN RISK! THIS CODE IS PROVIDED WITHOUT ANY WARRANTIES OR GUARANTEES
 
 We have successfully set up a number of test and production deployments using this gem. Everything seems to work very well. The library also facilitates idempotency and crash-resistance, so you can easily re-run your installation script if something goes wrong. However, if anything goes wrong, then you can end up with a large AWS bill if you're not careful. If anything crashes then make sure you double-check everything in your AWS account and shut down any leftover resources. **USE THIS SOFTWARE AT YOUR OWN RISK.**
@@ -14,10 +26,12 @@ We have successfully set up a number of test and production deployments using th
 - Idempotent. If this script crashes, you can restart it and it will pick up
   where it left off. Every step looks up the existing state, and only makes a change
   if things are not yet set up (or out of sync).
-- Ensures that the `convox` and `aws` CLI tools are installed
+- Ensures that the `convox` and `terraform` CLI tools are installed
 - Wraps the `convox` CLI and parses JSON output from API calls
-- Add n Docker Repository (e.g. ECR registry)
+- Add a Docker Repository (e.g. ECR registry)
 - Set up an S3 bucket with an optional CORS policy
+- Set up an RDS database (Postgres)
+- Set up an Elasticache cluster (Redis)
 
 ## Introduction
 
@@ -25,7 +39,7 @@ We have successfully set up a number of test and production deployments using th
 
 `convox_installer` is a Ruby gem that makes it much easier to build an installation script for `convox/rack` (the open source PaaS). The Convox CLI is awesome, but it's missing a nice way to script a full deployment. I originally wrote a bash script that made API calls and used [`jq`](https://stedolan.github.io/jq/) and `sed`, but this was very error-prone and it did not have good cross-platform support.
 
-I've rewritten this installation script in Ruby, which provides very good cross-platform support, and also allows me to write tests.
+I've written this installation script in Ruby, which provides very good cross-platform support, and also allows me to write tests.
 
 ## Usage
 
@@ -37,7 +51,7 @@ require 'bundler/inline'
 
 gemfile do
   source 'https://rubygems.org'
-  gem 'convox_installer'
+  gem 'convox_installer', '3.0.0'
 end
 
 require "convox_installer"
@@ -134,17 +148,13 @@ Shows a heading and optional details.
 
 #### `ensure_requirements!`
 
-Makes sure that the `convox` and `aws` CLI tools are installed on this system. If not, shows installation instructions and exits.
+Makes sure that the `convox` and `terraform` CLI tools are installed on this system. If not, shows installation instructions and exits.
 
 #### `prompt_for_config`
 
 Loads config from ENV vars, or from saved config at `./.installer_config.json`.
 If any config settings are missing, it prompts the user for input. Finally, it shows a summary of the config, and asks the user if they want to proceed with the installation. If the user enters `y` (or `yes`), the `prompt_for_config` method completes. If they enter `n` (or `no`), we loop over every setting and let them press "enter" to keep the current value, or provide a new value to correct any mistakes.
 
-#### `backup_convox_host_and_rack`
-
-If there are any existing files at `~/.convox/host` or `~/.convox/rack`, this method moves these to `~/.convox/host.bak` and `~/.convox/rack.bak`.
-
 #### `install_convox`
 
 - **Required Config:** `aws_region`, `aws_access_key_id`, `aws_secret_access_key`,
@@ -152,13 +162,13 @@ If there are any existing files at `~/.convox/host` or `~/.convox/rack`, this me
 
 Runs `convox rack install ...`. Has some validations to ensure that all required settings are present.
 
-#### `validate_convox_auth_and_write_host!`
+#### `validate_convox_rack_and_write_current!`
 
-After running `install_convox`, call this method to ensure that the the `~/.convox/auth` file has been updated with the correct details (checks the rack name and AWS region.) Then it sets the rack host in `~/.convox/host` (if not already set.)
+Ensures that the local machine contains a directory for the rack's terraform config, and sets the current rack for Convox CLI commands.
 
-#### `validate_convox_rack!`
+#### `validate_convox_rack_api!`
 
-Calls `convox api get /system` to get the Rack details, then makes sure that everything is correct.
+Makes an API request (`convox api get /system`) to get the rack details, and makes sure that everything is correct.
 
 #### `convox_rack_data`
 
@@ -174,10 +184,14 @@ Checks if the app already exists. If not, calls `convox apps create ... --wait`
 
 Writes the app name into `./.convox/app` (in the current directory.) The `convox` CLI reads this file, so you don't need to specify the `--app` flag for future commands.
 
-#### `create_s3_bucket!`
+#### `add_s3_bucket`
+
+Adds an S3 bucket to your Terraform config.
 
 - **Required Config:** `s3_bucket_name`
 
+NOTE: This method just writes a new Terraform configuration file. You must run `apply_terraform_update!` to apply the changes and create the S3 bucket.
+
 Creates an S3 bucket from the `:s3_bucket_name` config setting. This is not a default setting, so you can add something like this to your custom `@prompts`:
 
 ```ruby
@@ -190,41 +204,94 @@ Creates an S3 bucket from the `:s3_bucket_name` config setting. This is not a de
 
 The `:value` `Proc` will generate a bucket name with a random suffix. (Avoids conflicts when you are setting up multiple deployments for your app.)
 
-`create_s3_bucket!` will also call `set_s3_bucket_cors_policy` automatically, so you don't need to call this manually.
-
-#### `set_s3_bucket_cors_policy`
+You can also set a CORS policy for your S3 bucket. (`:s3_bucket_name`)
+We set the `cors_rule` option for the `aws_s3_bucket` resource in the Terraform configuration. Example:
 
-- **Required Config:** `s3_bucket_name`
+```
+   cors_rule {
+    allowed_headers = ["*"]
+    allowed_methods = ["PUT", "POST"]
+    allowed_origins = ["https://s3-website-test.hashicorp.com"]
+    expose_headers  = ["ETag"]
+    max_age_seconds = 3000
+  }
+```
 
-Set up a CORS policy for your S3 bucket. (`:s3_bucket_name`)
+See: https://registry.terraform.io/providers/hashicorp/aws/3.33.0/docs/resources/s3_bucket#using-cors
 
-_Note: If the `:s3_bucket_cors_policy` setting is not provided, then this method does nothing._
+_Note: If the `:s3_bucket_cors_rule` setting is not provided, then it is skipped._
 
-You should set `:s3_bucket_cors_policy` to a JSON string. Here's how I set this up in my own `install.rb` script:
+Here's how we set up a CORS policy in our own `install.rb` script:
 
 ```ruby
-S3_BUCKET_CORS_POLICY = <<-JSON
-{
-  "CORSRules": [
-    {
-      "AllowedOrigins": ["*"],
-      "AllowedHeaders": ["Authorization", "cache-control", "x-requested-with"],
-      "AllowedMethods": ["PUT", "POST", "GET"],
-      "MaxAgeSeconds": 3000
-    }
-  ]
-}
-JSON
+xxxxc = <<-TERRAFORM
+  cors_rule {
+    allowed_headers = ["Authorization", "cache-control", "x-requested-with"]
+    allowed_methods = ["PUT", "POST", "GET"]
+    allowed_origins = ["*"]
+    expose_headers  = []
+    max_age_seconds = 3000
+  }
+TERRAFORM
 
 @prompts = [
   {
-    key: :s3_bucket_cors_policy,
-    value: S3_BUCKET_CORS_POLICY,
+    key: :s3_bucket_cors_rule,
+    value: S3_BUCKET_CORS_RULE,
     hidden: true,
   }
 ]
 ```
 
+#### `add_rds_database`
+
+Adds an RDS database to your Terraform config.
+
+- **Required Config:**
+  - `database_username`
+  - `database_password`
+- **Optional Config:**
+  - `database_allocated_storage` _(default: 30)_
+  - `database_engine` _(default: 'postgres')_
+  - `database_engine_version` _(default: '14.2')_
+  - `database_instance_class` _(default: 'db.t3.medium')_
+  - `database_multi_az` _(default: true)_
+
+#### `add_elasticache_cluster`
+
+Adds an Elasticache cluster to your Terraform config.
+
+- **Optional Config:**
+  - `engine` _(default: 'redis')_
+  - `engine_version` _(default: '6.x')_
+  - `node_type` _(default: 'cache.t3.medium')_
+  - `num_cache_nodes` _(default: 1)_
+  - `port` _(default: 6379)_
+
+#### `apply_terraform_update!`
+
+Runs `terraform apply -auto-approve` to apply any changes to your Terraform configuration (add new resources, etc.)
+
+#### `rds_details`
+
+Returns information about the created RDS database resource.
+
+```ruby
+{
+  postgres_url: "Full URL for the RDS database (including auth)",
+}
+```
+
+#### `elasticache_details`
+
+Returns information about the created RDS database resource.
+
+```ruby
+{
+  redis_url: "Full URL for the Redis cluster",
+}
+```
+
 #### `s3_bucket_details`
 
 - **Required Config:** `s3_bucket_name`
@@ -249,13 +316,14 @@ Checks the list of registries to see if `docker_registry_url` has already been a
 
 #### `default_service_domain_name`
 
-- **Required Config:** `convox_app_name`, `default_service`
+- **Required Config:** `convox_app_name`
+- **Optional Config:** `default_service`
 
-Parses the rack router ELB name and region, and returns the default `convox.site` domain for your default service. (You can visit this URL in the browser to access your app.)
+Finds the default `*.convox.cloud` URL for the web service. (You can visit this URL in the browser to access your app.)
 
-Example: `myapp-web.rackname-route-abcdfe123456-123456789.us-west-2.convox.site`
+Example: `web.docspring.dc6bae48c2e36366.convox.cloud`
 
-Set a default service in your config prompts (e.g. `web`):
+You can override the default service name in your config (e.g. `web`):
 
 ```ruby
 @prompts = [

data/examples/full_installation.rb

@@ -9,6 +9,7 @@
 #   gem "convox_installer"
 # end
 
+require 'English'
 $LOAD_PATH << File.expand_path('../lib', __dir__)
 require 'pry-byebug'
 
@@ -20,18 +21,15 @@ include ConvoxInstaller
 MINIMAL_HEALTH_CHECK_PATH = '/health/site'
 COMPLETE_HEALTH_CHECK_PATH = '/health'
 
-S3_BUCKET_CORS_POLICY = <<~JSON
-  {
-    "CORSRules": [
-      {
-        "AllowedOrigins": ["*"],
-        "AllowedHeaders": ["Authorization", "cache-control", "x-requested-with"],
-        "AllowedMethods": ["PUT", "POST", "GET"],
-        "MaxAgeSeconds": 3000
-      }
-    ]
+S3_BUCKET_CORS_RULE = <<-TERRAFORM
+  cors_rule {
+    allowed_headers = ["Authorization", "cache-control", "x-requested-with"]
+    allowed_methods = ["PUT", "POST", "GET"]
+    allowed_origins = ["*"]
+    expose_headers  = []
+    max_age_seconds = 3000
   }
-JSON
+TERRAFORM
 
 @prompts = ConvoxInstaller::Config::DEFAULT_PROMPTS + [
   {
@@ -81,8 +79,18 @@ JSON
     value: -> { "app-uploads-#{SecureRandom.hex(4)}" }
   },
   {
-    key: :s3_bucket_cors_policy,
-    value: S3_BUCKET_CORS_POLICY,
+    key: :s3_bucket_cors_rule,
+    value: S3_BUCKET_CORS_RULE,
+    hidden: true
+  },
+  {
+    key: :database_username,
+    value: 'example_app',
+    hidden: true
+  },
+  {
+    key: :database_password,
+    value: -> { SecureRandom.hex(16) },
     hidden: true
   }
 ]
@@ -92,54 +100,138 @@ config = prompt_for_config
 
 backup_convox_host_and_rack
 install_convox
-
-validate_convox_auth_and_write_host!
-validate_convox_rack!
+validate_convox_rack_and_write_current!
+validate_convox_rack_api!
 
 create_convox_app!
 set_default_app_for_directory!
 add_docker_registry!
-create_s3_bucket!
 
-puts '=> Generating secret keys for authentication sessions and encryption...'
-secret_key_base = SecureRandom.hex(64)
-data_encryption_key = SecureRandom.hex(32)
+add_s3_bucket
+add_rds_database
+add_elasticache_cluster
+
+apply_terraform_update!
+
+unless config[:sidekiq_cloudwatch_iam_credentials]
+  logger.info "Looking up IAM user for Sidekiq CloudWatch metrics (#{config.fetch(:sidekiq_cloudwatch_iam_username)})..."
 
-puts "======> Default domain: #{default_service_domain_name}"
-puts '        You can use this as a CNAME record after configuring a domain in convox.yml'
-puts '        (Note: SSL will be configured automatically.)'
+  aws_cli_credentials = "AWS_ACCESS_KEY_ID=#{config.fetch(:aws_access_key_id)} " \
+                        "AWS_SECRET_ACCESS_KEY=#{config.fetch(:aws_secret_access_key)}"
+  `#{aws_cli_credentials} aws iam get-user \
+    --user-name #{config.fetch(:sidekiq_cloudwatch_iam_username)} 2>/dev/null`
+  unless $CHILD_STATUS.success?
+    logger.info "Creating IAM user: #{config.fetch(:sidekiq_cloudwatch_iam_username)} with CloudWatchAgentServerPolicy..."
+    # IAM user needs the CloudWatchAgentServerPolicy policy
+    `#{aws_cli_credentials} aws iam create-user \
+      --user-name #{config.fetch(:sidekiq_cloudwatch_iam_username)}`
+    unless $CHILD_STATUS.success?
+      raise "Sorry, something went wrong while creating the #{config.fetch(:sidekiq_cloudwatch_iam_username)} IAM user!"
+    end
 
-puts '=> Setting environment variables to configure the application...'
+    logger.info 'Attaching CloudWatchAgentServerPolicy...'
+    `#{aws_cli_credentials} aws iam attach-user-policy \
+      --user-name #{config.fetch(:sidekiq_cloudwatch_iam_username)} \
+      --policy-arn arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy`
+    unless $CHILD_STATUS.success?
+      raise 'Sorry, something went wrong while attaching the CloudWatchAgentServerPolicy policy!'
+    end
+  end
+  logger.info "Creating IAM access token for #{config.fetch(:sidekiq_cloudwatch_iam_username)}..."
 
-env = {
-  'HEALTH_CHECK_PATH' => MINIMAL_HEALTH_CHECK_PATH,
-  'DOMAIN_NAME' => default_service_domain_name,
+  create_access_key_output_json = `#{aws_cli_credentials} aws iam create-access-key \
+      --user-name #{config.fetch(:sidekiq_cloudwatch_iam_username)}`
+  unless $CHILD_STATUS.success?
+    raise "Sorry, something went wrong while creating the access token for #{config.fetch(:sidekiq_cloudwatch_iam_username)}!"
+  end
+
+  config[:sidekiq_cloudwatch_iam_credentials] =
+    JSON.parse(create_access_key_output_json)['AccessKey']
+
+  # Save credentials in the cached config file
+  File.open('./.installer_config.json', 'w') do |f|
+    f.puts(JSON.pretty_generate(config: config))
+  end
+end
+
+logger.info "======> Default domain: #{default_service_domain_name}"
+logger.info '        You can use this as a CNAME record after configuring a domain in convox.yml'
+logger.info '        (Note: SSL will be configured automatically.)'
+
+logger.info 'Checking convox env...'
+convox_env_output = `convox env --rack #{config.fetch(:stack_name)}`
+raise 'Error running convox env' unless $CHILD_STATUS.success?
+
+convox_env = begin
+  convox_env_output.split("\n").map { |s| s.split('=', 2) }.to_h
+rescue StandardError
+  {}
+end
+
+# Add database and redis
+desired_env = {
+  'DATABASE_URL' => rds_details[:postgres_url],
+  'REDIS_URL' => elasticache_details[:redis_url],
   'AWS_ACCESS_KEY_ID' => s3_bucket_details.fetch(:access_key_id),
   'AWS_ACCESS_KEY_SECRET' => s3_bucket_details.fetch(:secret_access_key),
   'AWS_UPLOADS_S3_BUCKET' => s3_bucket_details.fetch(:name),
   'AWS_UPLOADS_S3_REGION' => config.fetch(:aws_region),
-  'SECRET_KEY_BASE' => secret_key_base,
-  'DATA_ENCRYPTION_KEY' => data_encryption_key,
+  'SECRET_KEY_BASE' => config.fetch(:secret_key_base),
+  'SUBMISSION_DATA_ENCRYPTION_KEY' => config.fetch(:data_encryption_key),
   'ADMIN_NAME' => 'Admin',
   'ADMIN_EMAIL' => config.fetch(:admin_email),
-  'ADMIN_PASSWORD' => config.fetch(:admin_password)
+  'ADMIN_PASSWORD' => config.fetch(:admin_password),
+  'DOCSPRING_LICENSE' => config.fetch(:docspring_license),
+  'DISABLE_EMAILS' => 'true'
 }
 
-env_command_params = env.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
-run_convox_command! "env set #{env_command_params}"
+# Only set health check path and domain if it's not already present.
+desired_env['HEALTH_CHECK_PATH'] = MINIMAL_HEALTH_CHECK_PATH if convox_env['HEALTH_CHECK_PATH'].nil?
+desired_env['DOMAIN_NAME'] = default_service_domain_name if convox_env['DOMAIN_NAME'].nil?
+
+updated_keys = []
+desired_env.each_key do |key|
+  updated_keys << key if convox_env[key] != desired_env[key]
+end
+
+if updated_keys.none?
+  logger.info '=> Convox env has already been configured.'
+  logger.info '   You can update this by running: convox env set ...'
+else
+  logger.info "=> Setting environment variables to configure DocSpring: #{updated_keys.join(', ')}"
+  env_command_params = desired_env.map { |k, v| "#{k}=\"#{v}\"" }.join(' ')
+  run_convox_command! "env set #{env_command_params}"
+end
+
+# If we are already using the complete health check path, then we can skip the rest.
+if convox_env['HEALTH_CHECK_PATH'] == COMPLETE_HEALTH_CHECK_PATH
+  logger.info 'DocSpring is already set up and running.'
+else
+  logger.info 'Checking convox processes...'
+  convox_processes = `convox ps --rack #{config.fetch(:stack_name)}`
+  if convox_processes.include?('web') && convox_processes.include?('worker')
+    logger.info '=> Initial deploy for DocSpring Enterprise is already done.'
+  else
+    logger.info '=> Initial deploy for DocSpring Enterprise...'
+    logger.info '-----> Documentation: https://docs.convox.com/deployment/deploying-changes/'
+    run_convox_command! 'deploy'
+  end
+
+  logger.info '=> Ensuring the DocSpring application container can boot successfully...'
+  run_convox_command! 'run command ./bin/smoke_test'
 
-puts '=> Initial deploy...'
-puts '-----> Documentation: https://docs.convox.com/deployment/builds'
-run_convox_command! 'deploy --wait'
+  logger.info '=> Setting up the DocSpring database...'
+  run_convox_command! 'run command rake db:create db:migrate db:seed'
 
-puts '=> Setting up the database...'
-run_convox_command! 'run web rake db:create db:migrate db:seed'
+  logger.info '=> Checking Postgres, Redis, Rails cache, S3 uploads, Sidekiq job processing...'
+  run_convox_command! 'run command rake tests:health_check'
 
-puts '=> Updating the health check path to include database tests...'
-run_convox_command! "env set --promote --wait HEALTH_CHECK_PATH=#{COMPLETE_HEALTH_CHECK_PATH}"
+  logger.info '=> Updating the health check path to include database tests...'
+  run_convox_command! "env set --promote HEALTH_CHECK_PATH=#{COMPLETE_HEALTH_CHECK_PATH}"
+end
 
 puts
-puts 'All done!'
+logger.info 'All done!'
 puts
 puts "You can now visit #{default_service_domain_name} and sign in with:"
 puts
@@ -159,24 +251,26 @@ puts
 puts 'To learn more about the convox CLI, run: convox --help'
 puts
 puts '  * View the Convox documentation:  https://docs.convox.com/'
+puts '  * View the DocSpring documentation: https://docspring.com/docs/'
 puts
 puts
-puts 'To completely uninstall Convox from your AWS account,'
+puts 'To completely uninstall Convox and DocSpring from your AWS account,'
 puts 'run the following steps (in this order):'
 puts
 puts ' 1) Disable "Termination Protection" for any resource where it was enabled.'
 puts
-puts " 2) Delete all files from the #{config.fetch(:s3_bucket_name)} S3 bucket:"
+puts " 2) Delete all files from the #{s3_bucket_details.fetch(:name)} S3 bucket:"
 puts
 puts "    export AWS_ACCESS_KEY_ID=#{config.fetch(:aws_access_key_id)}"
 puts "    export AWS_SECRET_ACCESS_KEY=#{config.fetch(:aws_secret_access_key)}"
 puts "    aws s3 rm s3://#{s3_bucket_details.fetch(:name)} --recursive"
 puts
-puts " 3) Delete the #{config.fetch(:s3_bucket_name)} S3 bucket:"
+puts ' 3) Uninstall Convox (deletes all AWS resources via Terraform):'
 puts
-puts "    convox rack resources delete #{config.fetch(:s3_bucket_name)} --wait"
+puts "    convox rack uninstall #{config.fetch(:stack_name)}"
 puts
-puts ' 4) Uninstall Convox (deletes all CloudFormation stacks and AWS resources):'
 puts
-puts "    convox rack uninstall aws #{config.fetch(:stack_name)}"
+puts '------------------------------------------------------------------------------------'
+puts 'Thank you for using DocSpring! Please contact support@docspring.com if you need any help.'
+puts '------------------------------------------------------------------------------------'
 puts