sonic-screwdriver 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37ec82ca43bde6ed94fef35b7c6f275890be09f3
-  data.tar.gz: dcb1bbf176d88da619c25561b1f947b2cbc52e28
+  metadata.gz: 4e57a38964860cd1bb9eda130089260cb75aeca6
+  data.tar.gz: 40339059f215ef4b643cb7d16d2f3da251808554
 SHA512:
-  metadata.gz: 36e8aee57411d03defaee3439abc17684f8aca3f1c8dac1c6203cd496e499e05b9bc3d93601f9dfa120d7b36c68fb728e2efe78e2369c144b21f5561ac4c571a
-  data.tar.gz: 70ec6d267b6db685832816648a51b6cb7495f652d74d91f2b4fd742298422b0d3151e1c916069ae3e272985006306d7ad9b6f1beec5120e8fc0833bc18f30ea8
+  metadata.gz: e3aa5c463b9e60841adc238db79d1cdd45ee41ff1a0bbb9b74c241534e5c63e9a8151fd39375b889a568805480327dc28cc964c18a1e4f66c51398ec60a3b925
+  data.tar.gz: 7fd9256e2820fed70aa533cc558cc2d7131eeb49de76d7d71120297207c3ce1ed61ef1e2fc4d5a3e39cbc0d3ba81db2bcfbaa02bb35684b93b373f6935ca3138

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 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.
 
+## [1.1.0]
+- standardize filter to be first argument
+
 ## [1.0.0]
 - sonic ecs-exec
 - sonic ecs-run

data/README.md

@@ -4,7 +4,7 @@ Sonic is a multi-functional tool that helps you manage AWS resources. Sonic cont
 
 ## Why Sonic Was Created
 
-After I exhaust debugging an ECS service with CloudWatch Logs I usually take it to the the next step: ssh into the instance. I jump into an instance with a running task or docker container and poke around to figure out the root issue.
+After I exhaust debugging an ECS service with CloudWatch Logs I usually take it to the next step: ssh into the instance. I jump into an instance with a running task or docker container and poke around to figure out the root issue.
 
 In order to find the instance with the service's docker container I click around on the ECS console website until I find the container instance's DNS name and then paste it to the terminal. While this process is not complicated, it is tedious.  For example, the typical process is:
 

data/docs/_docs/help.md

@@ -0,0 +1,21 @@
+---
+title: Help
+---
+
+You can run help for quick help information right at the cli.  Example:
+
+```sh
+sonic help
+```
+
+You can append `help`, `-h` or `--help` to the end of any command to get more help information about that specific command.  These all work.
+
+```sh
+sonic ssh help
+sonic ecs-exec --help
+sonic execute -h
+```
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/settings.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/why.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/how-it-works.md

@@ -4,7 +4,7 @@ title: How It Works
 
 ### Internals
 
-The process that I outline in the [Why]({% link _docs/why.md %}) about clicking around is close to the logic that actually takes place in the tool but it is actually slightly different. Here's an overview of what actually happens internally for those who are interested.
+The process that I outline in the [Why]({% link _docs/why.md %}) about clicking around is close to the logic that actually takes place in the tool. Here's an overview of what actually happens internally for those who are interested.
 
 Steps:
 
@@ -17,9 +17,9 @@ Steps:
 7. Use the ecs metadata and pass it the task_arn from step 2. This will provide the map to the container id.
 8. Run docker command
     1. docker exec -ti CONTAINER_ID `options[:command]`
-    2. docker run `options[:run_options]` IMAGE `options[:command]`
+    2. docker run -ti IMAGE `options[:command]`
 
-In order to pass info over from your local machine to the container instance a file is generated and copied in step 5. File contains:
+In order to pass info over from your local machine to the container instance a file is generated and copied in step 5. The file contains:
 
 * Options all the way from the original cli call like command to run. This is in json form.
 A bash script is also copied.
@@ -29,6 +29,6 @@ A bash script is also copied.
 NOTE: I thought it would be possible to map the container instance info from `aws ecs describe-services` but it is not possible. But we can map to the container instance DNS name starting from `aws ecs list-tasks`.
 
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/why.md %}">Back</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/why-ec2-run-command.md %}">Back</a>
 <a id="next" class="btn btn-primary" href="{% link _docs/next-steps.md %}">Next Step</a>
 <p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/install-bastion.md

@@ -0,0 +1,35 @@
+---
+title: Bastion Setup
+---
+
+It is common to secure your network setup by restricting access to your servers by placing them in internal subnets.  In this case you will have a bastion host server that you must use to jump through to get to your instance. Sonic provides built-in support for a bastion host.
+
+You can configure the [settings.yml]({% link _docs/settings.md %}) file to use a bastion host. Here's an example:
+
+```yaml
+bastion: bastion.mydomain.com
+```
+
+This directs the `sonic ssh` to jump through the bastion host. This works completely transparently. The sonic commands are exactly the same as if there is no bastion host.
+
+```
+sonic ssh i-0f7f833131a51ce35
+```
+
+You should notice that the built up command now includes the bastion jump host.
+
+```
+$ sonic ssh i-0f7f833131a51ce35 uptime
+=> ssh -At ec2-user@34.211.223.3 ssh ec2-user@10.10.110.135 uptime
+Warning: Permanently added '34.211.223.3' (ECDSA) to the list of known hosts.
+Warning: Permanently added '10.10.110.135' (ECDSA) to the list of known hosts.
+ 18:35:18 up  1:14,  0 users,  load average: 0.24, 0.07, 0.02
+Connection to 34.211.223.3 closed.
+$
+```
+
+You can also specify the bastion host as a CLI option with `--bastion`, though it is recommended that you configure it in a `settings.yml` file so you do not have to repeatedly type it.
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/install.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>

data/docs/_docs/install.md

@@ -30,23 +30,29 @@ gem "sonic-screwdriver"
 
 #### sonic ecs-* dependencies
 
-In order for the `sonic ecs-*` trickery to work `jq` is used on the server side.  This is covered in the [How It Works]({% link _docs/how-it-works.md %}) section. So you must have `jq` installed on the servers for the `sonic ecs-*` commands to work.
+In order for the `sonic ecs-*` commands to work `jq` is required on the server side. This is covered in the [How It Works]({% link _docs/how-it-works.md %}) section.
 
 One way to install `jq` quickly is by using the `sonic execute` command.  For example:
 
 ```sh
-sonic execute -f hi-web-stag yum install -y jq
+sonic execute hi-web-stag yum install -y jq
 ```
 
 It is recommended that you install `jq` with the UserData script or bake it into the AMI though.
 
 #### sonic execute dependencies
 
