Skip to content
Browse files

Merge branch 'services-r12'

Conflicts:
	vcap_common.gemspec

Change-Id: I27d281ab3848f898a05caee83572ef6b39066363
  • Loading branch information...
2 parents beed97f + 2715dbd commit a7779114db666a1cf5eedf3fd1576c657ccafb6d @kushmerick kushmerick committed Jun 5, 2012
View
2 Gemfile.lock
@@ -20,7 +20,7 @@ GEM
eventmachine (>= 0.12.9)
escape_utils (0.2.4)
eventmachine (0.12.11.cloudfoundry.3)
- json_pure (1.6.6)
+ json_pure (1.7.3)
nats (0.4.22)
daemons (>= 1.1.4)
eventmachine (>= 0.12.10)
View
2 lib/services/api/clients/service_gateway_client.rb
@@ -146,7 +146,7 @@ def perform_request(http_method, path, msg=VCAP::Services::Api::EMPTY_REQUEST)
result = nil
uri = URI.parse(@url)
if EM.reactor_running?
- url = uri.merge!(path)
+ url = URI.parse(uri.to_s + path)
http = AsyncHttpRequest.fibered(url, @token, http_method, @timeout, msg)
raise UnexpectedResponse, "Error sending request #{msg.extract.to_json} to gateway #{@url}: #{http.error}" unless http.error.empty?
code = http.response_header.status.to_i
View
1 lib/services/api/messages.rb
@@ -24,6 +24,7 @@ class ServiceOfferingRequest < JsonMessage
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
View
2 lib/vcap/component.rb
@@ -45,7 +45,7 @@ def call(env)
class Component
# We will suppress these from normal varz reporting by default.
- CONFIG_SUPPRESS = Set.new([:mbus, :service_mbus, :keys, :database_environment, :password, :pass])
+ CONFIG_SUPPRESS = Set.new([:mbus, :service_mbus, :keys, :database_environment, :password, :pass, :token])
class << self
View
9 spec/functional/component_spec.rb
@@ -67,7 +67,8 @@
:keys => 'sekret!keys',
:password => 'crazy',
:pass => 'crazy',
- :database_environment => { :stuff => 'should not see' }
+ :database_environment => { :stuff => 'should not see' },
+ :token => 't0ken'
}
VCAP::Component.register(options)
done
@@ -84,7 +85,7 @@
:password => 'crazy',
:pass => 'crazy',
:database_environment => { :stuff => 'should not see' },
- :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :test => 'ok'}
+ :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :test => 'ok', :token => 't0ken'}
}
VCAP::Component.register(options)
done
@@ -102,7 +103,7 @@
:password => 'crazy',
:pass => 'crazy',
:database_environment => { :stuff => 'should not see' },
- :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
+ :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :mysql => 'sekret!', :test => 'ok', :token => 't0ken'}
}
VCAP::Component.register(options)
@@ -113,7 +114,7 @@
:password => 'crazy',
:pass => 'crazy',
:database_environment => { :stuff => 'should not see' },
- :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
+ :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :mysql => 'sekret!', :test => 'ok', :token => 't0ken'}
})
done
end

0 comments on commit a777911

Please sign in to comment.
Something went wrong with that request. Please try again.