ecs-easy-cluster 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79863dc07a8eab32cf0fceccdf7551ce5e2dccd2
-  data.tar.gz: 466d0dd80e222094cc0041f414e81bb113fb50c3
+  metadata.gz: 9f43b098142b1ec41091702d773f503ac1f9cde1
+  data.tar.gz: f212ffa392b6fc9c39f43b9d2eb6657484d9968f
 SHA512:
-  metadata.gz: b63e90c6af6f3dff5b65f622f6e7f3af1c922292c1dc8a18aa9e57810a4a413707f0e564dea18bd101b7e6238f99b5e78b5fb6ea799db24b0fd3d03023fcacf9
-  data.tar.gz: 42c45c024ccc3feb0b64893159d2ced1e005b11ee44aca55fccad644b3a4d446f1a1fbf561dcbda60f8a637562928f4a12d30b5975b2197d94a5c52178f49b6e
+  metadata.gz: 25bab6267329d2bb178e677ba832fe52fb683bb325dae65e4a910772e69710dce1b13cf875935b78054e22c04f9dc2a5cbdcaa553aee3c946e0381001e78ee32
+  data.tar.gz: 07e5b1a9a28842e0ce540146fda934a64d7c3730b3b2faf1bbe900e279603f6e85fdb103f370aa7cd3131954272f32d9625a3de38e32deff8c387b2dd2238ec0

data/.gitignore

@@ -20,3 +20,5 @@ tmp
 *.o
 *.a
 mkmf.log
+
+README.private.md

data/README.md

@@ -19,7 +19,7 @@ Or install it yourself as:
 
 ## Usage
 
-```
+```ruby
 require "ecs/easy/cluster"
 
 #
@@ -41,6 +41,10 @@ instance = Ecs::Easy::Instance.new do |i|
   i.vpc       = "vpc-00000000"
   i.image_id  = "ami-00000000"
   i.security_group = "sg-00000000"
+  # Currently user_data allows only /bin/bash
+  i.user_data = [
+    "echo 'xxxxxxxx' >> /home/ec2-user/.ssh/authorized_keys\n",
+  ]
 end
 
 # 

data/lib/ecs/easy/cluster.rb

@@ -11,7 +11,7 @@ require "ecs/easy/instance"
 #   c.region = ""
 # end
 # instance = Ecs::Easy::Instance.new do |i|
-#   i.instance_type = "t2.nano"
+#   i.type      = "t2.nano"
 #   i.keypair   = "your-keypair"
 #   i.azs       = "ap-northeast-1a,ap-northeast-1c"
 #   i.subnets   = "subnet-00000000,subnet-11111111"

data/lib/ecs/easy/cluster/base.rb

@@ -1,9 +1,6 @@
 module Ecs::Easy::Cluster
   class Base
 
-    TEMPLATE_PATH = File.expand_path("../config/cloudformation_template.json", __FILE__)
-    TEMPLATE_BODY = File.read( TEMPLATE_PATH )
-
     attr_reader :name, :configure, :ecs_client, :stack_name, :cfn_client
     attr_accessor :instance, :min_instances, :max_instances
 
@@ -88,9 +85,10 @@ module Ecs::Easy::Cluster
         ecs_client.create_cluster( cluster_name: name )
 
         params = instance.cfn_parameters( name, "AsgMaxSize" => min_instances.to_s)
+        template_body = instance.template_body
         cfn_client.create_stack(
           stack_name: stack_name,
-          template_body: TEMPLATE_BODY,
+          template_body: template_body,
           parameters: params,
           capabilities: ["CAPABILITY_IAM"],
           on_failure: "DELETE",
@@ -116,9 +114,10 @@ module Ecs::Easy::Cluster
       size = (num_instances+1 <= max_instances) ? num_instances+1 : max_instances
 
       params = instance.cfn_parameters( name, "AsgMaxSize" => size.to_s)
+      template_body = instance.template_body
       cfn_client.update_stack(
         stack_name: stack_name,
-        template_body: TEMPLATE_BODY,
+        template_body: template_body,
         parameters: params,
         capabilities: ["CAPABILITY_IAM"],
       )
@@ -142,9 +141,10 @@ module Ecs::Easy::Cluster
     # TODO: Support idling check of container instances
     def shrink!
       params = instance.cfn_parameters( name, "AsgMaxSize" => min_instances.to_s)
+      template_body = instance.template_body
       cfn_client.update_stack(
         stack_name: stack_name,
-        template_body: TEMPLATE_BODY,
+        template_body: template_body,
         parameters: params,
         capabilities: ["CAPABILITY_IAM"],
       )

data/lib/ecs/easy/cluster/version.rb

@@ -1,7 +1,7 @@
 module Ecs
   module Easy
     module Cluster
-      VERSION = "0.0.5"
+      VERSION = "0.0.6"
     end
   end
 end

data/lib/ecs/easy/instance.rb

@@ -2,13 +2,17 @@ module Ecs
   module Easy
     class Instance
 
+      TEMPLATE_PATH = File.expand_path("../cluster/config/cloudformation_template.json", __FILE__)
+      TEMPLATE_BODY = File.read( TEMPLATE_PATH )
+
       attr_accessor :type, 
         :keypair, 
         :azs, # availability zones
         :subnets, 
         :vpc, 
         :image_id, 
-        :security_group
+        :security_group,
+        :user_data
 
       def initialize **params
         params.each do |k,v|
@@ -17,6 +21,26 @@ module Ecs
         yield( self ) if block_given?
       end
 
+      def custom_user_data
+        default_user_data = [
+          "#!/bin/bash\n",
+          "echo ECS_CLUSTER=",
+          {
+            "Ref" => "EcsCluster"
+          },
+          " >> /etc/ecs/ecs.config\n"
+        ]
+        default_user_data.concat(user_data)
+      end
+
+      def template_body
+        return TEMPLATE_BODY if user_data.nil? or user_data.empty?
+        body = JSON.parse( TEMPLATE_BODY )
+        body["Resources"]["EcsInstanceLc"]["Properties"]["UserData"]["Fn::Base64"]["Fn::Join"][1] = custom_user_data
+        body["Resources"]["EcsInstanceLcWithoutKeyPair"]["Properties"]["UserData"]["Fn::Base64"]["Fn::Join"][1] = custom_user_data
+        return JSON.pretty_generate( body )
+      end
+
       # Generate the parameters for cloudformation
       def cfn_parameters( cluster_name, params={} )
         base_params = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecs-easy-cluster
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - metheglin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-27 00:00:00.000000000 Z
+date: 2017-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk