skeme 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/cloud_providers/aws.rb

@@ -19,6 +19,7 @@ module Skeme
       @@logger = nil
       @@fog_aws_computes = {}
 
+      # TODO: Allow a preferred region/az if it's known
       def initialize(options={})
         @@logger = options[:logger]
         if options[:aws_access_key_id] && options[:aws_secret_access_key]
@@ -57,16 +58,16 @@ module Skeme
           supplied_id_type.each do |resource_id_key|
             resource_id = params[resource_id_key]
             if setting
+              @@logger.info("Tagging AWS resource id (#{resource_id}) with (#{tag})")
               not_found_exceptions = []
               @@fog_aws_computes.each do |key,val|
                 begin
                   val.create_tags(resource_id, {tag => nil})
-                  @@logger.info("Tagging AWS resource id (#{resource_id}) with (#{tag}) in AWS cloud (#{key})")
                 rescue Fog::Service::NotFound => e
                   not_found_exceptions << e
                 end
               end
-              if not_found_exceptions.count == @@fog_aws_computes.count
+              if @@fog_aws_computes.count > 0 && not_found_exceptions.count == @@fog_aws_computes.count
                 raise not_found_exceptions.first
               end
             else
@@ -79,7 +80,7 @@ module Skeme
                   not_found_exceptions << e
                 end
               end
-              if not_found_exceptions.count == @@fog_aws_computes.count
+              if @@fog_aws_computes.count > 0 && not_found_exceptions.count == @@fog_aws_computes.count
                 raise not_found_exceptions.first
               end
             end

data/lib/managers/rightscale.rb

@@ -19,15 +19,19 @@ module Skeme
     class RightScale
       attr_accessor :logger, :gotime
 
+      @@region_hash = {'us-east-1' => 1, 'eu-west-1' => 2, 'us-west-1' => 3, 'ap-northeast-1' => 4, 'ap-southeast-1' => 5}
+
       def initialize(options={})
         @logger = options[:logger]
         if options[:rs_email] && options[:rs_pass] && options[:rs_acct_num]
+          pass = options[:rs_pass].gsub('"', '\\"')
+
           @logger.info("RightScale credentials supplied. RightScale Tagging Enabled.")
           ::RightScale::Api::BaseExtend.class_eval <<-EOF
           @@connection ||= RestConnection::Connection.new
             @@connection.settings = {
               :user => "#{options[:rs_email]}",
-              :pass => "#{options[:rs_pass]}",
+              :pass => "#{pass}",
               :api_url => "https://my.rightscale.com/api/acct/#{options[:rs_acct_num]}",
               :common_headers => {
                 "X_API_VERSION" => "1.0"
@@ -38,7 +42,7 @@ module Skeme
           @@connection ||= RestConnection::Connection.new
             @@connection.settings = {
               :user => "#{options[:rs_email]}",
-              :pass => "#{options[:rs_pass]}",
+              :pass => "#{pass}",
               :api_url => "https://my.rightscale.com/api/acct/#{options[:rs_acct_num]}",
               :common_headers => {
                 "X_API_VERSION" => "1.0"
@@ -75,6 +79,44 @@ module Skeme
         server
       end
 
+      def volume_from_unique_id(ec2_volume_id, options={:region => nil})
+        @logger.info("Looking for ec2_volume_id #{ec2_volume_id}")
+        vol = nil
+        local_region_hash = @@region_hash
+        local_region_hash = {options[:region] => @@region_hash[options[:region]]} if options[:region]
+
+        @logger.info("region hash is #{local_region_hash}")
+
+        local_region_hash.each do |region_name,region_id|
+          @logger.info("Searching in region #{region_name}")
+          vols_in_region = Ec2EbsVolume.find_by_cloud_id(region_id)
+          vols_matching_id = vols_in_region.select { |v| v.aws_id == ec2_volume_id }
+          if vols_matching_id && vols_matching_id.count > 0
+            vol = vols_matching_id.first
+            break
+          end
+        end
+
+        vol
+      end
+
+      def snapshot_from_unique_id(ec2_snapshot_id, options={:region => nil})
+        snap = nil
+        local_region_hash = @@region_hash
+        local_region_hash = {options[:region] => @@region_hash[options[:region]]} if options[:region]
+
+        local_region_hash.each do |region_name,region_id|
+          snaps_in_region = Ec2EbsSnapshot.find_by_cloud_id(region_id)
+          snaps_matching_id = snaps_in_region.select { |v| v.aws_id == ec2_snapshot_id }
+          if snaps_matching_id && snaps_matching_id.count > 0
+            snap = snaps_matching_id.first
+            break
+          end
+        end
+
+        snap
+      end
+
       def tag(params={})
         if @gotime
           tag = params[:rs_tag] || params[:tag]
@@ -83,14 +125,19 @@ module Skeme
           params.keys.each do |resource_id_key|
             resource_href = nil
             case resource_id_key
+              # TODO: Should check for nil on each of these, since what I'm looking for may not be found
+
               # This creates a condition where the instance is tagged twice if both ec2_instance_id and rs_tag_target are both provided.
               # It's still less calls than iterating all of the servers for the aws-id though.
               when :ec2_instance_id, :rs_tag_target
-                resource_href = server_from_unique_id(params[:ec2_instance_id], params[:rs_tag_target]).current_instance_href
+                server = server_from_unique_id(params[:ec2_instance_id], params[:rs_tag_target])
+                resource_href = server.current_instance_href if server
               when :ec2_ebs_volume_id
-                resource_href = Ec2EbsVolume.find(:first) { |vol| vol.aws_id == params[:ec2_ebs_volume_id] }.href
+                vol = volume_from_unique_id(params[:ec2_ebs_volume_id])
+                resource_href = vol.href if vol
               when :ec2_ebs_snapshot_id
-                resource_href = Ec2EbsSnapshot.find(:first) { |snap| snap.aws_id == params[:ec2_ebs_snapshot_id] }.href
+                snap = snapshot_from_unique_id(params[:ec2_ebs_snapshot_id])
+                resource_href = snap.href if snap
             end
 
             if resource_href

data/skeme.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{skeme}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan J. Geyer"]
-  s.date = %q{2011-05-27}
+  s.date = %q{2011-06-06}
   s.description = %q{= skeme
 
 Skeme is a library for tagging objects (server instances, storage volumes, etc).  It is intended to allow tagging of the same resource in multiple systems simultaneously.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: skeme
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Ryan J. Geyer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 -07:00
+date: 2011-06-06 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency