right_api_helper 1.1.1 → 1.1.2

data/lib/right_api_helper/api15.rb

@@ -43,7 +43,7 @@ module RightApiHelper
       ssh_key = nil
       if ssh_uuid
         # grab specific ssh key
-        sshkey = find_resource(:ssh_keys, :by_resource_uid, uuid)
+        sshkey = find_cloud_resource(cloud, :ssh_keys, :by_resource_uid, ssh_uuid)
       else
         # grab first key found
         keys = cloud.show.ssh_keys
@@ -78,11 +78,10 @@ module RightApiHelper
 
     def delete_server(name)
       server = find_server_by_name(name)
-      server.terminate
       begin
+        server.terminate
         server_wait_for_state(server, "terminated")
-      rescue Exception => e
-
+      rescue
       end
       server.destroy
     end
@@ -115,6 +114,10 @@ module RightApiHelper
       find_cloud_resource(cloud, :security_groups, :by_name, security_group_name)
     end
 
+    def find_security_group_by_id(cloud, security_group_uid)
+      find_cloud_resource(cloud, :security_groups, :by_resource_uid, security_group_uid)
+    end
+
     def find_server_by_name(name)
       find_resource(:servers, :by_name, name)
     end
@@ -144,7 +147,7 @@ module RightApiHelper
       end
 
       if name
-        @log.info "ServerTemplate name detected."
+        @log.debug "ServerTemplate name detected."
         # find ServerTemplate by name
         st_list = list_resources(:server_templates, :by_name, name)
         revisions = st_list.map { |st| st.revision }
@@ -159,7 +162,7 @@ module RightApiHelper
         server_template = st_list.select { |st| st.revision == latest_rev}.first
         raise RightScaleError, "ERROR: Unable to find ServerTemplate with the name of '#{name}' found " unless server_template
       else
-        @log.info "Looking up ServerTemplate by ID."
+        @log.debug "Looking up ServerTemplate by ID."
         # find ServerTemplate by id
         server_template = @client.server_templates.index(:id => id)
       end
@@ -348,7 +351,7 @@ module RightApiHelper
 
     def list_subresources(api_resource, subresource, filter_key, filter_value)
       raise ArgumentError.new("subresource must be a symbol") unless subresource.kind_of?(Symbol)
-      key = filter_key.to_s.delete("by_") # convert :by_name to "name"
+      key = filter_key.to_s.sub(/by_/,"") # convert :by_name to "name"
       filter = {}
       filter = {:filter => ["#{key}==#{filter_value}"]} if filter_value
       list = api_resource.show.send(subresource).index(filter)

data/lib/right_api_helper/provisioner.rb

@@ -134,7 +134,8 @@ module RightApiHelper
         security_groups ||= ["default"]
         security_groups.each do |name|
           group = @api_shim.find_security_group_by_name(@cloud, name)
-          raise RightScaleError, "ERROR: cannot find an security group named: #{name}" unless group
+          group = @api_shim.find_security_group_by_id(@cloud, name) unless group
+          raise RightScaleError, "ERROR: cannot find an security group : #{name}" unless group
           @sec_groups << group
         end
       end
@@ -192,7 +193,7 @@ module RightApiHelper
 
         # setup any inputs
         begin
-          @client.set_server_inputs(@server, inputs) if inputs && ! inputs.empty?
+          @api_shim.set_server_inputs(@server, inputs) if inputs && ! inputs.empty?
         rescue Exception => e
           raise RightScaleError, "Problem setting inputs. \n #{e.message}\n\n"
         end

data/lib/right_api_helper/version.rb

@@ -1,3 +1,3 @@
 module RightApiHelper
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/spec/provisioner_spec.rb

@@ -10,7 +10,7 @@ describe RightApiHelper::Provisioner do
     end
     VCR.use_cassette('right_api_general') do
       @helper = RightApiHelper::Provisioner.new(@right_api_client)
-      @logger = stub("Logger")
+      @logger = double("Logger")
       @helper.logger(@logger)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: right_api_helper
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors: