Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/api/clusters/agent_tokens.rb')
-rw-r--r--lib/api/clusters/agent_tokens.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/api/clusters/agent_tokens.rb b/lib/api/clusters/agent_tokens.rb
index 68eef21903d..f0eb7ce2cd6 100644
--- a/lib/api/clusters/agent_tokens.rb
+++ b/lib/api/clusters/agent_tokens.rb
@@ -65,7 +65,9 @@ module API
agent = ::Clusters::AgentsFinder.new(user_project, current_user).find(params[:agent_id])
result = ::Clusters::AgentTokens::CreateService.new(
- container: agent.project, current_user: current_user, params: token_params.merge(agent_id: agent.id)
+ agent: agent,
+ current_user: current_user,
+ params: token_params
).execute
bad_request!(result[:message]) if result[:status] == :error
@@ -86,8 +88,9 @@ module API
agent = ::Clusters::AgentsFinder.new(user_project, current_user).find(params[:agent_id])
token = ::Clusters::AgentTokensFinder.new(agent, current_user).find(params[:token_id])
- # Skipping explicit error handling and relying on exceptions
- token.revoked!
+ result = ::Clusters::AgentTokens::RevokeService.new(token: token, current_user: current_user).execute
+
+ bad_request!(result[:message]) if result[:status] == :error
status :no_content
end