zergrush_cf 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTM1NGM0NDdlZjljZmViOTcyOTI3YjJkMTg0OTIyMzViYTVlYjhiOA==
+    ZmMyNjgxOTNmNzkwNjVlYzFmYmU5OTU3YTU0MzYwNDFhMjJlMjRjZA==
   data.tar.gz: !binary |-
-    Zjg3ZmIyODgxYzUyOTgzNmNjZDJkOGIyYWU5MTQ0OGJlYTJjMTI1NQ==
+    OWJkNmJjZDg4NTNiZTQ5ZTZhM2QxNzgzODc2MzdmMjk0YjJlMTk4ZA==
 SHA512:
   metadata.gz: !binary |-
-    NzJiODUyYmI5YWZhZDFmM2FjYjdlODkyZDYzZGFkOGI4YzVmMTEyY2M0ZDkx
-    MTU2ZjliMGExYmZhZDgwZTgwOWIzZDhiZDYzOGI2ZmZjNWVlZThmN2QwMjNk
-    N2UyZTZmNjQ4OGQ0NzA1MTQwODcwNTA3OTRhYTkxODAzODBkZTE=
+    ZGQ2YzJmYThhZjc5YjRmMTlkZDg1M2QzZmUzNTU3OWE1OTI4Njg0ZTFjNWUy
+    MzQ2MThiNDRjN2Q2OTc2OGQzNTNmZmJhNGVmYWQ4ZjZiY2YxZmJhMzdmMGE3
+    MDRhZGE1ODBjMjg4MTdlZjQxNTIyMjI2NjRiOWEzZDMyNTNlNGY=
   data.tar.gz: !binary |-
-    ZDc1MzY5NzI1YmQ2ZmU2OTIzMWJjYzQ2MzMwZDExZjg3YjQ3MjJkYWJjYWYz
-    YzJhNWYwOTkyYzkyZmIyNjcyODlmMzRhMjI0MDU1MDYxYWY4Y2ZlNzExZGIz
-    MTk2Yjg4ZDE5MDNkYzA0OTJiMTQyZDQ0Nzc4OTIxOGMzZWI1YTU=
+    NjNiZjYwNWI4ZDYzMGQxYmQwZTRiNTBlZGQzOGUwMTlmNzA4OWUxNzdjNWY3
+    ZjYxOGU5OTAxYTI5NmZkYjdhYTk3OWUzZjYwNzRhMDA4N2FhYzE5OWVjMDQ2
+    Y2FmZWFiM2E0OGRjNWEyMGU2ZGNlOWI2MDAxYmU1NWI1ZTczZDk=

data/README.md

@@ -16,6 +16,8 @@ Additional properties defined
 - template - body of a AWS CloudFormation template (use this OR template_file)
 - template_file - file containing the CloudFormation template. Path is relative to location of .ke task file in .hive (use this OR template)
 - template_parameters - parameter values for the cloudformation template
