cloudformation-tool 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3c901ead020a647c6b7fca5e7c54a87ac460fa40ffea601e57fc679f4e16d48
-  data.tar.gz: e4a3b0af6b07b111926088777071e180bbf83fe4efc6782a97f1ed5b60683cd3
+  metadata.gz: 72b77e70306d3203e76898284edecd89daee64e164329fdb2ab53f3eabcc1559
+  data.tar.gz: deef3362134e2aa8edd7969f0307dc0731ed9bb93b3dd4b0143bbc747428ced4
 SHA512:
-  metadata.gz: 9b5f8f00b6a8d0c724dc1b7231b063d4b1b4c5807fd7915dcd70b272112266d7d8be75eb88f4576d9d0966b24629ea2d025c336a4f40958b9b3e7adc6fd1dbee
-  data.tar.gz: dc198485e2c6af34cef73e380fb69e478cf3b09b1512f76263bfb943061b90f16a2b3297bfd157baec7a50960cea8011a32381773081057b2085dbd55494f580
+  metadata.gz: 2c519e62fc5bb7288a4be2aa785dffe3e717ec1380befe06d08823e6489474bd26843cc4bf7454cc3b70e3b1559b5efad70d557cf40bd36e7841d767a88b8045
+  data.tar.gz: 3e5e245e1387416c4ceaaaabf0ce791a7bf8bc893dd3a4a3fe0fe15b335eb0b0adde6fc59a5d1f4e3d6464ce8afe51971d7e839465768071352490d1276183b6

data/lib/cloud_formation_tool/cli/groups.rb

@@ -0,0 +1,25 @@
+module CloudFormationTool
+  module CLI
+    
+    class Groups < Clamp::Command
+      include CloudFormationTool
+      
+      parameter "STACK_NAME", "Name of the stack to list Autoscaling groups from"
+      
+      def execute
+        st = CloudFormation::Stack.new(stack_name)
+        output = st.asgroups.collect do |res|
+          {
+            name: res.logical_resource_id,
+            res: res.physical_resource_id,
+            len: res.logical_resource_id.length
+          }
+        end
+        width = output.collect { |g| g[:name].length }.max
+        output.collect do |grp|
+          puts grp[:name].ljust(width, ' ') + "\t => " + grp[:res]
+        end
+      end
+    end
+  end
+end

data/lib/cloud_formation_tool/cli/main.rb

@@ -6,6 +6,14 @@ module CloudFormationTool
   module CLI
     class Main < Clamp::Command
       
+      logger.formatter = proc { |severity, datetime, progname, msg|
+        if Logger::Severity.const_get(severity) > Logger::Severity::INFO
+          "#{severity}: "
+        else
+          ""
+        end + msg + "\n"
+      }
+      
       class CFToolHelper
         include CloudFormationTool
       end
@@ -21,9 +29,18 @@ module CloudFormationTool
         $__profile = s
       end
       
+      option [ "-d", "--debug" ], :flag, "Enable debug logging" do
+        logger.level = Logger::Severity::DEBUG
+        logger.formatter = logger.default_formatter
+      end
+      
+      option [ "-q", "--quiet" ], :flag, "Enable debug logging" do
+        logger.level = Logger::Severity::ERROR
+      end
+      
       option [ "-v", "--version" ], :flag, "Print the version and exit" do
         require 'cloud_formation_tool/version'
-        puts CloudFormationTool::VERSION
+        logger.info CloudFormationTool::VERSION
         exit 0
       end
       
@@ -35,6 +52,7 @@ module CloudFormationTool
       subcommand 'status', "Check the current status of a stack", Status
       subcommand 'delete', "Delete an existing stack", Delete
       subcommand 'servers', 'List stack resources', Servers
+      subcommand 'groups', 'List stack Autoscaling groups', Groups
       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

data/lib/cloud_formation_tool/cli/monitor.rb

@@ -16,7 +16,7 @@ module CloudFormationTool
             sleep 1
           end
         rescue CloudFormationTool::Errors::StackDoesNotExistError => e
-          log "Stack #{stack_name} does not exist"
+          error "Stack #{stack_name} does not exist"
         rescue SystemExit, Interrupt => e
           # CTRL-C out of the loop
           puts "\n"

data/lib/cloud_formation_tool/cli/recycle.rb

@@ -1,5 +1,3 @@
-require 'set'
-
 module CloudFormationTool
   module CLI
     
@@ -33,7 +31,7 @@ module CloudFormationTool
               puts "#{grp.name}: Left to recycle - #{torecycle}"
             end
           end
-        end.each(&:join)
+        end.each(&:join).length > 0 or error "No valid Autoscaling groups found named #{asg_name}"
       end
     end
   end

data/lib/cloud_formation_tool/cli/scale.rb

@@ -22,16 +22,16 @@ module CloudFormationTool
       end
       
       def execute
-        #log "Starting scale operations"
+        debug "Starting scale operations"
         st = CloudFormation::Stack.new(stack_name)
         st.asgroups.select do |res|
-          #log "Checking group #{res.logical_resource_id}"
+          debug "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}"
+          debug "Scaling #{res.logical_resource_id}"
           Thread.new do
             grp = res.group
-            #log "Current capacity: #{grp.desired_capacity}, setting to #{scale}"
+            debug "Current capacity: #{grp.desired_capacity}, setting to #{scale}"
             grp.set_desired_capacity(desired_capacity: scale)
             last_state = nil
             until stable_scale(grp, scale)

