Merge pull request cloudfoundry#1716 from cloudfoundry/v2_app_links

V2 apps return correct app guid in links

Author: reneighbor

app/controllers/runtime/apps_controller.rb

@@ -122,6 +122,10 @@ def self.translate_memory_validation_exception(memory_errors)
       end
     end
 
+    def self.url_for_guid(_, process)
+      super(process.app_guid, process)
+    end
+
     def inject_dependencies(dependencies)
       super
       @app_event_repository = dependencies.fetch(:app_event_repository)
@@ -196,10 +200,6 @@ def upload_droplet(guid)
       [HTTP::CREATED, JobPresenter.new(enqueued_job).to_json]
     end
 
-    def url_for_guid(_, process)
-      super(process.app_guid, process)
-    end
-
     def read(guid)
       process = find_guid(guid)
       raise CloudController::Errors::ApiError.new_from_details('AppNotFound', guid) unless process.web?

app/presenters/v2/relations_presenter.rb

@@ -89,7 +89,7 @@ def add_relationship_url_to_response(response, controller, associated_controller
           if association.is_a?(VCAP::CloudController::RestController::ControllerDSL::ToOneAttribute)
             associated_model_instance = get_preloaded_association_contents!(obj, association)
             if associated_model_instance
-              associated_url = associated_controller.url_for_guid(associated_model_instance.guid)
+              associated_url = associated_controller.url_for_guid(associated_model_instance.guid, associated_model_instance)
             end
           else
             associated_url = "#{controller.url_for_guid(obj.guid, obj)}/#{relationship_name}"

spec/unit/controllers/runtime/apps_controller_spec.rb

@@ -622,10 +622,13 @@ def update_app
       context 'when the app has rolled to a new web process' do
         before do
           process.destroy
-          ProcessModelFactory.make(instances: 1, app: app_model)
         end
 
+        let!(:new_process) { ProcessModel.make(type: ProcessTypes::WEB, app: app_model) }
+
         it 'returns the app with the appropriate app guid' do
+          expect(app_guid).not_to eq(new_process.guid)
+
           get "/v2/apps/#{app_guid}"
           expect(decoded_response['metadata']).to include({
             'guid' => app_guid.to_s,