ufo 4.3.1 → 4.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: e4dfad82bcb8f29c81c11bec2298b540885b11337abf57b25371f4068a474b02
-  data.tar.gz: 352909476cc73ddab7f16a88bc5878b3be7a7f8bfdff85d22856570a0d7be5e4
+SHA1:
+  metadata.gz: 4e71aeb95d96170c7faa58087450a774e3358e63
+  data.tar.gz: 3fb85bfcfef7f0861652dcec20088b204ed8a5c8
 SHA512:
-  metadata.gz: 4d3cbfbd3ea2ce9622995c61e862188d5f0f7f67afe4bca7c9261f056d7f4b33edec6ba4e389198220007c376fab155dfc6c8d02fe8d1dc7c39df0a8fb4b5fc6
-  data.tar.gz: '09a4f4fc612c3f4ebcb782bc6fe146ebfb88b75bb5cfab5e55f712158fef225b18c11fd759c649a4bb7bf361655ccf750152d5e626fede67331a0c9d6dc23443'
+  metadata.gz: 95a679a60fbae5e1cd2a54e244e46622b59ef28835c9bfd105730caa5fc31c5deab8f9eb030fd6eb8f3f5028698ee425a2539c38c9434533abaf4668ee7fc870
+  data.tar.gz: f6613d13f0d3c633e21a89faf6ad6bd2c302dfe24a95d925dcc588814e8c099cfb6200e8220a4667e388caa16bc2453b80858a52426584c9a5cdb29d225179e2

data/.circleci/config.yml

@@ -32,6 +32,14 @@ jobs:
           # fallback to using the latest cache if no exact match is found
           - v1-dependencies-
 
+      # Thanks: https://discuss.circleci.com/t/using-bundler-2-0-during-ci-fails/27411/3
+      - run:
+          name: configure bundler
+          command: |
+            echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV
+            source $BASH_ENV
+            gem install bundler
+
       - run:
           name: install dependencies
           command: |

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [4.4.0]
+- #71 from gurpreetatwal/patch-1 remove extra slash from URL
+- #73 organize docs better into subfolders
+- #74 appending ufo_env to stack name
+- change setting aws_profile to tightly bind to ufo_env, simpler to understand
+
 ## [4.3.1]
 - #70 ps --status filter and fix list_tasks 100 limit issue
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (4.3.1)
+    ufo (4.4.0)
       aws-sdk-cloudformation
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
@@ -19,39 +19,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2.1)
+    activesupport (5.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aws-eventstream (1.0.2)
-    aws-partitions (1.144.0)
-    aws-sdk-cloudformation (1.14.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-cloudwatchlogs (1.14.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.46.2)
-      aws-eventstream (~> 1.0)
+    aws-partitions (1.149.0)
+    aws-sdk-cloudformation (1.18.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-cloudwatchlogs (1.17.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-core (3.48.3)
+      aws-eventstream (~> 1.0, >= 1.0.2)
       aws-partitions (~> 1.0)
-      aws-sigv4 (~> 1.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.72.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-ecr (1.11.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-ecs (1.31.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
-    aws-sdk-elasticloadbalancingv2 (1.21.0)
-      aws-sdk-core (~> 3, >= 3.39.0)
-      aws-sigv4 (~> 1.0)
+    aws-sdk-ec2 (1.78.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecr (1.14.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-ecs (1.36.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-elasticloadbalancingv2 (1.26.0)
+      aws-sdk-core (~> 3, >= 3.48.2)
+      aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
-    byebug (11.0.0)
+    byebug (11.0.1)
     cli_markdown (0.1.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
@@ -110,4 +110,4 @@ DEPENDENCIES
   ufo!
 
 BUNDLED WITH
-   1.17.3
+   2.0.1

data/README.md

@@ -33,7 +33,7 @@ Full installation instructions are at [Install Ufo](http://ufoships.com/docs/ins
 To quickly demonstrate how simple it is to use ufo we will use an example app from [tongueroo/demo-ufo](https://github.com/tongueroo/demo-ufo).  The app is a barebones sinatra app.  Here are the steps:
 
     gem install ufo
-    git clone https:///github.com/tongueroo/demo-ufo.git demo
+    git clone https://github.com/tongueroo/demo-ufo.git demo
     cd demo
     ufo init --image=tongueroo/demo-ufo
     ufo ship demo-web

data/docs/.ruby-version

@@ -0,0 +1 @@
+2.5.3

data/docs/_docs/auto-completion.md

@@ -1,5 +1,6 @@
 ---
 title: Auto Completion
+nav_order: 39
 ---
 
 Ufo supports bash auto-completion.  To set it up add the following to your `~/.profile` or `.bashrc`:
@@ -24,6 +25,4 @@ ufo tasks [TAB]
 ufo tasks build [TAB]
 ```
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/automated-cleanup.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link articles.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/automated-cleanup.md

@@ -1,5 +1,6 @@
 ---
 title: Automated Clean Up
+nav_order: 38
 ---
 
 Ufo can be configured to automatically clean old images from the ECR registry after the deploy completes by configuring your [settings.yml]({% link _docs/settings.md %}) file like so:
@@ -10,6 +11,4 @@ ecr_keep: 30
 
 Automated Docker images clean up only works if you are using ECR registry.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/migrations.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/auto-completion.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/conventions.md

@@ -1,5 +1,6 @@
 ---
 title: Conventions
+nav_order: 18
 ---
 
 Ufo uses a set of naming conventions.  This helps enforce some best practices and also allows the ufo commands to be concise.  You can override or bypass the conventions easily.
@@ -43,6 +44,4 @@ You can also use an existing ELB by specifying the target group arn as the value
 ufo ship demo-web --elb arn:aws:elasticloadbalancing:us-east-1:12345689:targetgroup/demo-web/12345
 ```
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/helpers.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/ufo-env.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/customize-cloudformation.md

@@ -1,5 +1,6 @@
 ---
 title: Customize CloudFormation
+nav_order: 33
 ---
 
 Under the hood, ufo creates most of the required resources with a CloudFormation stack.  This includes the ELB, Target Group, Listener, Security Groups, ECS Service, and Route 53 records.  You might need to customize these resources.  Here are the ways to customize the resources that ufo creates.
@@ -31,6 +32,4 @@ UFO_ENV_EXTRA=2 ufo ship demo-web -\-cluster dev | development-demo-web-2
 
 The CloudFormation stack is currently generated from a template. The source code for this template is located at [cfn/stack.yml](https://github.com/tongueroo/ufo/blob/master/lib/cfn/stack.yml).  This implementation might change in the future.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/why-cloudformation.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/stuck-cloudformation.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/ecs-network-mode.md

@@ -1,5 +1,6 @@
 ---
 title: ECS Network Mode
+nav_order: 24
 ---
 
 ## Pros and Cons: awsvpc vs bridge network mode
@@ -19,6 +20,4 @@ Network mode | Pros | Cons
 bridge | The numbers of containers you can run will not be limited due to EC2 instance network cards limits. | Less fine grain security control over security group permissions with multiple ECS services.
 awsvpc | Fine grain security group permissions for each ECS service. | The number of containers can be limited by the number of network cards the EC2 instance type supports.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/security-groups.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/ssl-support.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/faq.md

@@ -1,5 +1,6 @@
 ---
 title: FAQ
+nav_order: 28
 ---
 
 **Q: Is AWS ECS Fargate supported?**
@@ -96,6 +97,4 @@ Also, you might have to enable the log driver by adding the ECS_AVAILABLE_LOGGIN
 
 Hope that helps.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/redirection-support.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/why-cloudformation.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/fargate.md

@@ -2,8 +2,4 @@
 title: Fargate
 ---
 
-This doc has been moved to [Quick Start: Fargate]({% link quick-start.md %}).
-
-<a id="prev" class="btn btn-basic" href="{% link _docs/conventions.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/ufo-env.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+This doc has been moved to [Quick Start: Fargate]({% link quick-start.md %}).

data/docs/_docs/helpers.md

@@ -1,5 +1,6 @@
 ---
 title: Helpers
+nav_order: 17
 ---
 
 The `task_definitions.rb` file has access to helper methods. These helper methods provide useful contextual information about the project.
@@ -18,6 +19,4 @@ To call the helper in task_definitions.rb you must add `helper.` in front.  So `
 
 The 2 classes which provide these special helper methods are in [ufo/dsl.rb](https://github.com/tongueroo/ufo/blob/master/lib/ufo/dsl.rb) and [ufo/dsl/helper.rb](https://github.com/tongueroo/ufo/blob/master/lib/ufo/dsl/helper.rb). Refer to these classes for the full list of the helper methods.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/variables.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/conventions.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/install.md

@@ -1,5 +1,6 @@
 ---
 title: Installation
+nav_order: 3
 ---
 
 ## Install with RubyGems
@@ -31,7 +32,4 @@ For more information about the Bolts Toolbelt or to get an installer for another
 * Docker: You will need a working version of [Docker](https://docs.docker.com/engine/installation/) installed as ufo shells out and calls the `docker` command.
 * AWS: Set up your AWS credentials at `~/.aws/credentials` and `~/.aws/config`.  This is the [AWS standard way of setting up credentials](https://aws.amazon.com/blogs/security/a-new-and-standardized-way-to-manage-credentials-in-the-aws-sdks/).
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/quick-start-ec2.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/tutorial.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
-
+{% include prev_next.md %}

data/docs/_docs/load-balancer.md

@@ -1,5 +1,6 @@
 ---
 title: Load Balancer Support
+nav_order: 22
 ---
 
 Ufo can automatically create a load balancer and associate it with an ECS service.  The options:
@@ -79,6 +80,4 @@ Under the hood, ufo implements load balancer support with CloudFormation. You ca
 
 <img src="/img/docs/cloudformation-resources.png" class="doc-photo" />
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/ufo-current.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/security-groups.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/migrations.md

@@ -1,5 +1,6 @@
 ---
 title: Database Migrations
+nav_order: 37
 ---
 
 A common task is to run database migrations with newer code before deploying the code. This is easily achieved with the `ufo task` command. Here's an example:
@@ -27,6 +28,4 @@ The `ufo task` command is generalized so you can run any one-off task. It is not
 2. Registers the ECS Task definition
 3. Runs a one-off ECS Task
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/single-task.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/automated-cleanup.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/next-steps.md

@@ -1,5 +1,6 @@
 ---
 title: Next Steps
+nav_order: 41
 ---
 
 This concludes the tutorial guide for ufo. Hopefully you are now more comfortable with ufo's basic usage, concepts, and have a feel for the workflow.
@@ -12,7 +13,4 @@ From here, there are a few resources that can help you continue along:
 
 Everyone can contribute to make ufo better, including the documentation. These docs are of the same ufo repo in the [docs folder](https://github.com/tongueroo/ufo/tree/master/docs). Please fork the project and open a pull request!  We love your pull requests. Contributions are encouraged and welcomed!
 
-<a id="prev" class="btn btn-basic" href="{% link articles.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link reference.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
-
+{% include prev_next.md %}

data/docs/_docs/params.md

@@ -1,5 +1,6 @@
 ---
 title: Params
+nav_order: 15
 ---
 
 Additionally, the params that ufo sends to the [ruby aws-sdk](https://docs.aws.amazon.com/sdk-for-ruby/v3/api/Aws/ECS/Client.html#run_task-instance_method) methods to create resources can be customized with a `params.yml` file.  This allows you to customize the tool using the full power of the aws-sdk.
@@ -32,7 +33,4 @@ ERB and [shared variables]({% link _docs/variables.md %}) are available in the p
 
 NOTE: The params.yml file does not have access to the `task_definition_name` helper method. That is only available in the `task_definitions.rb` template_definition code blocks.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/settings-cfn.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/variables.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
-
+{% include prev_next.md %}

data/docs/_docs/quick-start-ec2.md

@@ -1,5 +1,6 @@
 ---
-title: "Quick Start: EC2"
+title: 'Quick Start: EC2'
+nav_order: 2
 ---
 
 ## What is ECS EC2?
@@ -79,6 +80,4 @@ If you would like not to manage the EC2 server fleet, you are looking for ECS Fa
 
 Learn more in the next sections.
 
-<a id="prev" class="btn btn-basic" href="{% link quick-start.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/install.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/redirection-support.md

@@ -1,5 +1,6 @@
 ---
 title: Redirection Support
+nav_order: 27
 ---
 
 ## Application Load Balancers
@@ -23,6 +24,4 @@ listener:
 
 Network Load Balancers work at layer 4, so they do not support redirection.  Instead you need to handle redirection within your app.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/route53-support.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/faq.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/route53-support.md

@@ -1,5 +1,6 @@
 ---
 title: Route53 Support
+nav_order: 26
 ---
 
 Ufo can create a "pretty" route53 record and set it's value to the created ELB DNS name. This is done by configuring the `.ufo/settings/cfn/default.yml` file. Example:
@@ -23,6 +24,4 @@ Results in:
     aws route53 create-hosted-zone --name mydomain.com --caller-reference $(date +%s)
     aws route53 list-hosted-zones
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/ssl-support.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/redirection-support.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/run-in-pieces.md

@@ -1,5 +1,6 @@
 ---
 title: Run in Pieces
+nav_order: 35
 ---
 
 The `ufo ship` command goes through a few stages:
@@ -32,6 +33,4 @@ ufo deploy demo-web
 
 Note if you use the `ufo deploy` you should ensure that you have already pushed the docker image to your docker registry.  Or else the task will not be able to spin up because the docker image does not exist.  This is one of the reasons it is recommended that you use `ufo ship`.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/upgrade4.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/single-task.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/security-groups.md

@@ -1,5 +1,6 @@
 ---
 title: Security Groups
+nav_order: 23
 ---
 
 Ufo creates and manages two security groups. One for the ELB and one for the ECS tasks.
@@ -32,6 +33,4 @@ In general, ports below 32768 are outside of the ephemeral port range. So an eas
 
 If you are using a network load balancer and are running bridge network mode, then you need to whitelist ports 32768 to 65535 to `0.0.0.0/0`.  This is because network load balancers operate at layer 4 of the OSI model and cannot be assigned security groups, so they use the security group of the instance.  If you feel this is too loose of permissions, you can use awsvpc mode. There are some considerations for awsvpc mode though which is discussed next.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/load-balancer.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/ecs-network-mode.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/settings-cfn.md

@@ -1,11 +1,10 @@
 ---
 title: Settings Cfn
+nav_order: 14
 ---
 
 ## Customizing Resources
 
 {% include cfn-customize.md %}
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/settings-network.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/params.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/settings-network.md

@@ -1,5 +1,6 @@
 ---
 title: Settings Network
+nav_order: 13
 ---
 
 The settings.yml file references a network settings file with the `network_profile` option. This file has configurations that are related to the network.  The source code for the starter template file is at [network/default.yml.tt](https://github.com/tongueroo/ufo/blob/master/lib/template/.ufo/settings/network/default.yml.tt)  Here's an example network settings file.
@@ -29,6 +30,4 @@ elb_subnets | Used to create elb load balancer.  Defaults to same subnets as ecs
 ecs_security_groups | Additional security groups to associate with the ECS tasks.
 elb_security_groups | Additional security groups to associate with the ELB.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/settings.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/settings-cfn.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}

data/docs/_docs/settings.md

@@ -1,5 +1,6 @@
 ---
 title: Settings
+nav_order: 12
 ---
 
 The behavior of ufo can be configured with a `settings.yml` file.  A starter project `.ufo/settings.yml` file is generated as part of the `ufo init` command. There are can be multiple settings files. The options from the files get merged and respected in the following precedence:
@@ -22,24 +23,19 @@ development:
   # cluster: dev # uncomment if you want the cluster name be other than the default
                  # the default is to match UFO_ENV.  So UFO_ENV=development means the ECS
                  # cluster will be name development
-  # When you have AWS_PROFILE set to one of these values, ufo will switch to the desired
-  # environment. This prevents you from switching AWS_PROFILE, forgetting to
-  # also switch UFO_ENV, and accidentally deploying to production vs development.
-  # aws_profiles:
-  #   - dev_profile1
-  #   - dev_profile2
+  # The aws_profile tightly binds UFO_ENV to AWS_PROFILE and vice-versa.
+  # aws_profile: dev_profile
 
 production:
   # cluster: prod
-  # aws_profiles:
-  #   - prod_profile
+  # aws_profile: prod_profile
 ```
 
 The table below covers each setting:
 
 Setting  | Description
 ------------- | -------------
-`aws_profiles`  | If you have the `AWS_PROFILE` environment variable set, this will ensure that you are deploying the right `UFO_ENV` to the right AWS environment. It is explained below.
+`aws_profile`  | If you have the `AWS_PROFILE` environment variable set, this will ensure that you are deploying the right `UFO_ENV` to the right AWS environment. It is explained below.
 `cfn_profile` | The name of the cfn profile settings file to use. Maps to .ufo/settings/cfn/NAME.yml file
 `clean_keep`  | Docker images generated from ufo are cleaned up automatically for you at the end of `ufo ship`. This controls how many docker images to keep around. The default is 3.
 `cluster`  | By convention, the ECS cluster that ufo deploys to matches the `UFO_ENV`. If `UFO=development`, then `ufo ship` deploys to the `development` ECS cluster. This is option overrides this convention.
@@ -86,29 +82,30 @@ production:
 
 ## AWS_PROFILE support
 
-An interesting option is `aws_profiles`.  Here's an example:
+An interesting option is `aws_profile`.  Here's an example:
 
 ```yaml
 development:
-  aws_profiles:
-    - dev-profile1
-    - dev-profile2
+  aws_profile: dev_profile
 
 production:
-  aws_profiles:
-    - prod-profile
+  aws_profile: prod_profile
 ```
 
-In this case, when you set the environment variable `AWS_PROFILE` to switch AWS profiles in your shell, ufo picks this up and maps the `AWS_PROFILE` value to the specified `UFO_ENV` using the `aws_profiles` option.  Example:
+This provides a way to tightly bind `UFO_ENV` to `AWS_PROFILE`.  This prevents you from forgetting to switch your `UFO_ENV` when switching your `AWS_PROFILE` thereby accidentally launching a stack in the wrong environment.
 
-```sh
-AWS_PROFILE=dev-profile1 => UFO_ENV=development
-AWS_PROFILE=dev-profile2 => UFO_ENV=development
-AWS_PROFILE=prod-profile => UFO_ENV=production
-```
+
+AWS_PROFILE | UFO_ENV | Notes
+--- | --- | ---
+dev_profile | development
+prod_profile | production
+whatever | development | default since whatever is not found in settings.yml
+
+The binding is two-way. So:
+
+    UFO_ENV=production ufo ship # will deploy to the AWS_PROFILE=prod_profile
+    AWS_PROFILE=prod_profile ufo ship # will deploy to the UFO_ENV=production
 
 This behavior prevents you from switching `AWS_PROFILE`s, forgetting to switch `UFO_ENV` and then accidentally deploying a production based docker image to development and vice versa because you forgot to also switch `UFO_ENV` to its respective environment.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/structure.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/settings-network.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
+{% include prev_next.md %}