vcap_common 1.0.10 → 2.0.8

data/lib/services/api/const.rb

@@ -2,6 +2,7 @@
 module VCAP
   module Services
     module Api
+      SDS_UPLOAD_TOKEN_HEADER = 'X-VCAP-SDS-Upload-Token'
       GATEWAY_TOKEN_HEADER = 'X-VCAP-Service-Token'
       SERVICE_LABEL_REGEX  = /^\S+-\S+$/
     end

data/lib/services/api/messages.rb

@@ -2,6 +2,7 @@
 require 'uri'
 
 require 'services/api/const'
+require 'membrane'
 require 'json_message'
 
 module VCAP
@@ -17,21 +18,26 @@ module VCAP
       # NB: Deleting an offering takes all args in the url
       #
       class ServiceOfferingRequest < JsonMessage
-        required :label,       SERVICE_LABEL_REGEX
-        required :url,         URI::regexp(%w(http https))
+        required :label,        SERVICE_LABEL_REGEX
+        required :url,          URI::regexp(%w(http https))
+        required :supported_versions, [String]
+        required :version_aliases, Hash
 
-        optional :description, String
-        optional :info_url,    URI::regexp(%w(http https))
-        optional :tags,        [String]
-        optional :plans,       [String]
+        optional :description,  String
+        optional :info_url,     URI::regexp(%w(http https))
+        optional :tags,         [String]
+        optional :plans,        [String]
+        optional :cf_plan_id
         optional :plan_options
         optional :binding_options
         optional :acls
         optional :active
-        optional :timeout,     Integer
+        optional :timeout,      Integer
+        optional :provider,     String
+        optional :default_plan, String
       end
 
-      class BrokeredServiceOfferingRequest < JsonMessage
+      class ProxiedServiceOfferingRequest < JsonMessage
         required :label,        SERVICE_LABEL_REGEX
         required :options,      [{"name" => String, "credentials" => Hash}]
         optional :description,  String
@@ -44,11 +50,11 @@ module VCAP
       end
 
       class ListHandlesResponse < JsonMessage
-        required :handles, [::JsonSchema::WILDCARD]
+        required :handles, [Object]
       end
 
-      class ListBrokeredServicesResponse < JsonMessage
-        required :brokered_services, [{"label" => String, "description" => String, "acls" => {"users" => [String], "wildcards" => [String]}}]
+      class ListProxiedServicesResponse < JsonMessage
+        required :proxied_services, [{"label" => String, "description" => String, "acls" => {"users" => [String], "wildcards" => [String]}}]
       end
 
       #
@@ -59,8 +65,10 @@ module VCAP
         required :label, SERVICE_LABEL_REGEX
         required :name,  String
         required :plan,  String
+        required :version, String
 
         optional :plan_option
+        optional :provider, String
       end
 
       class GatewayProvisionRequest < JsonMessage
@@ -68,13 +76,15 @@ module VCAP
         required :name,  String
         required :plan,  String
         required :email, String
+        required :version, String
 
         optional :plan_option
       end
 
-      class GatewayProvisionResponse < JsonMessage
+      # Provision and bind response use the same format
+      class GatewayHandleResponse < JsonMessage
         required :service_id, String
-        required :data
+        required :configuration
         required :credentials
       end
 
@@ -105,12 +115,6 @@ module VCAP
         required :binding_token, String
       end
 
-      class GatewayBindResponse < JsonMessage
-        required :service_id, String
-        required :configuration
-        required :credentials
-      end
-
       # Bind app_name using binding_token
       class BindExternalRequest < JsonMessage
         required :binding_token, String
@@ -126,10 +130,15 @@ module VCAP
         required :snapshot_id,  String
         required :date,  String
         required :size,  Integer
+        required :name,  String
       end
 
       class SnapshotList < JsonMessage
-        required :snapshots,  [::JsonSchema::WILDCARD]
+        required :snapshots,  [Object]
+      end
+
+      class UpdateSnapshotNameRequest < JsonMessage
+        required :name, String
       end
 
       class Job < JsonMessage
@@ -138,7 +147,7 @@ module VCAP
         required :start_time, String
         optional :description, String
         optional :complete_time, String
-        optional :result, ::JsonSchema::WILDCARD
+        optional :result, Object
       end
 
       class SerializedURL < JsonMessage
@@ -148,6 +157,11 @@ module VCAP
       class SerializedData < JsonMessage
         required :data,  String
       end
+
+      class ServiceErrorResponse < JsonMessage
+        required :code, Integer
+        required :description, String
+      end
     end
   end
 end

