Create Groups::DeployTokens::RevokeService

Move the group deploy tokens revoke logic to a service to
avoid any missing anything in the future when we create APIs for revoke

app/controllers/groups/deploy_tokens_controller.rb

@@ -6,11 +6,8 @@ class Groups::DeployTokensController < Groups::ApplicationController
   feature_category :continuous_delivery
 
   def revoke
-    @token = @group.deploy_tokens.find(params[:id])
-    @token.revoke!
+    Groups::DeployTokens::RevokeService.new(@group, current_user, params).execute
 
     redirect_to group_settings_repository_path(@group, anchor: 'js-deploy-tokens')
   end
 end
-
-Groups::DeployTokensController.prepend_mod

app/services/groups/deploy_tokens/revoke_service.rb

+# frozen_string_literal: true
+
+module Groups
+  module DeployTokens
+    class RevokeService < BaseService
+      attr_accessor :token
+
+      def execute
+        @token = group.deploy_tokens.find(params[:id])
+        @token.revoke!
+      end
+    end
+  end
+end
+
+Groups::DeployTokens::RevokeService.prepend_mod

ee/app/controllers/ee/groups/deploy_tokens_controller.rb

-# frozen_string_literal: true
-
-module EE
-  module Groups
-    module DeployTokensController
-      extend ::Gitlab::Utils::Override
-
-      override :revoke
-      def revoke
-        super
-
-        log_audit_event
-      end
-
-      private
-
-      def log_audit_event
-        # rubocop:disable Gitlab/ModuleWithInstanceVariables
-        message = "Revoked group deploy token with name: #{@token.name} with token_id: #{@token.id} with scopes: #{@token.scopes}."
-
-        ::AuditEventService.new(
-          current_user,
-          @group,
-          target_id: @token.id,
-          target_type: @token.class.name,
-          target_details: @token.name,
-          action: :custom,
-          custom_message: message
-        ).security_event
-        # rubocop:enable Gitlab/ModuleWithInstanceVariables
-      end
-    end
-  end
-end

ee/app/services/ee/groups/deploy_tokens/revoke_service.rb

+# frozen_string_literal: true
+
+module EE
+  module Groups
+    module DeployTokens
+      module RevokeService
+        extend ::Gitlab::Utils::Override
+
+        override :execute
+        def execute
+          super.tap { log_audit_event }
+        end
+
+        private
+
+        def log_audit_event
+          message = "Revoked group deploy token with name: #{token.name} with token_id: #{token.id} with scopes: #{token.scopes}."
+
+          ::AuditEventService.new(
+            current_user,
+            group,
+            target_id: token.id,
+            target_type: token.class.name,
+            target_details: token.name,
+            action: :custom,
+            custom_message: message
+          ).security_event
+        end
+      end
+    end
+  end
+end

ee/spec/requests/ee/groups/deploy_tokens_controller_spec.rb → ee/spec/services/ee/groups/deploy_tokens/revoke_service_spec.rb

@@ -2,29 +2,17 @@
 
 require 'spec_helper'
 
-RSpec.describe Groups::DeployTokensController do
-  let_it_be(:group) { create(:group) }
+RSpec.describe Groups::DeployTokens::RevokeService do
+  let_it_be(:entity) { create(:group) }
+  let_it_be(:deploy_token) { create(:deploy_token, :group, groups: [entity]) }
   let_it_be(:user) { create(:user) }
-  let_it_be(:deploy_token) { create(:deploy_token, :group, groups: [group]) }
-  let_it_be(:params) do
-    { id: deploy_token.id, group_id: group }
-  end
-
-  before do
-    group.add_owner(user)
-
-    sign_in(user)
-  end
-
-  describe 'PUT /groups/:group_path_with_namespace/-/deploy_tokens/:id/revoke' do
-    subject(:put_revoke) do
-      put "/groups/#{group.full_path}/-/deploy_tokens/#{deploy_token.id}/revoke", params: params
-    end
+  let_it_be(:deploy_token_params) { { id: deploy_token.id } }
 
-    it 'creates an audit event' do
-      expect { put_revoke }.to change { AuditEvent.count }.by(1)
+  describe '#execute' do
+    subject { described_class.new(entity, user, deploy_token_params).execute }
 
-      expect(response).to redirect_to(group_settings_repository_path(group, anchor: 'js-deploy-tokens'))
+    it "creates an audit event" do
+      expect { subject }.to change { AuditEvent.count }.by(1)
 
       expected_message = <<~MESSAGE.squish
         Revoked group deploy token with name: #{deploy_token.name}

spec/services/groups/deploy_tokens/revoke_service_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Groups::DeployTokens::RevokeService do
+  let_it_be(:entity) { create(:group) }
+  let_it_be(:deploy_token) { create(:deploy_token, :group, groups: [entity]) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:deploy_token_params) { { id: deploy_token.id } }
+
+  describe '#execute' do
+    subject { described_class.new(entity, user, deploy_token_params).execute }
+
+    it "revokes a group deploy token" do
+      expect(deploy_token.revoked).to eq(false)
+
+      expect { subject }.to change { deploy_token.reload.revoked }.to eq(true)
+    end
+
+    context 'invalid token id' do
+      let(:deploy_token_params) { { token_id: non_existing_record_id } }
+
+      it 'raises an error' do
+        expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
+      end
+    end
+  end
+end