reorg app revisions controllers

* handle env vars
* seperate controllers for app/revisions and revisions/guid/x

[finishes #163440535]

Signed-off-by: Eric Promislow <eric.promislow@suse.com>

app/actions/app_revisions_update.rb → app/actions/revisions_update.rb

@@ -1,5 +1,5 @@
 module VCAP::CloudController
-  class AppRevisionsUpdate
+  class RevisionsUpdate
     class InvalidAppRevisions < StandardError
     end
 

app/controllers/v3/app_revisions_controller.rb

@@ -1,8 +1,6 @@
 require 'messages/app_revisions_list_message'
 require 'fetchers/app_fetcher'
 require 'fetchers/app_revisions_fetcher'
-require 'messages/app_revisions_update_message'
-require 'actions/app_revisions_update'
 require 'presenters/v3/revision_presenter'
 require 'controllers/v3/mixins/app_sub_resource'
 require 'presenters/v3/revision_environment_variables_presenter'
@@ -26,46 +24,4 @@ def index
       message: message
     )
   end
-
-  def show
-    revision = fetch_revision(hashed_params[:revision_guid])
-    render status: :ok, json: Presenters::V3::RevisionPresenter.new(revision)
-  end
-
-  def update
-    message = AppRevisionsUpdateMessage.new(hashed_params[:body])
-    unprocessable!(message.errors.full_messages) unless message.valid?
-
-    revision = fetch_revision(hashed_params[:revision_guid], needs_write_permissions: true)
-
-    revision = AppRevisionsUpdate.new.update(revision, message)
-
-    render status: :ok, json: Presenters::V3::RevisionPresenter.new(revision)
-  end
-
-  def show_environment_variables
-    app, space, org = AppFetcher.new.fetch(hashed_params[:guid])
-    app_not_found! unless app && permission_queryer.can_read_from_space?(space.guid, org.guid)
-    unauthorized! unless permission_queryer.can_read_secrets_in_space?(space.guid, org.guid)
-
-    revision = RevisionModel.find(guid: hashed_params[:revision_guid])
-    resource_not_found!(:revision) unless revision && revision.app_guid == app.guid
-
-    render status: :ok, json: Presenters::V3::RevisionEnvironmentVariablesPresenter.new(revision)
-  end
-
-  private
-
-  def fetch_revision(guid, needs_write_permissions: false)
-    revision = RevisionModel.find(guid: guid)
-    resource_not_found!(:revision) unless revision
-
-    app = revision.app
-    space = app.space
-    org = space.organization
-    app_not_found! unless permission_queryer.can_read_from_space?(space.guid, org.guid)
-    unauthorized! if needs_write_permissions && !permission_queryer.can_write_to_space?(space.guid)
-
-    revision
-  end
 end

app/controllers/v3/revisions_controller.rb

@@ -0,0 +1,43 @@
+require 'messages/revisions_update_message'
+require 'actions/revisions_update'
+require 'presenters/v3/revision_presenter'
+require 'presenters/v3/revision_environment_variables_presenter'
+
+class RevisionsController < ApplicationController
+  def show
+    revision = fetch_revision(hashed_params[:revision_guid])
+    render status: :ok, json: Presenters::V3::RevisionPresenter.new(revision)
+  end
+
+  def update
+    message = RevisionsUpdateMessage.new(hashed_params[:body])
+    unprocessable!(message.errors.full_messages) unless message.valid?
+
+    revision = fetch_revision(hashed_params[:revision_guid], needs_write_permissions: true)
+
+    revision = RevisionsUpdate.new.update(revision, message)
+
+    render status: :ok, json: Presenters::V3::RevisionPresenter.new(revision)
+  end
+
+  def show_environment_variables
+    revision = fetch_revision(hashed_params[:revision_guid], needs_secrets_read_permission: true)
+    render status: :ok, json: Presenters::V3::RevisionEnvironmentVariablesPresenter.new(revision)
+  end
+
+  private
+
+  def fetch_revision(guid, needs_write_permissions: false, needs_secrets_read_permission: false)
+    revision = RevisionModel.find(guid: guid)
+    resource_not_found!(:revision) unless revision
+
+    app = revision.app
+    space = app.space
+    org = space.organization
+    resource_not_found!(:revision) unless permission_queryer.can_read_from_space?(space.guid, org.guid)
+    unauthorized! if needs_write_permissions && !permission_queryer.can_write_to_space?(space.guid)
+    unauthorized! if needs_secrets_read_permission && !permission_queryer.can_read_secrets_in_space?(space.guid, org.guid)
+
+    revision
+  end
+end

app/messages/app_revisions_update_message.rb → app/messages/revisions_update_message.rb

@@ -1,7 +1,7 @@
 require 'messages/metadata_base_message'
 
 module VCAP::CloudController
-  class AppRevisionsUpdateMessage < MetadataBaseMessage
+  class RevisionsUpdateMessage < MetadataBaseMessage
     register_allowed_keys []
 
     validates_with NoAdditionalKeysValidator

app/presenters/v3/revision_environment_variables_presenter.rb

@@ -34,8 +34,8 @@ def build_links
           url_builder = VCAP::CloudController::Presenters::ApiUrlBuilder.new
 
           {
-            self: { href: url_builder.build_url(path: "/v3/apps/#{revision.app.guid}/revisions/#{revision.guid}/environment_variables") },
-            revision: { href: url_builder.build_url(path: "/v3/apps/#{revision.app.guid}/revisions/#{revision.guid}") },
+            self: { href: url_builder.build_url(path: "/v3/revisions/#{revision.guid}/environment_variables") },
+            revision: { href: url_builder.build_url(path: "/v3/revisions/#{revision.guid}") },
             app:  { href: url_builder.build_url(path: "/v3/apps/#{revision.app.guid}") }
           }
         end

config/routes.rb

@@ -28,9 +28,11 @@
 
   # app revisions
   get '/apps/:guid/revisions', to: 'app_revisions#index'
-  get '/apps/:guid/revisions/:revision_guid/environment_variables', to: 'app_revisions#show_environment_variables'
-  patch '/revisions/:revision_guid', to: 'app_revisions#update'
-  get '/revisions/:revision_guid', to: 'app_revisions#show'
+
+  # revisions
+  get '/revisions/:revision_guid/environment_variables', to: 'revisions#show_environment_variables'
+  patch '/revisions/:revision_guid', to: 'revisions#update'
+  get '/revisions/:revision_guid', to: 'revisions#show'
 
   # environment variables
   get '/apps/:guid/environment_variables', to: 'apps_v3#show_environment_variables'

spec/request/revisions_spec.rb

@@ -292,7 +292,7 @@
     }
 
     it 'gets the environment variables for the revision' do
-      get "/v3/apps/#{app_model.reload.guid}/revisions/#{revision2.guid}/environment_variables", nil, user_header
+      get "/v3/revisions/#{revision2.guid}/environment_variables", nil, user_header
       expect(last_response.status).to eq(200), last_response.body
 
       parsed_response = MultiJson.load(last_response.body)
@@ -302,8 +302,8 @@
             'key' => 'value'
           },
           'links' => {
-            'self' => { 'href' => "#{link_prefix}/v3/apps/#{app_model.guid}/revisions/#{revision2.guid}/environment_variables" },
-            'revision' => { 'href' => "#{link_prefix}/v3/apps/#{app_model.guid}/revisions/#{revision2.guid}" },
+            'self' => { 'href' => "#{link_prefix}/v3/revisions/#{revision2.guid}/environment_variables" },
+            'revision' => { 'href' => "#{link_prefix}/v3/revisions/#{revision2.guid}" },
             'app' => { 'href' => "#{link_prefix}/v3/apps/#{app_model.guid}" },
           }
         }

spec/unit/actions/app_revisions_update_spec.rb → spec/unit/actions/revisions_update_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
-require 'actions/app_revisions_update'
+require 'actions/revisions_update'
 
 module VCAP::CloudController
-  RSpec.describe AppRevisionsUpdate do
-    subject(:revision_update) { AppRevisionsUpdate.new }
+  RSpec.describe RevisionsUpdate do
+    subject(:revision_update) { RevisionsUpdate.new }
 
     describe '#update' do
       let(:body) do
@@ -19,7 +19,7 @@ module VCAP::CloudController
         }
       end
       let(:revision) { RevisionModel.make }
-      let(:message) { AppRevisionsUpdateMessage.new(body) }
+      let(:message) { RevisionsUpdateMessage.new(body) }
 
       it 'updates the revision metadata' do
         expect(message).to be_valid