Merge branch 'fix/deploy-token-optional-attributes' into 'master'

Fix optional params for deploy token API

Closes #211878

See merge request gitlab-org/gitlab!27961

changelogs/unreleased/fix-deploy-token-optional-attributes.yml

+---
+title: Fix optional params for deploy token API
+merge_request: 27961
+author: Nejc Habjan
+type: fixed

lib/api/deploy_tokens.rb

@@ -53,10 +53,10 @@ module API
 
       params do
         requires :name, type: String, desc: "New deploy token's name"
-        requires :expires_at, type: DateTime, desc: 'Expiration date for the deploy token. Does not expire if no value is provided.'
-        requires :username, type: String, desc: 'Username for deploy token. Default is `gitlab+deploy-token-{n}`'
         requires :scopes, type: Array[String], values: ::DeployToken::AVAILABLE_SCOPES.map(&:to_s),
           desc: 'Indicates the deploy token scopes. Must be at least one of "read_repository" or "read_registry".'
+        optional :expires_at, type: DateTime, desc: 'Expiration date for the deploy token. Does not expire if no value is provided.'
+        optional :username, type: String, desc: 'Username for deploy token. Default is `gitlab+deploy-token-{n}`'
       end
       desc 'Create a project deploy token' do
         detail 'This feature was introduced in GitLab 12.9'
@@ -114,10 +114,10 @@ module API
 
       params do
         requires :name, type: String, desc: 'The name of the deploy token'
-        requires :expires_at, type: DateTime, desc: 'Expiration date for the deploy token. Does not expire if no value is provided.'
-        requires :username, type: String, desc: 'Username for deploy token. Default is `gitlab+deploy-token-{n}`'
         requires :scopes, type: Array[String], values: ::DeployToken::AVAILABLE_SCOPES.map(&:to_s),
           desc: 'Indicates the deploy token scopes. Must be at least one of "read_repository" or "read_registry".'
+        optional :expires_at, type: DateTime, desc: 'Expiration date for the deploy token. Does not expire if no value is provided.'
+        optional :username, type: String, desc: 'Username for deploy token. Default is `gitlab+deploy-token-{n}`'
       end
       desc 'Create a group deploy token' do
         detail 'This feature was introduced in GitLab 12.9'

spec/requests/api/deploy_tokens_spec.rb

@@ -234,6 +234,25 @@ describe API::DeployTokens do
           expect(response).to match_response_schema('public_api/v4/deploy_token')
         end
 
+        context 'with no optional params given' do
+          let(:params) do
+            {
+              name: 'Foo',
+              scopes: [
+                'read_repository'
+              ]
+            }
+          end
+
+          it 'creates the deploy token with default values' do
+            subject
+
+            expect(response).to have_gitlab_http_status(:created)
+            expect(json_response['username']).to match(/gitlab\+deploy-token-\d+/)
+            expect(json_response['expires_at']).to eq(nil)
+          end
+        end
+
         context 'with an invalid scope' do
           before do
             params[:scopes] = %w[read_repository all_access]