cloudformation-tool 0.8.2 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0958cc43bb5fc00d7d4d53438057ac2c9f68785d36cc2ed13c3e9b531b3375af
-  data.tar.gz: cf3419fa84ba8ad821e711265ae0f57708260bcf4eba0f3e0745541fd74dd07e
+  metadata.gz: 16196dd229f1e0040b4b06190e90da9d72dbef2e33ac545055f08a89b3a20339
+  data.tar.gz: 93bc3913458bd350dea067ccd4c7e4ea6562c760f418f17d7b4d34eb918cf1cc
 SHA512:
-  metadata.gz: e3f5e4044bee47fc8d1e106c14165134cffa7f7d65585ac3621bd3f6042ad1344fb2f7edc521ff19fdea1ea66503f4e70fb1fdb740f25d5ec9200171f42275cb
-  data.tar.gz: 1211723227d2c09c9569d315b52105a7cccb825fcbe79d4da56af53f9489696f610befd556fce4c4e877a3ba1d2c61e8a7b3847699b95f7e6683139906eede3b
+  metadata.gz: 685f2098bfb4278a779683c65fe35937b23a35e9470519a9f2747a912412b13e5229ef81d86c57489170d7a9b88cbb5cb88b2933746cf1fd75786f67b32725ce
+  data.tar.gz: 33278d66726b92d7a9cec30f54499be8b05ab2eab17b9922e42d212e4f66cafc94aa929d2687482bcc1e6373c51975138501ec35c6c053cb7df35901d90a6a77

data/lib/cloud_formation_tool/cli/main.rb

@@ -36,6 +36,7 @@ module CloudFormationTool
       subcommand 'delete', "Delete an existing stack", Delete
       subcommand 'servers', 'List stack resources', Servers
       subcommand 'recycle', 'Recycle servers in an auto scaling group', Recycle
+      subcommand 'scale', 'Set the number of desired servesr in an auto scaling group', Scale
       subcommand 'output', 'Retrieve output values from the stack', Output
     end
   end

data/lib/cloud_formation_tool/cli/scale.rb

@@ -0,0 +1,48 @@
+module CloudFormationTool
+  module CLI
+    
+    class Scale < Clamp::Command
+      include CloudFormationTool
+      
+      parameter "STACK_NAME", "Name of the stack to recycle servers in"
+      parameter "ASG_NAME", "Name of the auto scaling group in which to recycle all servers"
+      parameter "SCALE", "Number of servers desired"
+      
+      def grpstate(grp)
+        grp.instances.collect { |i| i.lifecycle_state }.reduce({}) { |m,s| m[s] = (m[s] || 0) + 1; m }
+      end
+      
+      def grpstatedesc(grp)
+        grpstate(grp).collect{|s,c|"#{c} #{s}"}.join(", ")
+      end
+      
+      def stable_scale(grp, scale)
+        state = grpstate(grp)
+        state["InService"].eql? scale.to_i and state.delete_if{|k|k.eql? "InService"}.empty?
+      end
+      
+      def execute
+        #log "Starting scale operations"
+        st = CloudFormation::Stack.new(stack_name)
+        st.asgroups.select do |res|
+          #log "Checking group #{res.logical_resource_id}"
+          asg_name.nil? or (res.logical_resource_id == asg_name)
+        end.collect do |res|
+          #log "Scaling #{res.logical_resource_id}"
+          Thread.new do
+            grp = res.group
+            #log "Current capacity: #{grp.desired_capacity}, setting to #{scale}"
+            grp.set_desired_capacity(desired_capacity: scale)
+            last_state = nil
+            until stable_scale(grp, scale)
+              log "Current scaling status: #{last_state = grpstatedesc(grp)}" unless last_state.eql? grpstatedesc(grp)
+              sleep 3
+              grp.reload
+            end
+            log "Done updating - current scale: #{grpstatedesc(grp)}"
+          end
+        end.each(&:join)
+      end
+    end
+  end
+end

data/lib/cloud_formation_tool/cli/servers.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'aws-sdk-ec2'
 
 module CloudFormationTool
   module CLI

data/lib/cloud_formation_tool/cloud_formation/stack.rb

@@ -1,3 +1,6 @@
+require 'aws-sdk-cloudformation'
+require 'aws-sdk-autoscaling'
+
 module CloudFormationTool
   class CloudFormation
     

data/lib/cloud_formation_tool/cloud_formation.rb

@@ -172,7 +172,7 @@ module CloudFormationTool
           elsif (key == "Code") and (val["Path"])
             path = resolveVal(val["Path"])
             if path.is_a? String # resolving works
-              LambdaCode.new(path: "#{@basedir}/#{path}").to_cloudformation
+              LambdaCode.new(path: if path.start_with? "/" then path else "#{@basedir}/#{path}" end).to_cloudformation
             else # resolving didn't work - we probably don't have parameters
               val
             end

data/lib/cloud_formation_tool/storable.rb

@@ -1,4 +1,5 @@
 require 'digest'
+require 'aws-sdk-s3'
 
 module CloudFormationTool
   module Storable

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '0.8.2'
+  VERSION = '0.8.6'
 end

data/lib/cloud_formation_tool.rb

@@ -1,6 +1,6 @@
 require 'logger'
 require 'autoloaded'
-require 'aws-sdk'
+
 
 def log(message = nil, &block)
   ($__logger ||= Logger.new(STDERR)).info(if message.nil?
@@ -35,6 +35,7 @@ module CloudFormationTool
   end
   
   def awscreds
+    require 'aws-sdk-core'
     $__aws_creds ||= Aws::SharedCredentials.new(profile_name: profile)
   end
   
@@ -47,19 +48,23 @@ module CloudFormationTool
   end
   
   def awsec2
+    require 'aws-sdk-ec2'
     $__aws_ec2 ||= Aws::EC2::Client.new aws_config
   end
   
   def awss3(s3reg = nil)
+    require 'aws-sdk-s3'
     s3reg ||= region
     ($__aws_s3 ||= {})[region] ||= Aws::S3::Client.new aws_config.merge(region: s3reg)
   end
   
   def awscf
+    require 'aws-sdk-cloudformation'
     $__aws_cf ||= Aws::CloudFormation::Client.new aws_config
   end
   
   def awsas
+    require 'aws-sdk-autoscaling'
     $__aws_as ||= Aws::AutoScaling::Client.new aws_config
   end
   
@@ -76,9 +81,8 @@ module CloudFormationTool
       log("Creating CF template bucket #{name}")
       awss3.create_bucket({
         acl: "private",
-        bucket: name,
-        create_bucket_configuration: { location_constraint: region }
-      })
+        bucket: name
+      }.merge(if region == 'us-east-1' then {} else { create_bucket_configuration: { location_constraint: region } } end))
       name
     else
       bucket[:name]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.6
 platform: ruby
 authors:
 - Oded Arbel
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2011-03-10 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
 - !ruby/object:Gem::Dependency
   name: clamp
   requirement: !ruby/object:Gem::Requirement
@@ -25,19 +39,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: aws-sdk-cloudformation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-s3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-ec2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-autoscaling
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: autoloaded
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +145,7 @@ files:
 - lib/cloud_formation_tool/cli/output.rb
 - lib/cloud_formation_tool/cli/parameters.rb
 - lib/cloud_formation_tool/cli/recycle.rb
+- lib/cloud_formation_tool/cli/scale.rb
 - lib/cloud_formation_tool/cli/servers.rb
 - lib/cloud_formation_tool/cli/status.rb
 - lib/cloud_formation_tool/cloud_formation.rb
@@ -118,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A pre-compiler tool for CloudFormation YAML templates