data/lib/services/api/multipart.rb

@@ -0,0 +1,191 @@
+# Copyright (c) 2009-2011 VMware, Inc.
+require 'eventmachine'
+require 'em-http-request'
+
+# monkey-patch for em-http-request to support multipart file upload
+
+module EventMachine
+  class StreamUploadIO
+    attr_reader :args, :filename, :basename, :size, :content_type
+    def initialize(filename, content_type, args={})
+      # disable http chunking
+      @args = args.merge({:http_chunks => false})
+      @filename = filename
+      # FIXME how to catch exception and log it
+      begin
+        @basename = File.basename(filename)
+        @size = File.size(filename)
+      rescue => e
+        # size == 0, the part will be injected
+        @size = 0
+      end
+      @content_type = content_type
+    end
+
+    def add_extra_size(extra_size)
+      @size += extra_size
+    end
+
+    def length
+      @size
+    end
+
+    def stream_file_data
+      true
+    end
+  end
+
+  module Part
+    def self.create(boundary, k, v)
+      if v.respond_to?(:stream_file_data)
+        FilePart.new(boundary, k, v)
+      else
+        ParamPart.new(boundary, k, v)
+      end
+    end
+
+    def to_io
+      @io
+    end
+
+    def length
+      @io.size
+    end
+
+    def send_part(conn, parts, idx)
+    end
+
+    def get_next_part(parts, idx)
+      next_idx = idx.to_i + 1
+      if parts && next_idx < parts.size && next_idx >=0
+        next_part = parts[next_idx]
+      else
+        nil
+      end
+      next_part
+    end
+
+    def send_next_part(conn, parts, idx)
+      next_part = get_next_part(parts, idx)
+      next_part.send_part(conn, parts, idx+1) if next_part
+    end
+
+  end
+
+  class ParamPart
+    include Part
+    def initialize(boundary, name, value)
+      @boundary = boundary
+      @name = name
+      part = ''
+      part << "--#{@boundary}\r\n"
+      part << "Content-Disposition: form-data; name=\"#{@name.to_s}\"\r\n"
+      part << "\r\n"
+      part << "#{value.to_s}\r\n"
+      @io = StringIO.new(part)
+    end
+
+    def send_part(conn, parts, idx)
+      conn.send_data @io.string if conn
+      send_next_part(conn, parts, idx)
+    end
+  end
+
+  class EpiloguePart
+    include Part
+    def initialize(boundary)
+      @io = StringIO.new("--#{boundary}--\r\n") #\r\n or \r\n\r\n
+    end
+
+    def send_part(conn, parts, idx)
+      conn.send_data @io.string if conn
+      # this part should be the last part
+    end
+  end
+
+  class FilePart
+    include Part
+    def initialize(boundary, name, upload_io)
+      @boundary = boundary
+      @name = name
+      @io = upload_io
+      @part = ''
+      @part << "--#{boundary}\r\n"
+      @part << "Content-Disposition: form-data; name=\"#{name.to_s}\"; filename=\"#{@io.filename}\"\r\n"
+      @part << "Content-Length: #{@io.size}\r\n"
+      @part << "Content-Type: #{@io.content_type}\r\n"
+      @part << "Content-Transfer-Encoding: binary\r\n"
+      @part << "\r\n"
+      @end_part ="\r\n"
+      @io.add_extra_size(@part.size + @end_part.size)
+    end
+
+    def send_part(conn, parts, idx)
+      conn.send_data @part
+      streamer = EM::FileStreamer.new(conn, @io.filename, @io.args)
+      streamer.callback {
+        conn.send_data @end_part
+        send_next_part(conn, parts, idx)
+      }
+    end
+  end
+
+  class Multipart
+    DEFAULT_BOUNDARY = "-----------RubyEMMultiPartPost"
+    attr_reader :parts, :ps, :content_type, :content_length, :boundary, :headers
+    def initialize(params, headers={}, boundary=DEFAULT_BOUNDARY)
+      @parts = params.map{ |k,v| Part.create(boundary, k, v) }
+      @parts << EpiloguePart.new(boundary)
+      # inject the part with length = 0
+      @ps = @parts.select{ |part| part.length > 0 }
+      @content_type = "multipart/form-data; boundary=#{boundary}"
+      @content_length = 0
+      @parts.each do |part|
+        @content_length += part.length
+      end
+      @boundary = boundary
+      @headers = headers
+    end
+
+    def send_body(conn)
+      if conn && conn.error.nil? && @parts.size > 0
+        part = @parts.first
+        part.send_part(conn, @parts, 0)
+      end
+    end
+  end
+end
+
+## Support to streaming the file when sending body
+## TODO FIXME this patch whether depends on specified version???
+module EventMachine
+  class HttpClient
+    alias_method :original_send_request, :send_request
+    def multipart_request?
+      (@req.method == 'POST' or @req.method == 'PUT') and @options[:multipart]
+    end
+
+    def send_request(head, body)
+      unless multipart_request?
+        original_send_request(head, body)
+      else
+        body = normalize_body(body)
+        multipart = @options[:multipart]
+        query = @options[:query]
+
+        head['content-length'] = multipart.content_length
+        head['content-type'] = multipart.content_type
+        extra_headers = {}
+        extra_headers = multipart.headers.reject { |k, v| %w(content-length content-type).include?(k.to_s.downcase) }
+        head.merge!  extra_headers
+
+        request_header ||= encode_request(@req.method, @req.uri, query, @conn.opts.proxy)
+        request_header << encode_headers(head)
+        request_header << CRLF
+        @conn.send_data request_header
+
+        multipart.send_body(@conn)
+      end
+    end
+  end
+end