+- rabbit - optional information on a rabbitmq server to publish event log to
+- storage - optional information on an S3 bucket to upload files from "additional_files_section" of zerg to.
 
 Example use:
 ```
@@ -33,6 +35,40 @@ Example use:
             "template_parameters": {
                 "Param1": "value",
                 "Param2": "ENV['SOME_VARIABLE']"
+            },
+            "rabbit": {
+                "bunny_params": {
+                    ...
+                },
+                "queue": {
+                    "name": "your rabbit queue",
+                    "params": {
+                        "durable": true,
+                        <other bunny queue parameters>
+                    }
+                },
+                "exchange": {
+                    "name": "your rabbit exchange",
+                    "params": {
+                        "durable": true,
+                        <other bunny exchange parameters>
+                    }
+                },
+                "event_timestamp_name": "happened at:",
+                "event_resource_id_name": "CF Resource ID:",
+                "event_resource_type_name": "CF Resource Type:",
+                "event_resource_status_name": "CF Resource Status:",
+                "event_resource_reason_name": "What up?"
+            },
+            "storage": {
+                "s3_bucket": {
+                    "name": "my_task_storage",
+                    "public": false,
+                    "files": [
+                        "first_to_file_from_additional_files_section.extension",
+                        "second_to_file_from_additional_files_section.extension"
+                    ]
+                }
             }
         }
     }

data/lib/zergrush_cf/init.rb

@@ -27,6 +27,8 @@ require 'excon'
 require 'rbconfig'
 require 'awesome_print'
 require 'securerandom'
+require 'bunny'
+require 'time'
 require_relative 'renderer'
 
 class CloudFormation < ZergGemPlugin::Plugin "/driver"
@@ -46,6 +48,8 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
         abort("AWS key id is not specified in task") unless aws_key_id != nil
         abort("AWS secret is not specified in task") unless aws_secret != nil
 
+        rabbit_objects = initRabbitConnection(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])
+
         renderer = ZergrushCF::Renderer.new(
             hive_location, 
             task_name, 
@@ -113,6 +117,7 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
         event_counter = 0
         while outputs_info.body["Stacks"][0]["StackStatus"] == "CREATE_IN_PROGRESS" do
             logEvents(events.first(events.length - event_counter))
+            logRabbitEvents(events.first(events.length - event_counter), rabbit_objects, eval_params(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])) 
             event_counter = events.length
 
             events = cf.describe_stack_events(stack_name).body['StackEvents']
@@ -121,13 +126,16 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
                 logEvents(events.first(events.length - event_counter))
                 puts("Stack outputs:")
                 ap outputs_info.body["Stacks"][0]["Outputs"]
+                rabbit_objects[:connection].close unless rabbit_objects == nil
                 return 0
             end
         end
 
+        rabbit_objects[:connection].close unless rabbit_objects == nil
         abort("ERROR: Failed with stack status: #{outputs_info.body["Stacks"][0]["StackStatus"]}")
         
         rescue Fog::Errors::Error => fog_cf_error
+            rabbit_objects[:connection].close unless rabbit_objects == nil
             abort ("ERROR: AWS error: #{fog_cf_error.message}")
     end
 
@@ -148,6 +156,8 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
         abort("AWS key id is not specified in task") unless aws_key_id != nil
         abort("AWS secret is not specified in task") unless aws_secret != nil
 
+        rabbit_objects = initRabbitConnection(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])
+
         puts("Cleaning task #{task_name} ...")
 
         # run fog cleanup on the stack.
@@ -168,6 +178,7 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
             begin
                 outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
             rescue Fog::AWS::CloudFormation::NotFound
+                rabbit_objects[:connection].close unless rabbit_objects == nil
                 return 0
             end
         end
@@ -178,6 +189,7 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
             begin
                 events = cf.describe_stack_events(stack_name).body['StackEvents']
             rescue Fog::AWS::CloudFormation::NotFound
+                rabbit_objects[:connection].close unless rabbit_objects == nil
                 return 0
             end
         end
@@ -185,25 +197,30 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
         event_counter = 0
         while outputs_info.body["Stacks"][0]["StackStatus"] == "DELETE_IN_PROGRESS" do
             logEvents(events.first(events.length - event_counter))
+            logRabbitEvents(events.first(events.length - event_counter), rabbit_objects, eval_params(task_hash["vm"]["driver"]["driveroptions"][0]["rabbit"])) 
+
             event_counter = events.length
             begin
                 events = cf.describe_stack_events(stack_name).body['StackEvents']
                 outputs_info = cf.describe_stacks({ 'StackName' => stack_name })
             rescue Fog::AWS::CloudFormation::NotFound
                 logEvents(events.first(events.length - event_counter))
+                rabbit_objects[:connection].close unless rabbit_objects == nil
                 return 0
             end
         end
 
+        rabbit_objects[:connection].close unless rabbit_objects == nil
         abort("ERROR: Failed with stack status: #{outputs_info.body["Stacks"][0]["StackStatus"]}")
     
         rescue Fog::Errors::Error => fog_cf_error
+            rabbit_objects[:connection].close unless rabbit_objects == nil
             abort ("ERROR: AWS error: #{fog_cf_error.ai}")
     end
 
     def logEvents events
         events.each do |event|
-            puts "Timestamp: #{event['Timestamp']}"
+            puts "Timestamp: #{Time.parse(event['Timestamp'].to_s).iso8601}"
             puts "LogicalResourceId: #{event['LogicalResourceId']}"
             puts "ResourceType: #{event['ResourceType']}"
             puts "ResourceStatus: #{event['ResourceStatus']}"
@@ -212,6 +229,40 @@ class CloudFormation < ZergGemPlugin::Plugin "/driver"
         end
     end
 
+    def initRabbitConnection rabbitInfo
+        return nil unless rabbitInfo != nil
+        params = eval_params(rabbitInfo)
+        conn = Bunny.new(Hash[params["bunny_params"].map{ |k, v| [k.to_sym, v] }])
+        conn.start
+
+        channel = conn.create_channel
+        exch = (params["exchange"] == nil) ? channel.default_echange : channel.direct(params["exchange"]["name"], Hash[params["exchange"]["params"].map{ |k, v| [k.to_sym, v] }])
+        channel.queue(params["queue"]["name"], Hash[params["queue"]["params"].map{ |k, v| [k.to_sym, v] }]).bind(exch)
+
+        return  { :connection => conn, :channel => channel, :exchange => exch }
+    end
+
+    def logRabbitEvents events, rabbit_objects, rabbit_properties
+        timestamp = (rabbit_properties["event_timestamp_name"] == nil) ? "timestamp" : rabbit_properties["event_timestamp_name"]
+        res_id_name = (rabbit_properties["event_resource_id_name"] == nil) ? "resource_id" : rabbit_properties["event_resource_id_name"]
+        res_type_name = (rabbit_properties["event_resource_type_name"] == nil) ? "resource_type" : rabbit_properties["event_resource_type_name"]
+        res_status = (rabbit_properties["event_resource_status_name"] == nil) ? "resource_status" : rabbit_properties["event_resource_status_name"]
+        reason = (rabbit_properties["event_resource_reason_name"] == nil) ? "reason" : rabbit_properties["event_resource_reason_name"]
+
+
+        events.each do |event|
+            event_info = {
+                timestamp.to_sym => "#{Time.parse(event['Timestamp'].to_s).iso8601}",
+                res_id_name.to_sym => "#{event['LogicalResourceId']}",
+                res_type_name.to_sym => "#{event['ResourceType']}",
+                res_status.to_sym => "#{event['ResourceStatus']}",
+                reason.to_sym => "#{event['ResourceStatusReason']}"
+            }
+            
+            rabbit_objects[:exchange].publish(event_info.to_json, :routing_key => rabbit_properties["queue"]["name"])
+        end
+    end
+
     def halt hive_location, task_name, task_hash, debug
         puts("Halt is not implemented for CloudFormation.")
         return

data/lib/zergrush_cf/version.rb

@@ -22,5 +22,5 @@
 #++
 
 module ZergrushCF
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/resources/option_schema.template

@@ -13,6 +13,65 @@
 "template_parameters": {
     "type": "object"
 },
+"rabbit": {
+    "type": "object",
+    "properties": {
+        "bunny_params": {
+            "type": "object"
+        },
+        "queue": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "params": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "name"
+            ],
+            "additionalProperties": false
+
+        },
+        "exchange": {
+            "type": "object",
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "params": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "name"
+            ],
+            "additionalProperties": false
+        },
+        "event_timestamp_name": {
+            "type": "string"
+        },
+        "event_resource_id_name": {
+            "type": "string"
+        },
+        "event_resource_type_name": {
+            "type": "string"
+        },
+        "event_resource_status_name": {
+            "type": "string"
+        },
+        "event_resource_reason_name": {
+            "type": "string"
+        }
+    },
+    "required": [
+        "bunny_params",
+        "queue"
+    ],
+    "additionalProperties": false  
+},
 "storage": {
     "type": "object",
     "properties": {

data/zergrush_cf.gemspec

@@ -17,9 +17,10 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_development_dependency "rake"
-  s.add_development_dependency "zergrush", ">= 0.0.11"
+  s.add_development_dependency "zergrush", ">= 0.0.13"
 
   s.add_dependency "fog", ">=1.20.0"
+  s.add_dependency "bunny", ">=1.2.1"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zergrush_cf
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - MTN Satellite Communications
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.0.11
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +66,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.20.0
+- !ruby/object:Gem::Dependency
+  name: bunny
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.1
 description: Amazon Cloud Formation driver for zergrush
 email:
 - Marat.Garafutdinov@mtnsat.com