data/lib/cloud_formation_tool/cli/status.rb

@@ -9,7 +9,7 @@ module CloudFormationTool
         if CloudFormation::Stack.new(stack_name).exist?
           log "OK"
         else
-          log "Stack #{stack_name} does not exist"
+          error "Stack #{stack_name} does not exist"
         end
       end
 

data/lib/cloud_formation_tool/cloud_formation/lambda_code.rb

@@ -11,12 +11,12 @@ module CloudFormationTool
         @data = code
         @data['Url'] = @data.delete 'URL' if @data.key? 'URL' # normalize to CF convention if seeing old key
         if @data.key? 'Url'
-          log "Trying Lambda code from #{@data['Url']}"
+          debug "Trying Lambda code from #{@data['Url']}"
           @data['Url'] = url = tpl.resolveVal(@data['Url'])
           return unless url.is_a? String
           log "Downloading Lambda code from #{url}"
           if already_in_cache(url)
-            log "Reusing remote cached object instead of downloading"
+            debug "Reusing remote cached object instead of downloading"
           else
             res = fetch_from_url(url)
             @s3_url = URI(upload(make_filename(url.split('.').last), res.body, mime_type: res['content-type'], gzip: false))
@@ -25,7 +25,7 @@ module CloudFormationTool
         elsif @data.key? 'Path'
           @data['Path'] = path = tpl.resolveVal(@data['Path'])
           return unless path.is_a? String
-          log "Reading Lambda code from #{path}"
+          debug "Reading Lambda code from #{path}"
           path = if path.start_with? "/" then path else "#{tpl.basedir}/#{path}" end
           if File.directory?(path)
             @s3_url = URI(upload(make_filename('zip'), zip_path(path), mime_type: 'application/zip', gzip: false))
@@ -40,7 +40,7 @@ module CloudFormationTool
       def zip_path(path)
         Zip::OutputStream.write_buffer do |zf|
           rdir path do |ent|
-            #log "Deflating #{ent}"
+            debug "Deflating #{ent}"
             filepath = File.join(path,ent)
             zf.put_next_entry ::Zip::Entry.new(nil, ent, nil, nil, nil, nil, nil, nil, ::Zip::DOSTime.at(File.mtime(filepath).to_i))
             zf.write File.read(filepath) 
@@ -64,12 +64,12 @@ module CloudFormationTool
                     http.finish if check_cached(response['ETag'])
                   when Net::HTTPRedirection then
                     location = response['location']
-                    log "Cache check redirected to #{location}"
+                    debug "Cache check redirected to #{location}"
                     limit = limit - 1
                     response.body
                     url = URI(location)
                   else
-                    log "arg err"
+                    error "arg err"
                     raise ArgumentError, "Error getting response: #{response}"
                 end
               end
@@ -107,7 +107,7 @@ module CloudFormationTool
           response
         when Net::HTTPRedirection then
           location = response['location']
-          log "redirected to #{location}"
+          debug "redirected to #{location}"
           fetch_from_url_real(location, limit - 1)
         else
           raise CloudFormationTool::Errors::AppError, "Error downloading #{url}: #{response.value}"

data/lib/cloud_formation_tool/storable.rb

@@ -41,7 +41,7 @@ module CloudFormationTool
         file_opts.merge!({content_encoding: 'gzip'}) if gzip
         o.put(file_opts)
       else
-        log "re-using cached object"
+        debug "re-using cached object"
       end
       o.public_url
     end

data/lib/cloud_formation_tool/version.rb

@@ -1,3 +1,3 @@
 module CloudFormationTool
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/lib/cloud_formation_tool.rb

@@ -1,9 +1,36 @@
 require 'logger'
 require 'autoloaded'
 
+def logger
+  ($__logger ||= Logger.new(STDERR))
+end
 
 def log(message = nil, &block)
-  ($__logger ||= Logger.new(STDERR)).info(if message.nil?
+  logger.info(if message.nil?
+    yield
+  else
+    message
+  end)
+end
+
+def debug(message = nul, &block)
+  logger.debug(if message.nil?
+    yield
+  else
+    message
+  end)
+end
+
+def warn(message = nul, &block)
+  logger.warn(if message.nil?
+    yield
+  else
+    message
+  end)
+end
+
+def error(message = nul, &block)
+  logger.error(if message.nil?
     yield
   else
     message
@@ -78,7 +105,7 @@ module CloudFormationTool
     # otherwise try to create one
     if bucket.nil?
       name = cf_bucket_name(region)
-      log("Creating CF template bucket #{name}")
+      log "Creating CF template bucket #{name}"
       awss3.create_bucket({
         acl: "private",
         bucket: name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudformation-tool
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Oded Arbel
@@ -139,6 +139,7 @@ files:
 - lib/cloud_formation_tool/cli/compile.rb
 - lib/cloud_formation_tool/cli/create.rb
 - lib/cloud_formation_tool/cli/delete.rb
+- lib/cloud_formation_tool/cli/groups.rb
 - lib/cloud_formation_tool/cli/list_stacks.rb
 - lib/cloud_formation_tool/cli/main.rb
 - lib/cloud_formation_tool/cli/monitor.rb
@@ -176,7 +177,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: A pre-compiler tool for CloudFormation YAML templates