data/lib/vcap/component.rb

@@ -45,7 +45,7 @@ module VCAP
   class Component
 
     # We will suppress these from normal varz reporting by default.
-    CONFIG_SUPPRESS = Set.new([:mbus, :service_mbus, :keys, :database_environment, :mysql, :password])
+    CONFIG_SUPPRESS = Set.new([:mbus, :service_mbus, :keys, :database_environment, :password, :pass, :token])
 
     class << self
 

data/lib/vcap/config.rb

@@ -2,7 +2,7 @@
 require 'yaml'
 
 require 'vcap/common'
-require 'vcap/json_schema'
+require 'membrane'
 
 module VCAP
   class Config
@@ -10,13 +10,13 @@ module VCAP
       attr_reader :schema
 
       def define_schema(&blk)
-        @schema = VCAP::JsonSchema.build(&blk)
+        @schema = Membrane::SchemaParser.parse(&blk)
       end
 
       def from_file(filename, symbolize_keys=true)
         config = YAML.load_file(filename)
-        @schema.validate(config)
         config = VCAP.symbolize_keys(config) if symbolize_keys
+        @schema.validate(config)
         config
       end
 
@@ -27,6 +27,5 @@ module VCAP
         end
       end
     end
-
   end
 end

data/lib/vcap/sorted_set_utils.rb

@@ -0,0 +1,42 @@
+# Copyright (c) 2009-2012 VMware, Inc.
+#
+# These two methods provide support for transfering an integer sorted set to/from
+# array. When encoded into JSON format, the to_int_array method is space efficient
+# comparing to the native to_a method of sorted set.
+#
+# For example, the following set
+# [12345, 12456, 13457, 13567, 14203, 14214]
+#
+# After encoded by to_int_array, it becomes
+# [12345, 111, 1, 90, 636, 11]
+#
+# The JSON format will save lots of space
+#
+
+require 'set'
+
+class SortedSet
+  def to_int_array
+    array = []
+
+    former = 0
+    self.each do |i|
+      array << i - former
+      former = i
+    end
+
+    array
+  end
+
+  def self.from_int_array(array)
+    set = SortedSet.new
+
+    current = 0
+    array.each do |i|
+      current += i
+      set << current
+    end
+
+    set
+  end
+end

data/lib/vcap/spec/forked_component/base.rb

@@ -11,7 +11,7 @@ end
 class VCAP::Spec::ForkedComponent::Base
   attr_reader :pid, :pid_filename, :output_basedir, :name, :cmd
 
-  attr_accessor :reopen_stdio
+  attr_accessor :reopen_stdio, :daemon
 
   # @param  cmd             String  Command to run
   # @param  name            String  Short name for this component (e.g. 'redis')
@@ -25,6 +25,7 @@ class VCAP::Spec::ForkedComponent::Base
     @pid_filename   = pid_filename
 
     @reopen_stdio = true
+    @daemon = false
 
   end
 
@@ -53,8 +54,12 @@ class VCAP::Spec::ForkedComponent::Base
 
   def stop
     return unless @pid && VCAP.process_running?(@pid)
-    Process.kill('TERM', @pid)
-    Process.waitpid(@pid, 0)
+    if @daemon
+      Process.kill('KILL', @pid)
+    else
+      Process.kill('TERM', @pid)
+      Process.waitpid(@pid, 0)
+    end
     FileUtils.rm_f(@pid_filename) if @pid_filename
     @pid = nil