rest_connection 0.1.1 → 0.1.2

data/lib/rest_connection/rightscale/account.rb

@@ -24,4 +24,6 @@
 class Account
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
+
+  deny_methods :index, :create, :destroy, :update
 end

data/lib/rest_connection/rightscale/alert_spec.rb

@@ -17,11 +17,7 @@ class AlertSpec
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
 
-
-
   def attach(params)
-    connection.post('alert_spec_subjects.js' , :alert_spec_subject => params)
+    AlertSpecSubject.create(params)
   end
-
-
 end

data/lib/rest_connection/rightscale/alert_spec_subject.rb

@@ -0,0 +1,21 @@
+#    This file is part of RestConnection
+#
+#    RestConnection is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    RestConnection is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with RestConnection.  If not, see <http://www.gnu.org/licenses/>.
+#
+class AlertSpecSubject
+  include RightScale::Api::Base
+  extend RightScale::Api::BaseExtend
+
+  deny_methods :index, :destroy, :update, :show
+end

data/lib/rest_connection/rightscale/audit_entry.rb

@@ -28,6 +28,8 @@ class AuditEntry
   include  RightScale::Api::Base
   extend RightScale::Api::BaseExtend
 
+  deny_methods :index, :create, :destroy, :update
+
   def wait_for_state(state, timeout=900)
     while(timeout > 0)
       reload

data/lib/rest_connection/rightscale/child_account.rb

@@ -25,6 +25,8 @@ class ChildAccount
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :destroy, :update, :show
+
   def self.filters
     [:name]
   end

data/lib/rest_connection/rightscale/cloud.rb

@@ -20,6 +20,8 @@ class Cloud
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :create, :destroy, :update
+
   def self.filters
     [:description, :name]
   end

data/lib/rest_connection/rightscale/cloud_account.rb

@@ -20,6 +20,8 @@ class CloudAccount
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :update
+
   def cloud_id
     self.cloud.split("/").last
   end

data/lib/rest_connection/rightscale/ec2_ebs_volume.rb

@@ -21,6 +21,10 @@ class Ec2EbsVolume
   extend RightScale::Api::TaggableExtend
 
   def attach(params)
-    connection.post('component_ec2_ebs_volumes.js' , :component_ec2_ebs_volume => params)
+    @link = ServerEc2EbsVolume.create(params)
+  end
+
+  def detach
+    @link.destroy if @link
   end
 end

data/lib/rest_connection/rightscale/ec2_elastic_ip.rb

@@ -17,4 +17,6 @@
 class Ec2ElasticIp
   include  RightScale::Api::Base
   extend RightScale::Api::BaseExtend
+
+  deny_methods :update
 end

data/lib/rest_connection/rightscale/ec2_security_group.rb

@@ -16,4 +16,28 @@
 class Ec2SecurityGroup
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
+
+  # NOTE - Create, Destroy, and Update require "security_manager" permissions
+  # NOTE - Can't remove rules, can only add
+  def add_rule(opts={})
+    opts.each { |k,v| opts["#{k}".to_sym] = v }
+    update_types = [
+      :name => [:owner, :group],
+      :cidr_ips => [:cidr_ip, :protocol, :from_port, :to_port],
+      :group => [:owner, :group, :protocol, :from_port, :to_port],
+    ]
+    type = (opts[:protocol] ? (opts[:cidr_ip] ? :cidr_ips : :group) : :name)
+    unless update_types[type].reduce(true) { |b,field| b && opts[field] }
+      arg_expectation = update_types.values.pretty_inspect
+      raise ArgumentError.new("add_rule requires one of these groupings: #{arg_expectation}")
+    end
+
+    params = {}
+    update_types[type].each { |field| params[field] = opts[field] }
+
+    uri = URI.parse(self.href)
+    connection.put(uri.path, params)
+
+    self.reload
+  end
 end

data/lib/rest_connection/rightscale/ec2_ssh_key.rb

@@ -17,6 +17,8 @@ class Ec2SshKey
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
 
+  deny_methods :index, :update
+
   def self.create(opts)
     create_opts = { self.resource_singular_name.to_sym => opts }
     create_opts['cloud_id'] = opts['cloud_id'] if opts['cloud_id']

data/lib/rest_connection/rightscale/executable.rb

@@ -2,6 +2,8 @@ class Executable
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
 
+  deny_methods :index, :create, :destroy, :update
+
   # executable can be EITHER a right_script or recipe
   # executable example params format:
   # can have recipes AND right_scripts

data/lib/rest_connection/rightscale/instance_type.rb

@@ -20,10 +20,16 @@ class InstanceType
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :create, :destroy, :update
+
   def self.parse_args(cloud_id)
     "clouds/#{cloud_id}/"
   end
 
+  def self.filters
+    [:cpu_architecture, :description, :name, :resource_uid]
+  end
+
   def show
     inst_href = URI.parse(self.href)
     @params.merge! connection.get(inst_href.path, 'view' => "default")

data/lib/rest_connection/rightscale/mc_datacenter.rb

@@ -20,6 +20,8 @@ class McDatacenter
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :create, :destroy, :update
+
   def resource_plural_name
     "datacenters"
   end

data/lib/rest_connection/rightscale/mc_image.rb

@@ -20,6 +20,8 @@ class McImage
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :create, :destroy, :update
+
   def resource_plural_name
     "images"
   end

data/lib/rest_connection/rightscale/mc_instance.rb

@@ -24,6 +24,8 @@ class McInstance
   include RightScale::Api::McInput
   attr_accessor :monitoring_metrics
 
+  deny_methods :create, :destroy
+
   def resource_plural_name
     "instances"
   end

data/lib/rest_connection/rightscale/mc_instance_type.rb

@@ -20,6 +20,8 @@ class McInstanceType
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :create, :destroy, :update
+
   def resource_plural_name
     "instance_types"
   end

data/lib/rest_connection/rightscale/mc_multi_cloud_image.rb

@@ -23,6 +23,8 @@ class McMultiCloudImage
   extend RightScale::Api::McTaggableExtend
   attr_reader :settings
 
+  deny_methods :create, :destroy, :update
+
   def resource_plural_name
     "multi_cloud_images"
   end

data/lib/rest_connection/rightscale/mc_multi_cloud_image_setting.rb

@@ -20,6 +20,8 @@ class McMultiCloudImageSetting
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :create, :destroy, :update
+
   def resource_plural_name
     "settings"
   end

data/lib/rest_connection/rightscale/mc_security_group.rb

@@ -20,6 +20,8 @@ class McSecurityGroup
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :update
+
   def resource_plural_name
     "security_groups"
   end
@@ -43,4 +45,64 @@ class McSecurityGroup
   def self.filters
     [:name, :resource_uid]
   end
+
+  # NOTE: Create & Destroy require "security_manager" permissions
+  def self.create(cloud_id, opts={})
+    url = "#{parse_args(cloud_id)}#{self.resource_plural_name}"
+    location = connection.post(url, self.resource_singular_name.to_sym => opts)
+    newrecord = self.new('links' => [ {'rel' => 'self', 'href' => location } ])
+
+    rules = opts[:rules] || opts["rules"]
+    [rules].flatten.each { |rule_hash| newrecord.add_rule(rule_hash) } if rules
+
+    newrecord.reload
+    newrecord
+  end
+
+  def rules
+    self.load(SecurityGroupRule)
+  end
+
+  def add_rule(opts={})
+    opts.each { |k,v| opts["#{k}".to_sym] = v }
+    fields = [
+      {"1.0" => :owner,     "1.5" => :group_owner},         # optional
+      {"1.0" => :group,     "1.5" => :group_name},          # optional
+      {"1.0" => :cidr_ip,   "1.5" => :cidr_ips},            # optional
+      {"1.0" => :protocol,  "1.5" => :protocol},            # "tcp" || "udp" || "icmp"
+      {"1.0" => :from_port, "1.5" => :start_port},          # optional
+      {"1.0" => :to_port,   "1.5" => :end_port},            # optional
+      {                     "1.5" => :source_type},         # "cidr_ips" || "group"
+      {                     "1.5" => :icmp_code},           # optional
+      {                     "1.5" => :icmp_type},           # optional
+      {                     "1.5" => :security_group_href}, # optional
+    ]
+    unless opts[:protocol]
+      raise ArgumentError.new("add_rule requires the 'protocol' option")
+    end
+    params = {
+      :source_type => ((opts[:cidr_ip] || opts[:cidr_ips]) ? "cidr_ips" : "group"),
+      :security_group_href => self.href,
+      :protocol_details => {}
+    }
+
+    fields.each { |ver|
+      next unless val = opts[ver["1.0"]] || opts[ver["1.5"]]
+      if ver["1.5"].to_s =~ /port|icmp/
+        params[:protocol_details][ver["1.5"]] = val
+      else
+        params[ver["1.5"]] = val
+      end
+    }
+
+    SecurityGroupRule.create(params)
+  end
+
+  def remove_rules_by_filters(filters={})
+    rules_to_delete = rules
+    filters.each do |filter,regex|
+      @rules.reject! { |rule| rule[filter] =~ Regexp.new(regex) }
+    end
+    @rules.each { |rule| rule.destroy }
+  end
 end

data/lib/rest_connection/rightscale/mc_server_template_multi_cloud_image.rb

@@ -21,6 +21,8 @@ class McServerTemplateMultiCloudImage
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :update
+
   def resource_plural_name
     "server_template_multi_cloud_images"
   end

data/lib/rest_connection/rightscale/mc_ssh_key.rb

@@ -20,6 +20,8 @@ class McSshKey
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :update
+
   def resource_plural_name
     "ssh_keys"
   end

data/lib/rest_connection/rightscale/mc_tag.rb

@@ -20,6 +20,8 @@ class McTag
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :index, :show, :create, :destroy, :update
+
   def resource_plural_name
     "tags"
   end

data/lib/rest_connection/rightscale/mc_volume.rb

@@ -22,6 +22,8 @@ class McVolume
   include RightScale::Api::McTaggable
   extend RightScale::Api::McTaggableExtend
 
+  deny_methods :update
+
   def resource_plural_name
     "volumes"
   end

data/lib/rest_connection/rightscale/mc_volume_attachment.rb

@@ -20,6 +20,8 @@ class McVolumeAttachment
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :update
+
   def resource_plural_name
     "volume_attachments"
   end

data/lib/rest_connection/rightscale/mc_volume_snapshot.rb

@@ -22,6 +22,8 @@ class McVolumeSnapshot
   include RightScale::Api::McTaggable
   extend RightScale::Api::McTaggableExtend
 
+  deny_methods :update
+
   def resource_plural_name
     "volume_snapshots"
   end

data/lib/rest_connection/rightscale/mc_volume_type.rb

@@ -20,6 +20,8 @@ class McVolumeType
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :create, :destroy, :update
+
   def resource_plural_name
     "volume_types"
   end

data/lib/rest_connection/rightscale/monitoring_metric.rb

@@ -20,6 +20,8 @@ class MonitoringMetric
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :create, :destroy, :update
+
   def self.parse_args(cloud_id, instance_id)
     "clouds/#{cloud_id}/instances/#{instance_id}/"
   end

data/lib/rest_connection/rightscale/multi_cloud_image.rb

@@ -17,6 +17,8 @@ class MultiCloudImage
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
 
+  deny_methods :create, :destroy, :update
+
   def supported_cloud_ids
     @params["multi_cloud_image_cloud_settings"].map { |mcics| mcics.cloud_id }
   end

data/lib/rest_connection/rightscale/permission.rb

@@ -25,6 +25,8 @@ class Permission
   include RightScale::Api::Gateway
   extend RightScale::Api::GatewayExtend
 
+  deny_methods :update
+
   def self.filters
     [:user_href]
   end

data/lib/rest_connection/rightscale/right_script.rb

@@ -17,6 +17,9 @@
 class RightScript
   include RightScale::Api::Base
   extend RightScale::Api::BaseExtend
