Merge branch 'services-r11'

- bump vcap/services - bump vcap_common gem version to 1.0.12 Conflicts: cloud_controller/Gemfile.lock cloud_controller/vendor/cache/vcap_common-1.0.11.gem common/vcap_common.gemspec Change-Id: I09534faafb367a6cd2046c7fa4e15700366019e4
cloudfoundry · May 18, 2012 · cbeb8a1 · cbeb8a1
2 parents 85e1801 + 6528fd7
commit cbeb8a1
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 16 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vcap_common (1.0.11)
+    vcap_common (1.0.12)
       eventmachine (~> 0.12.11.cloudfoundry.3)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
@@ -20,8 +20,8 @@ GEM
       eventmachine (>= 0.12.9)
     escape_utils (0.2.4)
     eventmachine (0.12.11.cloudfoundry.3)
-    json_pure (1.6.5)
+    json_pure (1.6.6)
-    nats (0.4.22.beta.8)
+    nats (0.4.22)
       daemons (>= 1.1.4)
       eventmachine (>= 0.12.10)
       json_pure (>= 1.6.1)

diff --git a/lib/services/api/clients/service_gateway_client.rb b/lib/services/api/clients/service_gateway_client.rb
@@ -103,11 +103,16 @@ def delete_snapshot(args)
       Job.decode(resp)
     end
 
-    def serialized_url(args)
+    def create_serialized_url(args)
-      resp = perform_request(:get, "/gateway/v1/configurations/#{args[:service_id]}/serialized/url")
+      resp = perform_request(:post, "/gateway/v1/configurations/#{args[:service_id]}/serialized/url/snapshots/#{args[:snapshot_id]}")
       Job.decode(resp)
     end
 
+    def serialized_url(args)
+      resp = perform_request(:get, "/gateway/v1/configurations/#{args[:service_id]}/serialized/url/snapshots/#{args[:snapshot_id]}")
+      SerializedURL.decode(resp)
+    end
+
     def import_from_url(args)
       resp = perform_request(:put, "/gateway/v1/configurations/#{args[:service_id]}/serialized/url", args[:msg])
       Job.decode(resp)
@@ -167,10 +172,10 @@ def perform_request(http_method, path, msg=VCAP::Services::Api::EMPTY_REQUEST)
         begin
           # try to decode the response
           err = ServiceErrorResponse.decode(body)
-          raise ErrorResponse.new(code, err)
         rescue => e
           raise UnexpectedResponse, "Can't decode gateway response. status code:#{code}, response body:#{body}"
         end
+        raise ErrorResponse.new(code, err)
       end
     end
   end

diff --git a/lib/vcap/component.rb b/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, :mysql, :password])
+    CONFIG_SUPPRESS = Set.new([:mbus, :service_mbus, :keys, :database_environment, :password, :pass])
 
     class << self
 

diff --git a/spec/functional/component_spec.rb b/spec/functional/component_spec.rb
@@ -65,8 +65,8 @@
         options[:config] = {
           :mbus => 'nats://user:pass@localhost:4223',
           :keys => 'sekret!keys',
-          :mysql => { :user => 'derek', :password => 'sekret!' },
           :password => 'crazy',
+          :pass => 'crazy',
           :database_environment => { :stuff => 'should not see' }
         }
         VCAP::Component.register(options)
@@ -81,10 +81,10 @@
         options[:config] = {
           :mbus => 'nats://user:pass@localhost:4223',
           :keys => 'sekret!keys',
-          :mysql => { :user => 'derek', :password => 'sekret!' },
           :password => 'crazy',
+          :pass => 'crazy',
           :database_environment => { :stuff => 'should not see' },
-          :this_is_ok => { :password => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
+          :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :test => 'ok'}
         }
         VCAP::Component.register(options)
         done
@@ -98,20 +98,22 @@
         options[:config] = {
           :mbus => 'nats://user:pass@localhost:4223',
           :keys => 'sekret!keys',
-          :mysql => { :user => 'derek', :password => 'sekret!' },
+          :mysql => { :user => 'derek', :password => 'sekret!', :pass => 'sekret!' },
           :password => 'crazy',
+          :pass => 'crazy',
           :database_environment => { :stuff => 'should not see' },
-          :this_is_ok => { :password => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
+          :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
         }
         VCAP::Component.register(options)
 
         options.should include(:config => {
           :mbus => 'nats://user:pass@localhost:4223',
           :keys => 'sekret!keys',
-          :mysql => { :user => 'derek', :password => 'sekret!' },
+          :mysql => { :user => 'derek', :password => 'sekret!', :pass => 'sekret!' },
           :password => 'crazy',
+          :pass => 'crazy',
           :database_environment => { :stuff => 'should not see' },
-          :this_is_ok => { :password => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
+          :this_is_ok => { :password => 'sekret!', :pass => 'sekret!', :mysql => 'sekret!', :test => 'ok'}
         })
         done
       end

diff --git a/spec/unit/service_gateway_client_spec.rb b/spec/unit/service_gateway_client_spec.rb
@@ -65,8 +65,9 @@ class ServiceGatewayClient
         {:code => 40400, :description=> "not found"}.to_json,
         {:code => 50300, :description=> "internal"}.to_json,
         {:code => 50100, :description=> "not done yet"}.to_json,
+        {:bad_response => "foo"}.to_json,
       )
-      resp.should_receive(:code).and_return(404, 503, 500)
+      resp.should_receive(:code).and_return(404, 503, 500, 500)
       resp.should_receive(:start).any_number_of_times.and_return resp
 
       http_method = :get
@@ -75,6 +76,7 @@ class ServiceGatewayClient
 
       expect {client.perform_request(http_method, path)}.should raise_error(VCAP::Services::Api::ServiceGatewayClient::NotFoundResponse)
       expect {client.perform_request(http_method, path)}.should raise_error(VCAP::Services::Api::ServiceGatewayClient::GatewayInternalResponse)
+      expect {client.perform_request(http_method, path)}.should raise_error(VCAP::Services::Api::ServiceGatewayClient::ErrorResponse, /not done yet/)
       expect {client.perform_request(http_method, path)}.should raise_error(VCAP::Services::Api::ServiceGatewayClient::UnexpectedResponse)
     end
   end

diff --git a/vcap_common.gemspec b/vcap_common.gemspec
@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |s|
   s.name = 'vcap_common'
-  s.version = '1.0.11'
+  s.version = '1.0.12'
   s.date = '2011-02-09'
   s.summary = 'vcap common'
   s.homepage = "http://github.com/vmware-ac/core"