gaff 0.3.4 → 0.3.6

data/README

@@ -14,24 +14,9 @@ Example usage:
 
 $ gaff ./gaff.yml
 
-Send a JSON-RPC formatted message to the exchange with the a routing key to perform operations on that API.
+See examples for how to format your json to send to the queue.
 
-require 'rubygems'
-require 'carrot'
+Recent breaking changes:
+ * EC2 messages require the region to be set in params, this allows for all support of all regions.
+ * With the change to dynect_rest I have changed the "address" field to the more correct "rdata".
 
-exch = Carrot::AMQP::Exchange.new(Carrot.new, :topic, "api")
-
-hash = {"method" => "add_a_record", "params" => {
-            "customer_name" => "gaff.com", 
-            "username" => "username", 
-            "password" => "password",
-            "node" => "test123",
-            "zone" => "gaff.com",
-            "address" => "127.0.0.1",
-            "ttl" => "300"
-           }
-       }
-
-json = hash.to_json
-
-exch.publish(json, :routing_key => "dynect")

data/lib/gaff.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 
 require 'mq'
 require 'yajl'
-require 'dynect'
+require 'dynect_rest'
 require 'fog'
 require 'mixlib/config'
 require 'mixlib/log'

data/lib/gaff/dynect_api.rb

@@ -9,63 +9,33 @@ class Gaff
       STDOUT.flush
       
       begin
-        dynect = Dynect.new(
+        dynect = DynectRest.new(
           hash["params"]["customer_name"], 
           hash["params"]["username"], 
-          hash["params"]["password"])
+          hash["params"]["password"], 
+          hash["params"]["zone"])
                             
         Gaff::Log.debug(dynect)
         STDOUT.flush
   
         case hash["method"]
         when "add_a_record"
-          node = dynect.add_node(
-            hash["params"]["node"], 
-            hash["params"]["zone"])
-                                 
-          record = dynect.add_a_record(
-            hash["params"]["zone"],
-            hash["params"]["address"], 
-            {
-              "node" => "#{hash["params"]["node"]}.#{hash["params"]["zone"]}", 
-              "ttl" => hash["params"]["ttl"]
-            })
+          result = dynect.a.fqdn("#{hash["params"]["node"]}.#{hash["params"]["zone"]}").ttl(hash["params"]["ttl"]).address(hash["params"]["rdata"]).save
+          publish = dynect.publish
         when "add_cname_record"
-          node = dynect.add_node(
-            hash["params"]["node"],
-            hash["params"]["zone"])
-          
-          record = dynect.add_cname_record(
-            hash["params"]["zone"],
-            hash["params"]["address"],
-            {
-              "node" => "#{hash["params"]["node"]}.#{hash["params"]["zone"]}", 
-              "ttl" => hash["params"]["ttl"]
-            })
+          result = dynect.cname.fqdn("#{hash["params"]["node"]}.#{hash["params"]["zone"]}").ttl(hash["params"]["ttl"]).cname(hash["params"]["rdata"]).save
+          publish = dynect.publish  
         when "delete_a_record"
-          record_id = dynect.list_a_records(
-            hash["params"]["zone"], 
-            {
-              "node" => "#{hash["params"]["node"]}.#{hash["params"]["zone"]}"
-            })
-                                            
-          record = dynect.delete_a_record(record_id[0]["record_id"])
+          result = dynect.a.fqdn("#{hash["params"]["node"]}.#{hash["params"]["zone"]}").delete
+          publish = dynect.publish
         when "delete_cname_record"
-          record_id = dynect.list_cname_records(
-            hash["params"]["zone"], 
-            {
-              "node" => "#{hash["params"]["node"]}.#{hash["params"]["zone"]}"
-            })
-          
-          record = dynect.delete_cname_record(record_id[0]["record_id"])
+          result = dynect.cname.fqdn("#{hash["params"]["node"]}.#{hash["params"]["zone"]}").delete
+          publish = dynect.publish
         end
         
-        if node
-          Gaff::Log.debug(node.inspect)
-          node = nil
-        end
-        Gaff::Log.info(record.inspect)
-        STDOUT.flush
+        Gaff::Log.info(result)
+        Gaff::Log.debug(publish)
+        STDOUT.flush        
       rescue Exception => e
         Gaff::Log.error(e)
         STDOUT.flush

data/lib/gaff/ec2_api.rb

@@ -9,131 +9,44 @@ class Gaff
       STDOUT.flush
       
       begin