-The `sonic execute` works alongside [Amazon EC2 Run Command](https://aws.amazon.com/ec2/execute/).  So this is the required to be installed on the servers for `sonic execute` to work.
+The `sonic execute` works alongside [Amazon EC2 Run Command](https://aws.amazon.com/ec2/execute/).  So it is required to be installed on the servers for `sonic execute` to work.
 
 #### Amazon EC2 Run Manager Installation
 
-Installing the EC2 Run Manager agent on your linux servers is super simple and often only one command.  The recommended instructions are the offical Amazon EC2 Systems Manager [Install SSM Agent](http://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) documentation.
+Installing the EC2 Run Manager agent on your linux servers is super simple and is only one command.
+
+```sh
+sudo yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm
+```
+
+The full recommended instructions are on the offical Amazon EC2 Systems Manager [Install SSM Agent](http://docs.aws.amazon.com/systems-manager/latest/userguide/ssm-agent.html) documentation.
 
 The trickest part of installing is likely making sure that the agent on the server has successfully checked into the SSM service.  Verify it by tailing `/var/log/amazon/ssm/errors/errors.log`.
 
@@ -58,7 +64,7 @@ You can verify the instances that have successfully checked into SSM with `aws s
 aws ssm describe-instance-information --output text --query "InstanceInformationList[*]"
 ```
 
-Here's an exmaple of the output:
+Here's an example of the output:
 
 ```sh
 $ aws ssm describe-instance-information --output text --query "InstanceInformationList[*]"
@@ -70,6 +76,6 @@ $
 More information is provided in the AWS Run Command Walkthrough [Using the AWS CLI](http://docs.aws.amazon.com/systems-manager/latest/userguide/walkthrough-cli.html).
 
 <a id="prev" class="btn btn-basic" href="{% link docs.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/tutorial.md %}">Next Step</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/install-bastion.md %}">Next Step</a>
 <p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
 

data/docs/_docs/settings.md

@@ -2,7 +2,7 @@
 title: Settings
 ---
 
-You can adjust the behavior of sonic and set some handy default values with `settings.yml` files.  There can exist multiple settings files which get loaded and merged. The options from the files follow the the following precedence rules:
+You can adjust the behavior of sonic and set some handy default values with `settings.yml` files.  There can exist multiple settings files which all get loaded and merged. The options from the files follow the following precedence rules:
 
 1. project - The project's `.sonic/settings.yml` values take the highest precedence.
 2. user - The user's `~/.sonic/settings.yml` values take the second highest precedence.
@@ -33,11 +33,11 @@ host_key_check  | Controls whether or not use the strict host checking ssh optio
 service_cluster  | Service to cluster mapping.  This is a Hash structure that maps the service name to cluster names. | (no value)
 user  | User to ssh into the server with. This can be overriden at the CLI with the user@host notation but can be set in the settings.yml file also. | ec2-user
 
-The default settings are located within the package tool at [lib/sonic/default/settings.yml](https://github.com/boltopslabs/sonic/blob/master/lib/sonic/default/settings.yml).
+The default settings are located tool source code at [lib/sonic/default/settings.yml](https://github.com/boltopslabs/sonic/blob/master/lib/sonic/default/settings.yml).
 
 ### Service to Cluster Mapping
 
-One of the useful options is the `service_clsuter`.  This option maps service names to cluster names.  This saves you from  typing the `--cluster` option over and over.  Here is an example `~/.sonic/settings.yml`:
+One of the useful options is the `service_cluster`.  This option maps service names to cluster names.  This saves you from  typing the `--cluster` option over and over.  Here is an example `~/.sonic/settings.yml`:
 
 ```yaml
 user: ec2-user
@@ -69,5 +69,5 @@ sonic ssh hi-worker-stag --cluster stag
 
 
 <a id="prev" class="btn btn-basic" href="{% link _docs/tutorial-execute.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/why.md %}">Next Step</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/help.md %}">Next Step</a>
 <p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/tutorial-ecs-exec.md

@@ -2,11 +2,11 @@
 title: ECS Exec
 ---
 
-In the previous section we showed you how to use `sonic ssh` to quickly ssh into an instance.  Some of the identifiers used were ECS identifiers.  As you can see sonic is very much ECS aware.  It was built with ECS in mind.
+In the previous section we showed you how to use `sonic ssh` to quickly ssh into an instance.  Some of the identifiers used were ECS identifiers.  As you can see sonic is ECS smart.
 
-One of the things `sonic` can do is go from your local machine, ssh into an EC2 Container Instance, find the running docker instance and jump into the docker container via `docker exec`.
+One of the additional things `sonic` can do is go from your local machine, ssh into an EC2 Container Instance, find the running docker instance and jump into the docker container via `docker exec`.
 
-It does this with a variety of scripts and trickery and is covered in [How It Works]({% link _docs/how-it-works.md %}).  Let's through examples of how sonic can help you get into an docker container running on ECS quickly.
+It does this with a variety of scripts and trickery and is covered in [How It Works]({% link _docs/how-it-works.md %}).  Let's go through examples of how sonic can help you get into an running ECS docker container quickly.
 
 ### sonic ecs-exec
 
@@ -31,7 +31,7 @@ Warning: Permanently added '34.211.195.71' (ECDSA) to the list of known hosts.
 root@fc4035f90bdc:/app#
 ```
 
-What you see above is a bash shell within the docker container!  With one command you have placed yourself into the running container 🎉
+What you see in the last line above is a bash prompt because you are in a bash shell within the docker container!  With one command you have placed yourself into the running container 🎉
 
 As mentioned in the [previous section]({% link _docs/tutorial-ssh.md %}) and also in the [Settings documentation]({% link _docs/settings.md %}) you can configure a `~/.sonic/settings.yml` file which shortens the command further.  Let's add this to your settings:
 

data/docs/_docs/tutorial-ecs-run.md

@@ -2,7 +2,7 @@
 title: ECS Run
 ---
 
-The nice thing about the previous `ecs-exec` command we covered is that it allows you to get into the actual running container and debug with the exact enviornment that is on production.  The cavaet with doing this is that we are affecting a live process in actual use. If you do something inadvertently wrong on the server it could affect users.  Sometimes it is nice to start up a new container with the exact same environment as the other running containers but be isolated so you cannot affect live requests.
+The nice thing about the previous `ecs-exec` command we covered is that it allows you to get into the actual running container and debug with the exact environment that is on production.  The cavaet with doing this is that we are affecting a live process in actual use. If you do something inadvertently wrong on the server it could affect users.  Sometimes it is nice to start up a new container with the exact same environment as the other running containers but be isolated so you cannot affect live requests.
 
 ### sonic ecs-run
 
@@ -35,7 +35,7 @@ Connection to 34.211.195.71 closed.
 $
 ```
 
-In the above output a WEBrick server gets started.  The reason this happens is because the Dockerfile default `CMD` in this project happens to start a webserver.  Most of the time you probably want shell to debug.  To start a bash shell just tack the bash command at the end.
+In the above output a WEBrick server gets started.  The reason this happens is because the Dockerfile default `CMD` in this project happens to start a webserver.  Most of the time you probably want to start shell for debugging.  To start a bash shell just tack the bash command at the end.
 
 ```sh
 $ sonic ecs-run hi-web-stag bash
@@ -46,7 +46,7 @@ Warning: Permanently added '34.211.195.71' (ECDSA) to the list of known hosts.
 root@56a495dbd5cd:/app#
 ```
 
-You are now in a docker container running exactly the same environment as the other running containers with the `hi-web-stag` service. While this looks similiar to the `ecs-exec` command this is docker container is a new process and is isolated from any live request. You can do whatever you want to this container and experiment to your heart's content.
+You are now in a docker container running exactly the same environment as the other running containers with the `hi-web-stag` service. While this looks similiar to the `ecs-exec` command this container is a brand new process and is isolated from any live request. You can do whatever you want in this container and experiment to your heart's content.
 
 We can prove that this is a brand new docker container that is outside of ECS' knowledge. Let's ssh into the same instance and take a look at all the running docker containers in another terminal.
 
@@ -61,7 +61,7 @@ bf646ae7789a        amazon/amazon-ecs-agent:latest                 "/agent"
 $
 ```
 
-The output shows that there is this extra runnning container called `cocky_goldstine`.  This name does not look like the typical ECS managed running docker container: `ecs-hi-web-stag-11-web-9eb081978abad89a9701`
+The output shows that there is this extra runnning container called `cocky_goldstine`.  This name does not look like the typical ECS managed running docker container: `ecs-hi-web-stag-11-web-9eb081978abad89a9701`.  This is how we know that this is a container outside of ECS control.
 
 ```sh
 $ sonic ecs-run hi-web-stag bash
@@ -75,7 +75,7 @@ Connection to 34.211.195.71 closed.
 $
 ```
 
-Let's exit out of the first terminate where you ran the original `sonic ecs-run` command and then list the running containers again.
+Let's exit out of the first terminal where you ran the original `sonic ecs-run` command and then list the running containers again.
 
 ```sh
 $ sonic ssh hi-web-stag docker ps
@@ -87,7 +87,7 @@ bf646ae7789a        amazon/amazon-ecs-agent:latest                 "/agent"
 $
 ```
 
-Zapped!  The container that was created with `sonic ecs-run` is no more.
+Zapped!  The `cocky_goldstine` container that was created with `sonic ecs-run` is no more.
 
 <a id="prev" class="btn btn-basic" href="{% link _docs/tutorial-ecs-exec.md %}">Back</a>
 <a id="next" class="btn btn-primary" href="{% link _docs/tutorial-execute.md %}">Next Step</a>

data/docs/_docs/tutorial-execute.md

@@ -2,36 +2,50 @@
 title: Sonic Execute
 ---
 
-Sonic provides a way to execute commands remotely and securely across a list of AWS servers.  It does this by relying on [Amazon EC2 Run Command](https://aws.amazon.com/ec2/execute/).  Sonic hides any complexity and provides a simplier interface for you. Example:
+### Run One Liners
+
+Sonic provides a way to execute commands remotely and securely across a list of AWS servers.  It does this by leveraging [Amazon EC2 Run Command](https://aws.amazon.com/ec2/execute/).  Sonic hides any complexity and provides a simple interface for you. Example:
 
 ```sh
-sonic execute --filter hi-web-stag "uptime"
+sonic execute hi-web-stag uptime
 ```
 
 Let's do something more useful:
 
 ```sh
-sonic execute --filter hi-web-stag "yum install -y curl"
+sonic execute hi-web-stag yum install -y curl
 ```
 
-The output of the commands ran are showed in the EC2 Run Command Console.  Here's an example:
+The output of the command will show a useful `aws ssm list-commands` command to get status of the requested command.
 
 ```
-$ sonic execute --filter hi-web-stag uptime
+$ sonic execute hi-web-stag uptime
 Command sent to AWS SSM. To check the details of the command:
 aws ssm list-commands --command-id 4133e5eb-aa18-40dd-be25-a176eb15e515
 Pro tip: the aws ssm command is already in your copy/paste clipboard.
 $
 ```
 
-### Why Amazon EC2 Run Command
+The output of the commands ran are also showed in the EC2 Run Command Console.  Here's an example:
+
+<img src="/img/tutorials/ec2-console-run-command.png" class="doc-photo" />
+
+### Run Scripts
 
-Why use Amazon EC2 Run Command vs just using a multi-ssh session?
+Sometimes you might want to run more than just a one-liner command. If you need to run a full script, you can provide the file path to the script by designating it with `file://`.  For example, here's a file called `hi.sh`:
+
+```bash
+#!/bin/bash
+echo "hello world"
+```
+
+Here's how you run that file:
+
+```sh
+sonic execute hi-web-stag file://hi.sh
+```
 
-* Some times it is not possible to use ssh across several servers.  For example, really secured networks might have [MFA setup](TODO) so you need to authorized the requests via your phone before the command actually gets ran. In this case, you would get annoying confirmation notifications on your phone over and over as you approve each request for each of your servers.
-* EC2 Run Command provides auditability. Any command that runs the EC2 Run Command gets logged and is tracked.
-* The EC2 Run Manager has the ability to run the command in "blue/green" fashion with concurrency controls. Say you have 100 servers, you can tell EC2 Run Manager to run the command on one server first and the expodentially roll it out to the rest of the servers until the command has successfully ran on all servers.  If it the command errors then it execute can be told to halt.
-* This is all provided for free by using EC2 Run Manager.
+The file gets read by `sonic execute` and sent to EC2 Run Command to be executed.
 
 <a id="prev" class="btn btn-basic" href="{% link _docs/tutorial-ecs-run.md %}">Back</a>
 <a id="next" class="btn btn-primary" href="{% link _docs/settings.md %}">Next Step</a>

data/docs/_docs/tutorial-ssh.md

@@ -6,7 +6,7 @@ title: SSH
 
 Sonic allows you to quickly ssh into an instance.
 
-When working with AWS EC2 often times it is helpful ssh into the instance to debug.  In order to ssh into the instance the first thing you do is go to the EC2 Console and grab the public ip address.
+Often times when working with AWS EC2 it is helpful to ssh into an instance to debug.  In order to ssh into an instance the first thing you do is go to the EC2 Console and grab the public ip address.
 
 <img src="/img/tutorials/ec2-console-public-ip.png" class="doc-photo" />
 
@@ -16,11 +16,11 @@ You use that ip address to build up an ssh command for accessing the instance.
 ssh ec2-user@52.24.216.170
 ```
 
-You often have to go through this manual process of identifying the public ip address and building up the ssh command.
+You often have to go through this manual process of identifying the public ip address and building up the ssh command repeatedly.
 
 ### Usage
 
-Sonic will automatically build up the ssh command for you. Here's an example of the concise sonic ssh command.
+Sonic automatically builds up the ssh command for you. Here's an example of the sonic ssh command.
 
 ```sh
 sonic ssh i-027363802c6ff314f
@@ -32,27 +32,30 @@ The above command effectively translate to:
 ssh ec2-user@52.24.216.170
 ```
 
-By default the user that sonic uses to login to the server is `ec2-user`. This can easily be overriden at the CLI:
+By default the user that sonic uses to login to the server is `ec2-user`. This can easily be overriden:
 
 ```sh
 sonic ssh ubuntu@i-0f7f833131a51ce35
 ```
 
-The user can also be configure with a `~/.sonic/settings.yml` or the project's `.sonic/settings.yml` file like so:
+The default user can also be configure with a `~/.sonic/settings.yml` or the project's `.sonic/settings.yml` file like so:
 
 ```yaml
 user: ec2-user
 ```
 
-The `sonic ssh` command can auto-detect the proper ip address with a variety of different identifiers; it is not just limited to the instance id. This is convenient if you happen to be on a dashboard with another identifer handy.  Here are examples of other identifiers that `sonic ssh` understands.
+More information about sonic settings in available in the docs: [Settings]({% link _docs/settings.md %}).
+
+The `sonic ssh` command can auto-detect the proper ip address with a variety of different identifiers.  It is not just limited to the instance id. This is convenient in case you happen to be on a dashboard with another identifer close by and handy.  Here are examples of other identifiers that `sonic ssh` understands.
 
 ```
+sonic ssh EC2_TAG_FILTER
 sonic ssh ECS_CONTAINER_ID --cluster stag
 sonic ssh ECS_SERVICE --cluster stag
 sonic ssh ECS_TASK_ID --cluster stag
 ```
 
-Notice, that when the `sonic ssh` is passed an ECS identifier then it also requires the ECS cluster name. The commands above with the ECS identifier are normally shorten further by configuring the `~/.sonic/settings.yml` or the project's `.sonic/settings.yml` file.  Here's an example:
+Notice, that when the `sonic ssh` is passed an ECS identifier then it also requires the ECS cluster name. The commands above with the ECS identifier are normally shorten further by configuring the a [settings]({% link _docs/settings.md %}) file.  Here's an example:
 
 ```yaml
 service_cluster:
@@ -74,7 +77,7 @@ sonic ssh ECS_SERVICE
 sonic ssh ECS_TASK_ID
 ```
 
-It becomes very easy to ssh into an EC2 Container Instance with the ECS service name.  For example if the ECS service name is `hi-web-stag`.
+It then becomes very easy to ssh into an EC2 Container Instance with the ECS service name.  For example if the ECS service name is `hi-web-stag` then the command becomes.
 
 ```sh
 sonic ssh hi-web-stag
@@ -82,37 +85,10 @@ sonic ssh hi-web-stag
 
 ### Bastion Host
 
-If you have an bastion host server which provides access to your internal servers then it is even more work to build up the ssh command.  The good news is that `sonic ssh` command also automates this!
-
-Thus far we have assumed that the instances we are hopping into are publicly available on a public subnet and have an public ip address associate with it.  A common AWS setup is to have your servers on internal subnets without public addresses.  In this case we must first ssh into the bastion host and from there you can "jump" to the actually server.  This why the bastion host is also called a jump host.
-
-You can configure the `settings.yml` file again to use a bastion host. Here's an example:
-
-```yaml
-bastion: bastion.mydomain.com
-```
-
-You run the `sonic ssh` command exactly the same way:
-
-```
-sonic ssh i-0f7f833131a51ce35
-```
-
-You should notice that the built up command now includes the bastion jump host.
-
-```
-$ sonic ssh i-0f7f833131a51ce35 uptime
-=> ssh -At ec2-user@34.211.223.3 ssh ec2-user@10.10.110.135 uptime
-Warning: Permanently added '34.211.223.3' (ECDSA) to the list of known hosts.
-Warning: Permanently added '10.10.110.135' (ECDSA) to the list of known hosts.
- 18:35:18 up  1:14,  0 users,  load average: 0.24, 0.07, 0.02
-Connection to 34.211.223.3 closed.
-$
-```
+Thus far we have assumed that the instances we are hopping into are publicly available on a public subnet and have an public ip address associate with it.  A common AWS setup is to have your servers on internal subnets without public addresses.  In this case we must first ssh into the bastion host and from there we can "jump" into the actually server.  This why the bastion host is also called a jump host.
 
-Notice that the ssh command produced has the bastion jump host daisy chained in the command for you.
+If you have an bastion host server which provides access to your internal servers then it is even more work to build up the ssh command.  The good news is that the `sonic ssh` command supports bastion hosts and automates this process! The [Bastion Setup]({% link _docs/install-bastion.md %}) doc covers how to set this up.
 
-You can also specify the bastion host as a CLI option with `--bastion`, though it is recommended that you configure it in a `settings.yml` file so you don't have to type it repeatedly.
 
 <a id="prev" class="btn btn-basic" href="{% link _docs/tutorial.md %}">Back</a>
 <a id="next" class="btn btn-primary" href="{% link _docs/tutorial-ecs-exec.md %}">Next Step</a>

data/docs/_docs/tutorial.md

@@ -2,10 +2,10 @@
 title: Tutorial
 ---
 
-In the next sections, we'll walk through using sonic in detail. It turns out that easiest way to actually explain the different uses of sonic is to actually use it.
+In the next sections, we'll walk through using sonic in detail. The easiest way to learn and understand sonic is to actually use it.
 
 Let's start!
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/install.md %}">Back</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/install-bastion.md %}">Back</a>
 <a id="next" class="btn btn-primary" href="{% link _docs/tutorial-ssh.md %}">Next Step</a>
 <p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/why-ec2-run-command.md

@@ -0,0 +1,16 @@
+---
+title: Why Use EC2 Run Command
+---
+
+Why use Amazon EC2 Run Command vs just using a multi-ssh session?
+
+* Some times it is not possible to use ssh across several servers.  For example, really secured networks might have [MFA setup](TODO) so you need to authorized the requests via your phone before the command actually gets ran. In this case, you would get annoying confirmation notifications on your phone over and over as you approve each request for each of your servers.
+* EC2 Run Command provides auditability. Any command that runs the EC2 Run Command gets logged and is tracked.
+* The EC2 Run Manager has the ability to run the command in "blue/green" fashion with concurrency controls. Say you have 100 servers, you can tell EC2 Run Manager to run the command on one server first and the expodentially roll it out to the rest of the servers until the command has successfully ran on all servers.  If it the command errors then it execute can be told to halt.
+* This is all provided for free by using EC2 Run Manager.
+
+The iniitial ertia of setting up EC2 Run Manager is actually very little.  The [installation instructions]({% link _docs/install.md %}) demonstrate that installing EC2 Run Manager is literally one command.
+
+<a id="prev" class="btn btn-basic" href="{% link _docs/why.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/how-it-works.md %}">Next Step</a>
+<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/why.md

@@ -2,7 +2,7 @@
 title: Why Sonic Was Created
 ---
 
-After I exhaust debugging an ECS service with CloudWatch Logs I usually take it to the the next step: ssh into the instance. I jump into an instance with a running task or docker container and poke around to figure out the root issue.
+After I exhaust debugging an ECS service with CloudWatch Logs I usually take it to the next step: ssh into the instance. I jump into an instance with a running task or docker container and poke around to figure out the root issue.
 
 In order to find the instance with the service's docker container I click around on the ECS console website until I find the container instance's DNS name and then paste it to the terminal. While this process is not complicated, it is tedious.  For example, the typical process is:
 
@@ -22,6 +22,6 @@ By the time I get into the container, I need to remind my brain on what the orig
 
 Sonic was created to eliminate mundane infrastructure debugging tasks we normally have to do.
 
-<a id="prev" class="btn btn-basic" href="{% link _docs/settings.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/how-it-works.md %}">Next Step</a>
+<a id="prev" class="btn btn-basic" href="{% link _docs/help.md %}">Back</a>
+<a id="next" class="btn btn-primary" href="{% link _docs/why-ec2-run-command.md %}">Next Step</a>
 <p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_includes/about.html

@@ -12,7 +12,7 @@
                     <p>Sonic Screwdriver is a multi-functional tool to manage AWS infrastructure.  It's a swiss army knife type of tool and has a variety of uses. Mainly it's focus is to automate mundane repetitive tasks into simple one line commands. With it you are able to debug environments and issues quickly.</p>
                 </div>
                 <div class="col-lg-4">
-                    <p>The command that Sonic Screwdriver provides is called <code>sonic</code>.  One thing you can use it it for is to quickly ssh into an instance provided an identifer.  Another use for sonic is to ssh into the instance and run <code>docker exec</code> immediately to the container of interested. Sonic helps with these boring tasks so you can focus your mental energies on solving the actual problem at hand.</p>
+                    <p>The command that Sonic Screwdriver provides is called <code>sonic</code>.  One thing you can use it it for is to quickly ssh into an instance provided an identifer.  Another use for sonic is to ssh into the instance and run <code>docker exec</code> to jump immediately into the container. Sonic helps with these boring tasks so you can focus your mental energies on solving the actual problem at hand.</p>
                 </div>
             </div>
         </div>

data/docs/_includes/contact.html

@@ -10,7 +10,7 @@
         <div class="row">
             <div class="col-lg-12 text-center">
                 <div id="success"></div>
-                <a href="{% link quick-start.md %}" class="btn btn-primary btn-xl">Quick Start</a>
+                <a id="next" href="{% link quick-start.md %}" class="btn btn-primary btn-xl">Quick Start</a>
             </div>
         </div>
     </div>

data/docs/_includes/css/sonic.css

@@ -148,8 +148,10 @@ ul.tools li {
     margin-bottom: 15px;
 }
 
-table.ship-options td:first-child {
-    white-space: nowrap;
+@media(min-width:992px) {
+    table.ship-options td:first-child {
+        white-space: nowrap;
+    }
 }
 
 .keyboard-tip {

data/docs/_includes/css/table.css

@@ -1,51 +1,31 @@
 table {
     width: 100%;
     background-color: #4f6879;
-/*    margin: .5em 0;
-    border-radius: 5px;
-    box-shadow: 0 1px 3px rgba(0,0,0,0.3);*/
     margin-bottom: 20px;
 }
 
 thead {
-/*    border-top-left-radius: 5px;
-    border-top-right-radius: 5px;
-    color: #fff;
-    background-color: #3a3a3a;
-*/}
+}
 
 tr {
-
 }
 
 thead th {
     background-color: #475161;
     text-transform: uppercase;
     color: #cdcdce;
-/*    position: relative;
-    box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
-*/}
+}
 
 tbody {
-/*    display: table-row-group;
-    vertical-align: middle;
-    border-color: inherit;
-*/}
+}
 
 tr {
-/*    display: table-row;
-    vertical-align: inherit;
-    border-color: inherit;
-*/}
+}
 
 tbody td {
     box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
     color: #ececec;
-/*    border-top: 1px solid rgba(0,0,0,0.1);
-    box-shadow: inset 0 1px 0 rgba(255,255,255,0.1);
-    background: url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiA/Pgo8c3ZnIHhtbG5zPSJod…IgaGVpZ2h0PSIxIiBmaWxsPSJ1cmwoI2dyYWQtdWNnZy1nZW5lcmF0ZWQpIiAvPgo8L3N2Zz4=);
-    background-image: -o-linear-gradient(top, rgba(255,255,255,0.1) 0%, rgba(255,255,255,0) 100%);
-*/}
+}
 
 th,
 td {

data/docs/_includes/subnav.html

@@ -4,6 +4,7 @@
         <li><a href="{% link docs.md %}">Docs</a>
             <ul>
                 <li><a href="{% link _docs/install.md %}">Installation</a></li>
+                <li><a href="{% link _docs/install-bastion.md %}">Bastion Setup</a></li>
             </ul>
         </li>
         <li><a href="{% link _docs/tutorial.md %}">Tutorial</a>
@@ -14,22 +15,14 @@
                 <li><a href="{% link _docs/tutorial-execute.md %}">Execute</a></li>
             </ul>
         </li>
-<!--
-        <li><a href="{% link _docs/commands.md %}">Commands</a>
+        <li><a href="{% link _docs/settings.md %}">Settings</a></li>
+        <li><a href="{% link _docs/help.md %}">Help</a></li>
+        <li><a href="{% link _docs/why.md %}">Why</a>
             <ul>
-                <li><a href="{% link _docs/sonic-ssh.md %}">sonic ssh</a></li>
-                <li><a href="{% link _docs/sonic-ecs-exec.md %}">sonic ecs-exec</a></li>
-                <li><a href="{% link _docs/sonic-ecs-run.md %}">sonic ecs-run</a></li>
-                <li><a href="{% link _docs/sonic-list.md %}">sonic list</a></li>
-                <li><a href="{% link _docs/sonic-execute.md %}">sonic execute</a></li>
-                <li><a href="{% link _docs/sonic-help.md %}">sonic help</a></li>
+                <li><a href="{% link _docs/why-ec2-run-command.md %}">EC2 Run Command</a></li>
             </ul>
         </li>
--->
-        <li><a href="{% link _docs/settings.md %}">Settings</a></li>
-        <li><a href="{% link _docs/why.md %}">Why</a></li>
         <li><a href="{% link _docs/how-it-works.md %}">How It Works</a></li>
         <li><a href="{% link _docs/next-steps.md %}">Next Steps</a></li>
-        <!-- <li><a href="{% link articles.md %}">Articles</a></li> -->
     </ul>
 </div>

data/docs/quick-start.md

@@ -8,7 +8,6 @@ In a hurry? No sweat! Here's a quick overview of how to use sonic.
 
 ```sh
 brew cask install boltopslabs/software/bolts
-git clone https:///github.com/tongueroo/hi.git
 ```
 
 ### Usage
@@ -16,18 +15,22 @@ git clone https:///github.com/tongueroo/hi.git
 ```sh
 # ssh into an instance
 sonic ssh i-0f7f833131a51ce35
+sonic ssh hi-web-stag
 
 # docker exec to a running ECS docker container
 sonic ecs-exec hi-web-stag
 
-# docker run the same exact ECS docker container that is already running
+# docker run with same environment as the ECS docker running containers
 sonic ecs-run hi-web-stag
 
 # run command on 1 instance
-sonic execute -f i-0f7f833131a51ce35 uptime
+sonic execute i-0f7f833131a51ce35 uptime
 
 # run command on all instances tagged with hi-web-stag and worker
-sonic execute -f hi-web-stag,hi-worker-stag uptime
+sonic execute hi-web-stag,hi-worker-stag uptime
+
+# list ec2 instances
+sonic list hi-web-stag
 ```
 
 Congratulations! You now know the basics sonic screwdriver commands.

data/lib/sonic.rb

@@ -13,4 +13,5 @@ module Sonic
   autoload :Settings, 'sonic/settings'
   autoload :Ssh, 'sonic/ssh'
   autoload :UI, 'sonic/ui'
+  autoload :Checks, 'sonic/checks'
 end

data/lib/sonic/checks.rb

@@ -0,0 +1,46 @@
+module Sonic
+  module Checks
+    def check_cluster_exists!
+      cluster = ecs.describe_clusters(clusters: [@cluster]).clusters.first
+      unless cluster
+        UI.error "The #{@cluster.green} cluster does not exist.  Are you sure you specified the right cluster?"
+        exit 1
+      end
+    end
+
+    def check_service_exists!
+      begin
+        resp = ecs.describe_services(services: [@service], cluster: @cluster)
+      rescue Aws::ECS::Errors::ClusterNotFoundException
+        UI.error("Unable to find ECS cluster '#{@cluster}'. Are you sure the cluster exists?")
+        UI.say("You can specify the cluster with --cluster or you can specify it as a setting in settings.yml.")
+        UI.say("More info about settings available at: http://sonic-screwdriver.cloud/docs/settings")
+        exit 1
+      end
+
+      service = resp.services.first
+      unless service
+        UI.error "The #{@service.green} service does not exist in #{@cluster.green} cluster.  Are you sure you specified the right service and cluster?"
+        exit 1
+      end
+    end
+
+    def check_tasks_running!
+      if task_arns.empty?
+        puts "Unable to find a running task that belongs to the #{@service} service on the #{@cluster} cluster."
+        puts "There must be a running task in order for sonic to look up an container instance."
+        exit 1
+      end
+    end
+
+    def task_arns
+      @task_arns ||= ecs.list_tasks(cluster: @cluster, service_name: @service).task_arns
+    end
+
+    # Only need one container instance to ssh into so we'll just use the first.
+    # Useful to have this in a method for subclasses like Sonic::Exec.
+    def first_task
+      @first_task ||= ecs.describe_tasks(cluster: @cluster, tasks: [task_arns.first]).tasks.first
+    end
+  end
+end

data/lib/sonic/cli.rb

@@ -9,12 +9,14 @@ module Sonic
     class_option :bastion, desc: "Bastion jump host to use.  Defaults to no bastion server."
     class_option :project_root, desc: "Project root. Useful for testing.", hide: true
 
-    desc "ssh [IDENTIFER]", "ssh into a instance using identifier. identifer can be be service name or instance id"
+    stop_on_unknown_option! :ssh
+    desc "ssh [IDENTIFER]", "ssh into a instance using identifier. identifer can be several things: instance id, ec2 tag, ECS service name, etc"
     long_desc Help.ssh
-    def ssh(service, *command)
-      Ssh.new(service, options.merge(command: command)).run
+    def ssh(identifier, *command)
+      Ssh.new(identifier, options.merge(command: command)).run
     end
 
+    stop_on_unknown_option! :ecs_exec
     desc "ecs-exec [ECS_SERVICE]", "docker exec into running docker container associated with the service on a container instance"
     long_desc Help.ecs_exec
     def ecs_exec(service, *command)
@@ -22,6 +24,7 @@ module Sonic
     end
 
     # Cannot name the command run because that is a reserved Thor keyword :(
+    stop_on_unknown_option! :ecs_run
     desc "ecs-run [ECS_SERVICE]", "docker run with the service on a container instance"
     long_desc Help.ecs_run
     def ecs_run(service, *command)
@@ -29,20 +32,19 @@ module Sonic
     end
 
     stop_on_unknown_option! :execute
-    check_unknown_options! :except => :execute
-    desc "execute [COMMAND]", "runs command across fleet of servers via AWS Run Command"
+    desc "execute [FILTER] [COMMAND]", "runs command across fleet of servers via AWS Run Command"
     long_desc Help.execute
-    option :filter, aliases: '-f', type: :string, required: true, desc: "Filter ec2 instances by tag name or instance_ids separated by commas"
-    def execute(*command)
-      Execute.new(command, options).execute
+    # filter - Filter ec2 instances by tag name or instance_ids separated by commas
+    def execute(filter, *command)
+      Execute.new(command, options.merge(filter: filter)).execute
     end
 
-    desc "list", "lists ec2 instances"
+    desc "list [FILTER]", "lists ec2 instances"
     long_desc Help.list
     option :header, type: :boolean, desc: "Displays header"
-    option :filter, aliases: '-f', type: :string, desc: "Filter ec2 instances by tag name or instance_ids separated by commas"
-    def list
-      List.new(options).run
+    # filter - Filter ec2 instances by tag name or instance_ids separated by commas
+    def list(filter)
+      List.new(options.merge(filter: filter)).run
     end
   end
 end

data/lib/sonic/cli/help.rb

@@ -94,13 +94,14 @@ EOL
 
         def execute
 <<-EOL
-Run as a command across a list of servers. A filter must be provided.  The filter can be a mix of instance ids and ec2 tags. sonic execute will auto-detect the what type of filter it is and send it properly to EC2 Run Command.
+Run as a command across a list of servers. A filter must be provided.  The filter can be a mix of instance ids and ec2 tags. This command can also take a path to a file. To specify a path to a file use file:// at the beginning of your file.
 
 Examples:
 
-$ sonic execute --filter hi-web-prod uptime
-$ sonic execute --filter hi-web-prod,hi-worker-prod,hi-clock-prod uptime
-$ sonic execute --filter i-030033c20c54bf149,i-030033c20c54bf150 uname -a
+$ sonic execute hi-web-prod uptime
+$ sonic execute hi-web-prod,hi-worker-prod,hi-clock-prod uptime
+$ sonic execute i-030033c20c54bf149,i-030033c20c54bf150 uname -a
+$ sonic execute i-030033c20c54bf149 file://hello.sh
 
 You cannot mix instance ids and tag names in the filter.
 EOL
@@ -113,13 +114,13 @@ List ec2 servers. A filter must be provided.  The filter can be a mix of instanc
 Examples:
 
 $ sonic list
-$ sonic list --filter hi-web-prod
-$ sonic list --filter hi-web-prod,hi-clock-prod
-$ sonic list --filter i-09482b1a6e330fbf7
+$ sonic list hi-web-prod
+$ sonic list hi-web-prod,hi-clock-prod
+$ sonic list i-09482b1a6e330fbf7
 
 Example Output:
 
-$ sonic list --filter i-09482b1a6e330fbf7 --header
+$ sonic list i-09482b1a6e330fbf7 --header
 Instance Id Public IP Private IP  Type
 i-09482b1a6e330fbf7 54.202.152.168  172.31.21.108 t2.small
 $

data/lib/sonic/docker.rb

@@ -2,6 +2,8 @@ require 'fileutils'
 
 module Sonic
   class Docker < Ssh
+    include Checks
+
     def exec
       call("/tmp/sonic/bash_scripts/docker-exec.sh")
     end
@@ -88,7 +90,7 @@ module Sonic
     #   * image
     def create_container_data
       # For container env_vars and image info.
-      task_definition_arn = task.task_definition_arn # task is a method in the superclass: Ssh
+      task_definition_arn = first_task.task_definition_arn # task is a method in the superclass: Ssh
       response = ecs.describe_task_definition(task_definition: task_definition_arn)
       task_definition = response.to_h[:task_definition]
       container_definition = task_definition[:container_definitions].first # assumes care about the first container definition

data/lib/sonic/list.rb

@@ -8,17 +8,27 @@ module Sonic
     end
 
     def run
-      options = transform_filter_option(@filter)
+      filter_options = transform_filter_option(@filter)
       if @options[:noop]
         instances = []
       else
-        instances = ec2_resource.instances(options)
+        begin
+          instances = ec2_resource.instances(filter_options)
+          instances.count # force eager loading
+        rescue Aws::EC2::Errors::InvalidInstanceIDNotFound => e
+          # ERROR: The instance ID 'i-066b140d9479e9682' does not exist
+          UI.error(e.message)
+          exit 1
+        end
       end
       display(instances)
     end
 
     def display(instances)
-      if @options[:header]
+      zero_instances = instances.count == 0
+      UI.say("No instances found with the filter #{@filter.join('')}") if zero_instances
+
+      if @options[:header] && !zero_instances
         UI.say "Instance Id\tPublic IP\tPrivate IP\tType".colorize(:green)
       end
 

data/lib/sonic/ssh.rb

@@ -104,7 +104,7 @@ private
     # -t = Force pseudo-terminal allocati
     def build_ssh_command
       ssh = ["ssh"] + ssh_options
-      ssh += ["-At", bastion_host, "ssh"] if @bastion
+      ssh += ["-At", bastion_host, "ssh"] + ssh_options if @bastion
       # ssh_host is internal ip when bastion is set
       # ssh_host is public ip when bastion is not set
       ssh += ["-At", ssh_host]

data/lib/sonic/ssh/identifier_detector.rb

@@ -5,6 +5,7 @@ class Ssh
 
     include Ec2Tag
     include AwsServices
+    include Checks
 
     def initialize(cluster, service, identifier, options)
       @cluster = cluster
@@ -27,7 +28,7 @@ class Ssh
           check_service_exists!
           check_tasks_running!
 
-          find_container_instance(task.container_instance_arn)
+          find_container_instance(first_task.container_instance_arn)
         when :ec2_tag
           find_ec2_instance
         when :ec2_instance
@@ -72,53 +73,9 @@ class Ssh
         exit 1
       end
 
-      find_container_instance(task.container_instance_arn)
+      find_container_instance(first_task.container_instance_arn)
     end
 
-    def check_cluster_exists!
-      cluster = ecs.describe_clusters(clusters: [@cluster]).clusters.first
-      unless cluster
-        UI.error "The #{@cluster.green} cluster does not exist.  Are you sure you specified the right cluster?"
-        exit 1
-      end
-    end
-
-    def check_service_exists!
-      begin
-        resp = ecs.describe_services(services: [@service], cluster: @cluster)
-      rescue Aws::ECS::Errors::ClusterNotFoundException
-        UI.error("Unable to find ECS cluster '#{@cluster}'. Are you sure the cluster exists?")
-        UI.say("You can specify the cluster with --cluster or you can specify it as a setting in settings.yml.")
-        UI.say("More info about settings available at: http://sonic-screwdriver.cloud/docs/settings")
-        exit 1
-      end
-
-      service = resp.services.first
-      unless service
-        UI.error "The #{@service.green} service does not exist in #{@cluster.green} cluster.  Are you sure you specified the right service and cluster?"
-        exit 1
-      end
-    end
-
-    def check_tasks_running!
-      if task_arns.empty?
-        puts "Unable to find a running task that belongs to the #{@service} service on the #{@cluster} cluster."
-        puts "There must be a running task in order for sonic to look up an container instance."
-        exit 1
-      end
-    end
-
-    def task_arns
-      @task_arns ||= ecs.list_tasks(cluster: @cluster, service_name: @service).task_arns
-    end
-
-    # Only need one container instance to ssh into so we'll just use the first.
-    # Useful to have this in a method for subclasses like Sonic::Exec.
-    def task
-      @task ||= ecs.describe_tasks(cluster: @cluster, tasks: [task_arns.first]).tasks.first
-    end
-
-
     # Examples:
     #
     # Container instance ids:

data/lib/sonic/version.rb

@@ -1,3 +1,3 @@
 module Sonic
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/spec/lib/cli_spec.rb

@@ -17,12 +17,12 @@ describe Sonic::CLI do
     end
 
     it "execute should print that command has been sent" do
-      out = execute("bin/sonic execute #{@args} --filter 1,2,3 uptime")
+      out = execute("bin/sonic execute #{@args} 1,2,3 uptime")
       expect(out).to include("Command sent")
     end
 
     it "list should list running instances" do
-      out = execute("bin/sonic list #{@args} --filter 1,2,3 --header")
+      out = execute("bin/sonic list #{@args} 1,2,3 --header")
       expect(out).to include("Instance Id")
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sonic-screwdriver
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -174,22 +174,18 @@ files:
 - docs/LICENSE
 - docs/README.md
 - docs/_config.yml
-- docs/_docs/commands.md
+- docs/_docs/help.md
 - docs/_docs/how-it-works.md
+- docs/_docs/install-bastion.md
 - docs/_docs/install.md
 - docs/_docs/next-steps.md
 - docs/_docs/settings.md
-- docs/_docs/sonic-ecs-exec.md
-- docs/_docs/sonic-ecs-run.md
-- docs/_docs/sonic-execute.md
-- docs/_docs/sonic-help.md
-- docs/_docs/sonic-list.md
-- docs/_docs/sonic-ssh.md
 - docs/_docs/tutorial-ecs-exec.md
 - docs/_docs/tutorial-ecs-run.md
 - docs/_docs/tutorial-execute.md
 - docs/_docs/tutorial-ssh.md
 - docs/_docs/tutorial.md
+- docs/_docs/why-ec2-run-command.md
 - docs/_docs/why.md
 - docs/_includes/about.html
 - docs/_includes/commands.html
@@ -232,6 +228,7 @@ files:
 - docs/img/logos/boltops-logo.png
 - docs/img/sonic-screwdriver.jpg
 - docs/img/tutorials/ec2-console-public-ip.png
+- docs/img/tutorials/ec2-console-run-command.png
 - docs/img/ufo.jpg
 - docs/index.html
 - docs/js/bootstrap.js
@@ -252,6 +249,7 @@ files:
 - lib/bash_scripts/docker-run.sh
 - lib/sonic.rb
 - lib/sonic/aws_services.rb
+- lib/sonic/checks.rb
 - lib/sonic/cli.rb
 - lib/sonic/cli/help.rb
 - lib/sonic/command.rb

data/docs/_docs/commands.md

@@ -1,10 +0,0 @@
----
-title: Commands
----
-
-The [tutorial]({% link _docs/tutorial.md %}) does a great job of covering the main sonic commands and overall usage.  In the next sections we'll cover the sonic commands in more detail.
-
-<a id="prev" class="btn btn-basic" href="{% link _docs/tutorial-execute.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/sonic-ssh.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>
-

data/docs/_docs/sonic-ecs-exec.md

@@ -1,7 +0,0 @@
----
-title: sonic ecs-exec
----
-
-<a id="prev" class="btn btn-basic" href="{% link _docs/sonic-ssh.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/sonic-ecs-run.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/sonic-ecs-run.md

@@ -1,7 +0,0 @@
----
-title: sonic ecs run
----
-
-<a id="prev" class="btn btn-basic" href="{% link _docs/sonic-ecs-exec.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/sonic-list.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/sonic-execute.md

@@ -1,7 +0,0 @@
----
-title: sonic execute
----
-
-<a id="prev" class="btn btn-basic" href="{% link _docs/sonic-list.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/sonic-help.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/sonic-help.md

@@ -1,7 +0,0 @@
----
-title: sonic help
----
-
-<a id="prev" class="btn btn-basic" href="{% link _docs/sonic-execute.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/settings.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/sonic-list.md

@@ -1,7 +0,0 @@
----
-title: sonic list
----
-
-<a id="prev" class="btn btn-basic" href="{% link _docs/sonic-ecs-run.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/sonic-execute.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>

data/docs/_docs/sonic-ssh.md

@@ -1,7 +0,0 @@
----
-title: sonic-ssh
----
-
-<a id="prev" class="btn btn-basic" href="{% link _docs/commands.md %}">Back</a>
-<a id="next" class="btn btn-primary" href="{% link _docs/sonic-ecs-exec.md %}">Next Step</a>
-<p class="keyboard-tip">Pro tip: Use the <- and -> arrow keys to move back and forward.</p>