+
+  deny_methods :create, :destroy, :update
+
   def self.from_yaml(yaml)
     scripts = []
     x = YAML.load(yaml)

data/lib/rest_connection/rightscale/rightscale_api_base.rb

@@ -17,6 +17,19 @@ require 'active_support/inflector'
 
 module RightScale
   module Api
+    BASE_COOKIE_REFRESH = proc do
+      def refresh_cookie
+        # login
+        @cookie = nil
+        resp = get("login")
+        unless resp.code == "302" || resp.code == "204"
+          raise "ERROR: Login failed. #{resp.message}. Code:#{resp.code}"
+        end
+        @cookie = resp.response['set-cookie']
+        true
+      end
+    end
+
     module BaseExtend
       def connection()
         @@connection ||= RestConnection::Connection.new
@@ -24,6 +37,12 @@ module RightScale
         settings[:common_headers]["X_API_VERSION"] = "1.0"
         settings[:api_href] = settings[:api_url]
         settings[:extension] = ".js"
+
+        unless @@connection.respond_to?(:refresh_cookie)
+          @@connection.instance_exec(&(RightScale::Api::BASE_COOKIE_REFRESH))
+        end
+
+        @@connection.refresh_cookie unless @@connection.cookie
         @@connection
       end
 
@@ -59,7 +78,7 @@ module RightScale
       end
 
       def find_by_nickname(nickname)
-        connection.logger("DEPRICATION WARNING: use of find_by_nickname is depricated, please use find_by(:nickname) { |n| n == '#{nickname}' } ")
+        connection.logger("DEPRECATION WARNING: use of find_by_nickname is deprecated, please use find_by(:nickname) { |n| n == '#{nickname}' } ")
         self.find_by(:nickname) { |n| n == nickname }
       end
 
@@ -89,7 +108,7 @@ module RightScale
       end
 
       def find_by_id(id)
-        connection.logger("DEPRICATION WARNING: use of find_by_id is depricated, please use find(id) ")
+        connection.logger("DEPRECATION WARNING: use of find_by_id is deprecated, please use find(id) ")
         self.find(id)
       end
 
@@ -100,12 +119,12 @@ module RightScale
         newrecord
       end
 
-# filter is only implemented on some api endpoints
+      # filter is only implemented on some api endpoints
       def find_by_nickname_speed(nickname)
         self.find_with_filter('nickname' => nickname)
       end
 
-# filter is only implemented on some api endpoints
+      # filter is only implemented on some api endpoints
       def find_with_filter(filter = {})
         filter_params = []
         filter.each { |key,val|
@@ -160,6 +179,28 @@ module RightScale
         }
         return (args.empty? ? find_all : ret.flatten.uniq)
       end
+
+      def deny_methods(*symbols)
+        symbols.map! { |sym| sym.to_sym }
+        if symbols.delete(:index)
+          symbols |= [:find_all, :find_by, :find_by_cloud_id, :find_by_nickname, :find_by_nickname_speed, :find_with_filter]
+        end
+        if symbols.delete(:show)
+          symbols |= [:show, :reload, :find, :find_by_id]
+        end
+        if symbols.delete(:update)
+          symbols |= [:save, :update]
+        end
+        symbols.each do |sym|
+          sym = sym.to_sym
+          eval_str = "undef #{sym.inspect}"
+          if self.respond_to?(sym)
+            instance_eval(eval_str)
+          elsif self.new.respond_to?(sym)
+            class_eval(eval_str)
+          end
+        end
+      end
     end
 
     module Base
@@ -175,6 +216,12 @@ module RightScale
         settings[:common_headers]["X_API_VERSION"] = "1.0"
         settings[:api_href] = settings[:api_url]
         settings[:extension] = ".js"
+
+        unless @@connection.respond_to?(:refresh_cookie)
+          @@connection.instance_exec(&(RightScale::Api::BASE_COOKIE_REFRESH))
+        end
+
+        @@connection.refresh_cookie unless @@connection.cookie
         @@connection
       end