-        @ec2east = Fog::AWS::EC2.new(
+        @ec2 = Fog::AWS::Compute.new(
           :aws_access_key_id => hash["params"]["aws_key"],
           :aws_secret_access_key => hash["params"]["aws_key_secret"],
-          :region => "us-east-1")
+          :region => hash["params"]["region"])
         
-        @ec2west = Fog::AWS::EC2.new(
-          :aws_access_key_id => hash["params"]["aws_key"],
-          :aws_secret_access_key => hash["params"]["aws_key_secret"],
-          :region => "us-west-1")
-        
-        @apac = Fog::AWS::EC2.new(
-          :aws_access_key_id => hash["params"]["aws_key"],
-          :aws_secret_access_key => hash["params"]["aws_key_secret"],
-          :region => "ap-southeast-1")
-        
-        Gaff::Log.debug(@ec2east)
-        Gaff::Log.debug(@ec2west)
-        Gaff::Log.debug(@apac)
+        Gaff::Log.debug(@ec2)
         STDOUT.flush
                                 
         case hash["method"]  
         when "attach_volume"
-          if zone(hash["params"]["volume_id"]).include? "us-east-1"
-            result = @ec2east.attach_volume(hash["params"]["instance_id"], hash["params"]["volume_id"], hash["params"]["device"])
-          elsif zone(hash["params"]["volume_id"]).include? "us-west-1"
-            result = @ec2west.attach_volume(hash["params"]["instance_id"], hash["params"]["volume_id"], hash["params"]["device"])
-          elsif zone(hash["params"]["volume_id"]).include? "ap-southeast-1"
-            result = @apac.attach_volume(hash["params"]["instance_id"], hash["params"]["volume_id"], hash["params"]["device"])
-          end                          
+          result = @ec2.attach_volume(hash["params"]["instance_id"], hash["params"]["volume_id"], hash["params"]["device"])
         when "create_volume"
-          if hash["params"]["availability_zone"].include? "us-east-1"
-            result = @ec2east.create_volume(hash["params"]["availability_zone"], hash["params"]["size"].to_i, hash["params"]["snapshot_id"])
-          elsif hash["params"]["availability_zone"].include? "us-west-1"
-            result = @ec2west.create_volume(hash["params"]["availability_zone"], hash["params"]["size"].to_i, hash["params"]["snapshot_id"])
-          elsif hash["params"]["availability_zone"].include? "ap-southeast-1"
-            result = @apac.create_volume(hash["params"]["availability_zone"], hash["params"]["size"].to_i, hash["params"]["snapshot_id"])
-          end
+          result = @ec2.create_volume(hash["params"]["availability_zone"], hash["params"]["size"].to_i, hash["params"]["snapshot_id"])
         when "delete_volume"
-          volume_id = hash["params"]["volume_id"]
-          if zone(volume_id).include? "us-east-1"
-            result = @ec2east.delete_volume(volume_id)
-          elsif zone(volume_id).include? "us-west-1"
-            result = @ec2west.delete_volume(volume_id)
-          elsif zone(volume_id).include? "ap-southeast-1"
-            result = @apac.delete_volume(volume_id)
-          end
+          result = @ec2.delete_volume(hash["params"]["volume_id"])
         when "detach_volume"
-          if zone(hash["params"]["volume_id"]).include? "us-east-1"
-            result = @ec2east.detach_volume(
-              hash["params"]["volume_id"],
-              {
-                "InstanceId" => hash["params"]["instance_id"],
-                "Device" => hash["params"]["device"],
-                "Force" => hash["params"]["force"]
-              })
-          elsif zone(hash["params"]["volume_id"]).include? "us-west-1"
-            result = @ec2west.detach_volume(
-              hash["params"]["volume_id"],
-              {
-                "InstanceId" => hash["params"]["instance_id"],
-                "Device" => hash["params"]["device"],
-                "Force" => hash["params"]["force"]
-              })
-          elsif zone(hash["params"]["volume_id"]).include? "ap-southeast-1"
-            result = @apac.detach_volume(
-              hash["params"]["volume_id"],
-              {
-                "InstanceId" => hash["params"]["instance_id"],
-                "Device" => hash["params"]["device"],
-                "Force" => hash["params"]["force"]
-              })
-          end
+          result = @ec2.detach_volume(
+            hash["params"]["volume_id"],
+            {
+              "InstanceId" => hash["params"]["instance_id"],
+              "Device" => hash["params"]["device"],
+              "Force" => hash["params"]["force"]
+            })
         when "launch_instances"
-          if hash["params"]["availability_zone"].include? "us-east-1"
-            result = @ec2east.run_instances(
-              hash["params"]["image_id"],
-              hash["params"]["count"],
-              hash["params"]["count"],
-              {
-    	          "SecurityGroup" => hash["params"]["group_ids"],
-                "KeyName" => hash["params"]["key_name"],
-                "Placement.AvailabilityZone" => hash["params"]["availability_zone"],
-                "InstanceType" => hash["params"]["instance_type"]
-              })
-          elsif hash["params"]["availability_zone"].include? "us-west-1"
-            result = @ec2west.run_instances(
-              hash["params"]["image_id"],
-              hash["params"]["count"],
-              hash["params"]["count"],
-              {
-  	            "SecurityGroup" => hash["params"]["group_ids"],
-                "KeyName" => hash["params"]["key_name"],
-                "Placement.AvailabilityZone" => hash["params"]["availability_zone"],
-                "InstanceType" => hash["params"]["instance_type"]
-              })
-          elsif hash["params"]["availability_zone"].include? "ap-southeast-1"
-            result = @apac.run_instances(
-              hash["params"]["image_id"],
-              hash["params"]["count"],
-              hash["params"]["count"],
-              {
-    	          "SecurityGroup" => hash["params"]["group_ids"],
-                "KeyName" => hash["params"]["key_name"],
-                "Placement.AvailabilityZone" => hash["params"]["availability_zone"],
-                "InstanceType" => hash["params"]["instance_type"]
-              })
-          end
+          result = @ec2.run_instances(
+            hash["params"]["image_id"],
+            hash["params"]["count"],
+            hash["params"]["count"],
+            {
+    	        "SecurityGroup" => hash["params"]["group_ids"],
+              "KeyName" => hash["params"]["key_name"],
+              "Placement.AvailabilityZone" => hash["params"]["availability_zone"],
+              "InstanceType" => hash["params"]["instance_type"]
+            })
         when "reboot_instances"
-          instance_ids = hash["params"]["instance_ids"]
-          if zone(instance_ids).include? "us-east-1"
-            result = @ec2east.reboot_instances(instance_ids)
-          elsif zone(instance_ids).include? "us-west-1"
-            result = @ec2west.reboot_instances(instance_ids)
-          elsif zone(instance_ids).include? "ap-southeast-1"
-            result = @apac.reboot_instances(instance_ids)
-          end
+          result = @ec2.reboot_instances(hash["params"]["instance_ids"])
         when "terminate_instances"
-          instance_ids = hash["params"]["instance_ids"]
-          if zone(instance_ids).include? "us-east-1"
-            result = @ec2east.terminate_instances(instance_ids)
-          elsif zone(instance_ids).include? "us-west-1"
-            result = @ec2west.terminate_instances(instance_ids)
-          elsif zone(instance_ids).include? "ap-southeast-1"
-            result = @apac.terminate_instances(instance_ids)
-          end
+          result = @ec2.terminate_instances(hash["params"]["instance_ids"])
         end
         
         Gaff::Log.info(result)
@@ -143,30 +56,6 @@ class Gaff
         STDOUT.flush
       end
     end
-    
-    def self.zone(id)
-      if id.include? "i-"
-        begin
-          @ec2east.describe_instances(id).body["reservationSet"].first["instancesSet"].first["placement"]["availabilityZone"]
-        rescue
-          begin
-            @ec2west.describe_instances(id).body["reservationSet"].first["instancesSet"].first["placement"]["availabilityZone"]
-          rescue
-            @apac.describe_instances(id).body["reservationSet"].first["instancesSet"].first["placement"]["availabilityZone"]
-          end
-        end
-      elsif id.include? "vol-"
-        begin
-          @ec2east.describe_volumes(id).body["volumeSet"].first["availabilityZone"]
-        rescue
-          begin
-            @ec2west.describe_volumes(id).body["volumeSet"].first["availabilityZone"]
-          rescue
-            @apac.describe_volumes(id).body["volumeSet"].first["availabilityZone"]
-          end
-        end
-      end
-    end
 
   end
 end

data/lib/gaff/slicehost_api.rb

@@ -9,7 +9,7 @@ class Gaff
       STDOUT.flush
 
       begin
-        slicehost = Fog::Slicehost.new({:slicehost_password => hash["params"]["password"]})
+        slicehost = Fog::Slicehost::Compute.new({:slicehost_password => hash["params"]["password"]})
   
         Gaff::Log.debug(slicehost)
         STDOUT.flush

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gaff
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 3
-  - 4
-  version: 0.3.4
+  - 6
+  version: 0.3.6
 platform: ruby
 authors: 
 - joe williams
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-31 00:00:00 -07:00
+date: 2011-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: dynect
+  name: dynect_rest
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false