forger 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b3aa8428858adf323d614a2ad2d417ef111ecba07ed47f921ded9971b687e32
-  data.tar.gz: 954cade32be1581361774f9ef33d2aac9a6b4cc37006b7a60fb28eddf2f3fde8
+  metadata.gz: 340a28a488dc3c34656915eb88430cee1fc377b712165788c0e6c1e6afa1b612
+  data.tar.gz: 5dde1b9ffbea73b11a40ee85858ef10804cf0607b150e8b436b0fe970f5a3f66
 SHA512:
-  metadata.gz: 26d8d1882ce393975e3b0721eacaec3c36e6abfeba8b72093260872b1d56ab158c967669d8991b7d7030938f7bd2e1b9906b607d7257ba9b3e5faa110f0e561e
-  data.tar.gz: 5cf53ac7391f7ae681b0f8951e3b7b923e11e05e29f65437ea7769db3c858b149f915a295f013a9a84f26916d1514e6633734c7a177fd962b3d052c0cb1e99ad
+  metadata.gz: 7817efc24a8a92c8e2556be1dd9cf19699f6163aeca5eca18a74f3d28b3e153eb679f7912890f4e4e87d58bf671ebd8eb05afe4cdcf5c7a6b653b9a9747b3e65
+  data.tar.gz: 84540f40d6a9acaf3f5f5e359f51c2e2c8419f398ed4ae58714049cc2f1bee04bc65b37069c0b51b7141b9512e7862977113a9ec57d3a2d05c6c58051cc8f511

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 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.5.1]
+- allow setting s3 endpoint to allow different s3 bucket region from instance
+- remove user-data.txt log from cloudwatch
+- update notes
+
 ## [1.5.0]
 - rename to forger
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    forger (1.4.9)
+    forger (1.5.1)
       activesupport
       aws-sdk-ec2
       aws-sdk-s3
@@ -36,7 +36,7 @@ GEM
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.2)
-    byebug (10.0.1)
+    byebug (10.0.2)
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
     coderay (1.1.2)
@@ -44,7 +44,7 @@ GEM
     concurrent-ruby (1.0.5)
     diff-lcs (1.3)
     docile (1.1.5)
-    dotenv (2.2.1)
+    dotenv (2.2.2)
     ffi (1.9.23)
     filesize (0.1.1)
     formatador (0.2.5)
@@ -75,7 +75,7 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    lumberjack (1.0.12)
+    lumberjack (1.0.13)
     method_source (0.9.0)
     minitest (5.11.3)
     nenv (0.3.0)

data/README.md

@@ -146,7 +146,6 @@ You can set variables in a config file and they are available when ERB is availa
 
 ```yaml
 ---
-vpc_id: vpc-123
 subnets:
   - subnet-123
   - subnet-456

data/docs/example/config/development.yml

@@ -1,5 +1,4 @@
 ---
-vpc_id: vpc-111
 subnets:
   - subnet-111
   - subnet-222

data/lib/forger/script/upload.rb

@@ -69,7 +69,17 @@ class Forger::Script
     end
 
     def s3_resource
-      @s3_resource ||= Aws::S3::Resource.new
+      return @s3_resource if @s3_resource
+
+      options = {}
+      # allow override of region for s3 client to avoid warning:
+      # S3 client configured for "us-east-1" but the bucket "xxx" is in "us-west-2"; Please configure the proper region to avoid multiple unnecessary redirects and signing attempts
+      # Example: endpoint: 'https://s3.us-west-2.amazonaws.com'
+      options[:endpoint] = ENV['S3_ENDPOINT'] if ENV['S3_ENDPOINT']
+      if options[:endpoint]
+        options[:region] = options[:endpoint].split('.')[1]
+      end
+      @s3_resource = Aws::S3::Resource.new(options)
     end
 
     # http://stackoverflow.com/questions/4175733/convert-duration-to-hoursminutesseconds-or-similar-in-rails-3-or-ruby

data/lib/forger/scripts/cloudwatch/configure.sh

@@ -58,12 +58,6 @@ log_group_name = ${LOG_GROUP_NAME}
 log_stream_name = {instance_id}/var/log/audit/audit.log
 datetime_format =
 
-[/var/lib/cloud/instance/user-data.txt]
-file = /var/lib/cloud/instance/user-data.txt
-log_group_name = ${LOG_GROUP_NAME}
-log_stream_name = {instance_id}/var/lib/cloud/instance/user-data.txt
-datetime_format =
-
 [/var/log/messages]
 file = /var/log/messages
 log_group_name = ${LOG_GROUP_NAME}

data/lib/forger/version.rb

@@ -1,3 +1,3 @@
 module Forger
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/spec/fixtures/demo_project/config/test.yml

@@ -1,6 +1,4 @@
 ---
-vpc_id: vpc-123
-db_subnet_group_name: default # default db subnet group associated with default vpc
 subnets:
   - subnet-123
   - subnet-456

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forger
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-18 00:00:00.000000000 Z
+date: 2018-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -285,7 +285,7 @@ files:
 - lib/forger/script/templates/auto_terminate.sh
 - lib/forger/script/templates/auto_terminate_after_timeout.sh
 - lib/forger/script/templates/cloudwatch.sh
-- lib/forger/script/templates/extract_aws_ec2_scripts.sh
+- lib/forger/script/templates/extract_forger_scripts.sh
 - lib/forger/script/upload.rb
 - lib/forger/scripts/auto_terminate.sh
 - lib/forger/scripts/auto_terminate/after_timeout.sh