rest_connection 1.0.8 → 1.0.9

data/config/rest_api_config.yaml.sample

@@ -12,3 +12,4 @@
 :azure_hack_retry_count: 5
 :azure_hack_sleep_seconds: 60
 :api_logging: false
+:legacy_shard: true

data/lib/rest_connection.rb

@@ -85,10 +85,11 @@ module RestConnection
         @@pass = ask("Password:") { |q| q.echo = false } unless @@pass
         @settings[:pass] = @@pass
       end
-      @settings[:azure_hack_on] ||= true
+      @settings[:azure_hack_on] = true if @settings[:azure_hack_on] == nil
       @settings[:azure_hack_retry_count] ||= 5
       @settings[:azure_hack_sleep_seconds] ||= 60
       @settings[:api_logging] ||= false
+      @settings[:legacy_shard] = true if @settings[:legacy_shard] == nil
     end
 
     # Main HTTP connection loop. Common settings are set here, then we yield(BASE_URI, OPTIONAL_HEADERS) to other methods for each type of HTTP request: GET, PUT, POST, DELETE

data/lib/rest_connection/rightscale/multi_cloud_image.rb

@@ -36,17 +36,20 @@ class MultiCloudImage
     @params["multi_cloud_image_cloud_settings"].map { |mcics| mcics.cloud_id }
   end
 
-  # You must have access to multiple APIs for this (0.1, and 1.5)
-  def find_and_flatten_settings()
-    internal = MultiCloudImageInternal.new("href" => self.href)
-    internal.reload
-    total_image_count = internal.multi_cloud_image_cloud_settings.size
-    # The .settings call filters out non-ec2 images
-    more_settings = []
-    if total_image_count > internal.settings.size
-      more_settings = McMultiCloudImage.find(rs_id.to_i).settings
+  def find_and_flatten_settings
+    if connection.settings[:legacy_shard]
+      internal = MultiCloudImageInternal.new("href" => self.href)
+      internal.reload
+      total_image_count = internal.multi_cloud_image_cloud_settings.size
+      # The .settings call filters out non-ec2 images
+      more_settings = []
+      if total_image_count > internal.settings.size
+        more_settings = McMultiCloudImage.find(rs_id.to_i).settings
+      end
+      @params["multi_cloud_image_cloud_settings"] = internal.settings + more_settings
+    else
+      @params["multi_cloud_image_cloud_settings"] = McMultiCloudImage.find(rs_id.to_i).settings
     end
-    @params["multi_cloud_image_cloud_settings"] = internal.settings + more_settings
   end
 
   def initialize(*args, &block)

data/lib/rest_connection/rightscale/rightscale_api_base.rb

@@ -85,12 +85,19 @@ module RightScale
       if class_variable_defined?("@@api0_1")
         return @@api0_1 unless @@api0_1.nil?
       end
-      Ec2SshKeyInternal.find_all
-      @@api0_1 = true
-    rescue RestConnection::Errors::Forbidden
-      @@api0_1 = false
-    rescue RestConnection::Errors::UnprocessableEntity
-      @@api0_1 = false
+
+      if RestConnection::Connection.new.settings[:legacy_shard]
+        begin
+          Ec2SshKeyInternal.find_all
+          @@api0_1 = true
+        rescue RestConnection::Errors::Forbidden
+          @@api0_1 = false
+        rescue RestConnection::Errors::UnprocessableEntity
+          @@api0_1 = false
+        end
+      else
+        @@api0_1 = false
+      end
     end
 
     # Checks for API 1.0 access

data/lib/rest_connection/rightscale/server_template.rb

@@ -88,13 +88,19 @@ class ServerTemplate
 
   def fetch_multi_cloud_images
     @params["multi_cloud_images"] = []
-    ServerTemplateInternal.new(:href => self.href).multi_cloud_images.each { |mci_params|
-      @params["multi_cloud_images"] << MultiCloudImageInternal.new(mci_params)
-    }
-    mcis = McServerTemplate.find(self.rs_id.to_i).multi_cloud_images
-    @params["multi_cloud_images"].each_index { |i|
-      @params["multi_cloud_images"][i]["multi_cloud_image_cloud_settings"] += mcis[i].settings
-    }
+    if connection.settings[:legacy_shard]
+      ServerTemplateInternal.new(:href => self.href).multi_cloud_images.each { |mci_params|
+        @params["multi_cloud_images"] << MultiCloudImageInternal.new(mci_params)
+      }
+      mcis = McServerTemplate.find(self.rs_id.to_i).multi_cloud_images
+      @params["multi_cloud_images"].each_index { |i|
+        @params["multi_cloud_images"][i]["multi_cloud_image_cloud_settings"] += mcis[i].settings
+      }
+    else
+      McServerTemplate.find(self.rs_id.to_i).multi_cloud_images.each { |mci|
+        @params["multi_cloud_images"] << McMultiCloudImage.new(mci.params)
+      }
+    end
     @params["multi_cloud_images"]
   end
 

data/lib/rest_connection/ssh_hax.rb

@@ -34,12 +34,15 @@ module SshHax
       ssh_keys = item
     elsif item.is_a?(String)
       ssh_keys = [item]
-    elsif k = connection.settings[:ssh_key]
-      ssh_keys = [k]
-    elsif kk = connection.settings[:ssh_keys]
-      ssh_keys = kk
+    elsif connection_key = connection.settings[:ssh_key]
+      ssh_keys = [connection_key]
+    elsif connection_keys = connection.settings[:ssh_keys]
+      ssh_keys = connection_keys
     else
-      ssh_keys = nil
+      # If no key(s) provided, assume a standard monkey configuration which uses '/root/.ssh/api_user_key'.
+      api_user_key_ssh_key_file_name = '/root/.ssh/api_user_key'
+      raise "FATAL ERROR: #{api_user_key_ssh_key_file_name} does not exist." if !File.exist?(api_user_key_ssh_key_file_name)
+      ssh_keys = [api_user_key_ssh_key_file_name]
     end
     ssh_keys
   end

data/lib/rest_connection/version.rb

@@ -1,4 +1,4 @@
 # This gem is versioned with the usual X.Y.Z notation
 module RestConnection
-  VERSION = '1.0.8'
+  VERSION = '1.0.9'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rest_connection
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 1
   - 0
-  - 8
-  version: 1.0.8
+  - 9
+  version: 1.0.9
 platform: ruby
 authors: 
 - RightScale, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-28 00:00:00 Z
+date: 2013-06-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement