Use POST when token name is not present

elastic · Nov 18, 2022 · 2c2f32f · 2c2f32f
1 parent f066fbb
commit 2c2f32f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/elasticsearch-api/lib/elasticsearch/api/actions/security/create_service_token.rb b/elasticsearch-api/lib/elasticsearch/api/actions/security/create_service_token.rb
@@ -47,12 +47,13 @@ def create_service_token(arguments = {})
 
           _name = arguments.delete(:name)
 
-          method = Elasticsearch::API::HTTP_PUT
-          path   = if _namespace && _service && _name
-                     "_security/service/#{Utils.__listify(_namespace)}/#{Utils.__listify(_service)}/credential/token/#{Utils.__listify(_name)}"
-                   else
-                     "_security/service/#{Utils.__listify(_namespace)}/#{Utils.__listify(_service)}/credential/token"
-                   end
+          if _namespace && _service && _name
+            method = Elasticsearch::API::HTTP_PUT
+            path = "_security/service/#{Utils.__listify(_namespace)}/#{Utils.__listify(_service)}/credential/token/#{Utils.__listify(_name)}"
+          else
+            method = Elasticsearch::API::HTTP_POST
+            path = "_security/service/#{Utils.__listify(_namespace)}/#{Utils.__listify(_service)}/credential/token"
+          end
           params = Utils.process_params(arguments)
 
           Elasticsearch::API::Response.new(

diff --git a/elasticsearch-api/spec/elasticsearch/api/actions/security/create_service_token_spec.rb b/elasticsearch-api/spec/elasticsearch/api/actions/security/create_service_token_spec.rb
@@ -18,16 +18,31 @@
 require 'spec_helper'
 
 describe 'client#security#create_service_token' do
+  let(:expected_path) { '_security/service/foo/bar/credential/token' }
+  let(:expected_request_method) { 'POST' }
   let(:expected_args) do
     [
-      'PUT',
-      '_security/service/foo/bar/credential/token',
+      expected_request_method,
+      expected_path,
       {},
       nil,
       {}
     ]
   end
 
+  context 'with token name' do
+    let(:expected_request_method) { 'PUT' }
+    let(:token_name) { 'test-token' }
+    let(:expected_path) { "#{super()}/#{token_name}" }
+    it 'performs the request' do
+      expect(
+        client_double.security.create_service_token(
+          namespace: 'foo', service: 'bar', name: token_name
+        )
+      ).to be_a Elasticsearch::API::Response
+    end
+  end
+
   it 'performs the request' do
     expect(
       client_double.security.create_service_token(