Bumped vcap_common and pass the dashboard_url back to CCNG in the pro…

…vision request response

marketplace/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-common.git
-  revision: b9c47759e11e1f55b7ad5265b95db3fc17a8c51f
+  revision: 129ef520424a81155c097b7a79aa13bb8b736fd7
   specs:
     vcap_common (2.0.10)
       em-http-request (~> 1.0)

marketplace/lib/marketplaces/appdirect/appdirect_helper.rb

@@ -35,8 +35,8 @@ def initialize(opts, logger)
             @appdirect_endpoint = appdirect_config[:endpoint]
             @offering_whitelist = OfferingWhitelist.new(opts[:offering_whitelist], logger)
             @app_direct_catalog = AppDirectCatalog.new(@appdirect_endpoint,
-                                 method(:perform_request),
-                                 logger)
+                                                       method(:perform_request),
+                                                       logger)
             @test_mode          = opts[:test_mode]
 
             if !@test_mode
@@ -84,9 +84,9 @@ def purchase_service(order)
               http_status, response_body = perform_request("post", url, HEADER, body)
 
               if http_status >= 200 and http_status < 300
-                logger.info("Provision successful")
-                logger.debug("Body: #{response_body}")
-                JSON.parse(response_body)
+                result = JSON.parse(response_body)
+                result.merge!('dashboard_url' => [url,result.fetch('uuid'), 'sso'].join('/'))
+                return result
               else
                 # 400 bad request
                 # 500 if AppDirect has issues

marketplace/lib/marketplaces/appdirect/appdirect_marketplace.rb

@@ -115,7 +115,8 @@ def provision_service(request_body)
             {
               :configuration => {:plan => request.plan, :name => request.name, :options => {} },
               :credentials => credentials,
-              :service_id => receipt["uuid"],
+              :service_id => receipt.fetch("uuid"),
+              :dashboard_url => receipt.fetch('dashboard_url'),
             }
           end
 

marketplace/spec/unit/marketplaces/appdirect/appdirect_marketplace_spec.rb

@@ -154,9 +154,18 @@ module VCAP::Services::Marketplace::Appdirect
         end.
         and_return(
           'credentials' => {},
-          'id'          => 'receipt_id'
+          'id'          => 'receipt_id',
+          'uuid'        => 'acbd-efgh',
+          'dashboard_url' => 'http://dashboard.io',
         )
-        appdirect_marketplace.provision_service(request_body)
+        appdirect_marketplace.provision_service(request_body).should ==
+          {
+          :configuration => {
+            :plan=>"free", :name=>"mongo name", :options=>{}},
+            :credentials=>{"name"=>"receipt_id"},
+            :service_id=>"acbd-efgh",
+            :dashboard_url=>"http://dashboard.io"
+        }
       end
 
       it "properly provisions services with dashes in their label" do

spec/integration/marketplace_gateway_spec.rb

@@ -44,11 +44,14 @@
     sendgrid_plans.fetch('resources').first.fetch('entity').fetch('extra').should be
   end
 
-  it "can provision a service instance" do
+  it "can provision a service instance with dashboad_url" do
     ccng_guid = provision_service_instance('awsome mongo', 'mongolab-dev', 'free')
 
     ccng_guid.should_not be_nil
-    ccng_service_instance_guids.should include(ccng_guid)
+    service = ccng_get('/v2/service_instances').fetch('resources').first
+    service.fetch('metadata').fetch('guid').should == ccng_guid
+    service.fetch('entity').fetch('dashboard_url').should =~
+      %r|http://localhost:9999/api/custom/cloudfoundry/v1/services/.*/sso|
 
     app_direct_service_instances = get_json('http://localhost:9999/test/provisioned_services')
     app_direct_service_instances.should have(1).entry