forger 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b57dbd9ed6cebe6d22408d9eedc61c2a4f0398ee4d37f806f293a91344c2caf6
-  data.tar.gz: f5a6ac3e67e166cd1a12e4abb10b0080b4912ae51fb41d170de9cd76690d5e0e
+  metadata.gz: 833f4ee033176e828f5a04b0fd2fce2544a335113156304db55d24c3b35f2427
+  data.tar.gz: e75cf80f65bead5108455185132b1a03de4ce5421349a0eb7c5bbd7c572afeba
 SHA512:
-  metadata.gz: a8f11584373cedf9d2c8f20c05219d9094c65b081669210b045a55ce4ef87cde4b575e10dce7ef34670ab3fd16b0f8859dd3be8fced63189233c5a22b6a8359f
-  data.tar.gz: 3c99722189cf579ff8f2b943bf17f0d5fd543242d6a2e5e9b13ddda807986b5ca47e684dbb0b5481781b7f802de959b03e1d7497575b1b4792d137a7baac3421
+  metadata.gz: 4114553f5e2cc98fd4d7dae6409652ad03fa16cf49f9c658974b164b8146233a974359f2466cdcb9da05b776580dc8243be87557173acd31f93ba0eedacf07de
+  data.tar.gz: 99905c00a84d3ae79e2155044e40024d98acbd684438f7a4f4597b298810d427b385026d3c326e281a97c63f239b778ea95366c22cc33e8b798a8c5fa376025d

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.
 
+## [2.0.2]
+- Merge pull request #14 from tongueroo/fixes
+- allow cloudwatch support for amzn ami
+- rename cloudwatch group to forger
+- stop user data when there are errors
+
 ## [2.0.1]
 - Merge pull request #13 from tongueroo/aws-config-fix
 - configure_aws_cli: always write ~/.aws/config

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    forger (2.0.1)
+    forger (2.0.2)
       activesupport
       aws-sdk-ec2
       aws-sdk-s3
@@ -22,19 +22,19 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aws-eventstream (1.0.1)
-    aws-partitions (1.105.0)
-    aws-sdk-core (3.30.0)
+    aws-partitions (1.106.0)
+    aws-sdk-core (3.35.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.50.0)
+    aws-sdk-ec2 (1.54.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-kms (1.9.0)
+    aws-sdk-kms (1.11.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.21.0)
+    aws-sdk-s3 (1.23.0)
       aws-sdk-core (~> 3, >= 3.26.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
@@ -67,7 +67,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashie (3.6.0)
-    i18n (1.1.0)
+    i18n (1.1.1)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     listen (3.1.5)
@@ -99,7 +99,7 @@ GEM
       rspec-mocks (~> 3.8.0)
     rspec-core (3.8.0)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
     rspec-mocks (3.8.0)

data/README.md

@@ -2,7 +2,7 @@
 
 [![CircleCI](https://circleci.com/gh/tongueroo/forger.svg?style=svg)](https://circleci.com/gh/tongueroo/forger)
 
-Tool to create AWS ec2 instances consistently with pre-configured settings.  The pre-configured settings are stored in the profiles folder of the current project directory.
+Tool to create AWS EC2 instances consistently with pre-configured settings.  The pre-configured settings are stored in the profiles folder of the current project directory.
 Example:
 
 * profiles/default.yml: Default settings. Used when no profile is specified.
@@ -42,7 +42,7 @@ You can do a test run with the `--noop` flag.  This will print out what settings
 
 ## Conventional Profile Name
 
-If there is a profile name that matches the ec2 specified instance name, you can omit the `--profile` flag. Example
+If there is a profile name that matches the EC2 specified instance name, you can omit the `--profile` flag. Example
 
     forger create webserver --profile webserver
     forger create webserver # same as above
@@ -232,6 +232,16 @@ Spot instance is natively supported by the AWS `run_instances` command by adding
 
 An example of a spot instance profile is provided in [example/profiles/spot.yml](docs/example/profiles/spot.yml).
 
+## CloudWatch Support
+
+The output of the logs like `/var/log/cloud-init-output.log` can get sent to CloudWatch. This gets enabled with the `--cloudwatch` flag.  Example:
+
+    forger create myserver --cloudwatch
+
+CloudWatch support only works for some OSes and is still somewhat experimental.  Here's the OS check in the source: [lib/forger/scripts/cloudwatch.sh](https://github.com/tongueroo/forger/blob/master/lib/forger/scripts/cloudwatch.sh#L16).
+
+Note, CloudWatch logs take a few seconds to send from the EC2 instance to CloudWatch. So when using the `--auto-terminate` option the instance might be terminated before all the logs get sent.  So you might not capture all the logs. You can add a sleep 10 at the bottom of your user-data script if you think this is happening.
+
 ## More Help
 
     forger create help

data/lib/forger/cli.rb

@@ -18,7 +18,7 @@ module Forger
 
     long_desc Help.text(:new)
     New.cli_options.each do |args|
-      option *args
+      option(*args)
     end
     register(New, "new", "new NAME", "Generates new forger project")
 

data/lib/forger/create/info.rb

@@ -72,14 +72,14 @@ class Forger::Create
 
       region = cloudwatch_log_region
       stream = "#{instance_id}/var/log/cloud-init-output.log"
-      url = "https://#{region}.console.aws.amazon.com/cloudwatch/home?region=#{region}#logEventViewer:group=ec2;stream=#{stream}"
-      cw_init_log = "cw tail -f ec2 #{stream}"
+      url = "https://#{region}.console.aws.amazon.com/cloudwatch/home?region=#{region}#logEventViewer:group=forger;stream=#{stream}"
+      cw_init_log = "cw tail -f forger #{stream}"
       puts "To view instance's cloudwatch logs visit:"
       puts "  #{url}"
 
       puts "  #{cw_init_log}" if show_cw
       if show_cw && @options[:auto_terminate]
-        cw_terminate_log = "cw tail -f ec2 #{instance_id}/var/log/auto-terminate.log"
+        cw_terminate_log = "cw tail -f forger #{instance_id}/var/log/auto-terminate.log"
         puts "  #{cw_terminate_log}"
       end
 

data/lib/forger/script/templates/cloudwatch.sh

@@ -1,3 +1,3 @@
 #!/bin/bash -eux
 
-/opt/forger/cloudwatch.sh ec2
+/opt/forger/cloudwatch.sh forger # forger will be the cloudwatch log group name

data/lib/forger/script/templates/extract_forger_scripts.sh

@@ -1,5 +1,9 @@
 #!/bin/bash -eux
 
+# extract forger happens very early and the top of the user data script.
+# Set the -e flag here to stop the script if there any errors.
+set -e
+
 # Downloads and extract the scripts.
 # The extracted folder from github looks like this:
 #   branch-name.tar.gz => forger-branch-name

data/lib/forger/scripts/cloudwatch.sh

@@ -13,7 +13,7 @@ LOG_GROUP_NAME=$1
 # shellcheck disable=SC1091
 source "/opt/forger/shared/functions.sh"
 OS=$(os_name)
-if [ "$OS" != "amazonlinux2" ] && [ "$OS" != "ubuntu" ] ; then
+if [ "$OS" != "amzn" ] && [ "$OS" != "amazonlinux2" ] && [ "$OS" != "ubuntu" ] ; then
   echo "Sorry, cloudwatch logging with the forger tool is supported for amazonlinux2 and ubuntu only"
   exit
 fi

data/lib/forger/scripts/cloudwatch/service/amzn.sh

@@ -14,3 +14,5 @@ script
   chkconfig awslogs on
 end script
 EOL
+
+start awslogs

data/lib/forger/version.rb

@@ -1,3 +1,3 @@
 module Forger
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/lib/templates/default/README.md

@@ -41,8 +41,8 @@ It is useful to verify that the instance has launched and completed its bootstra
     EC2 instance box created: i-03f3c96eaec8ea359 🎉
     Visit https://console.aws.amazon.com/ec2/home to check on the status
     To view instance's cloudwatch logs visit:
-      https://us-east-1.console.aws.amazon.com/cloudwatch/home?region=us-east-1#logEventViewer:group=ec2;stream=i-03f3c96eaec8ea359/var/log/cloud-init-output.log
-      cw tail -f ec2 i-03f3c96eaec8ea359/var/log/cloud-init-output.log
+      https://us-east-1.console.aws.amazon.com/cloudwatch/home?region=us-east-1#logEventViewer:group=forger;stream=i-03f3c96eaec8ea359/var/log/cloud-init-output.log
+      cw tail -f forger i-03f3c96eaec8ea359/var/log/cloud-init-output.log
     Note: It takes a little time for the instance to launch and report logs.
     Pro tip: The CloudWatch Console Link has been added to your copy-and-paste clipboard.
     $

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forger
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport