Merge branch '21765-deploy-token-add-type' into 'master'

Add deploy_token_type column to the deploy_tokens table

See merge request gitlab-org/gitlab!23530

app/models/deploy_token.rb

@@ -24,6 +24,11 @@ class DeployToken < ApplicationRecord
       message: "can contain only letters, digits, '_', '-', '+', and '.'"
     }
 
+  enum deploy_token_type: {
+    group_type: 1,
+    project_type: 2
+  }
+
   before_save :ensure_token
 
   accepts_nested_attributes_for :project_deploy_tokens

changelogs/unreleased/21765-deploy-token-add-type.yml

+---
+title: Add deploy_token_type column to deploy_tokens table.
+merge_request: 23530
+author:
+type: added

db/migrate/20200122161638_add_deploy_token_type_to_deploy_tokens.rb

+# frozen_string_literal: true
+
+class AddDeployTokenTypeToDeployTokens < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  DOWNTIME = false
+
+  def up
+    add_column_with_default :deploy_tokens, :deploy_token_type, :integer, default: 2, limit: 2, allow_null: false # rubocop: disable Migration/AddColumnWithDefault
+  end
+
+  def down
+    remove_column :deploy_tokens, :deploy_token_type
+  end
+end

db/schema.rb

@@ -1358,6 +1358,7 @@ ActiveRecord::Schema.define(version: 2020_01_27_090233) do
     t.string "token"
     t.string "username"
     t.string "token_encrypted", limit: 255
+    t.integer "deploy_token_type", limit: 2, default: 2, null: false
     t.index ["token", "expires_at", "id"], name: "index_deploy_tokens_on_token_and_expires_at_and_id", where: "(revoked IS FALSE)"
     t.index ["token"], name: "index_deploy_tokens_on_token", unique: true
     t.index ["token_encrypted"], name: "index_deploy_tokens_on_token_encrypted", unique: true

spec/migrations/add_deploy_token_type_to_deploy_tokens_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'migrate', '20200122161638_add_deploy_token_type_to_deploy_tokens.rb')
+
+describe AddDeployTokenTypeToDeployTokens, :migration do
+  let(:deploy_tokens) { table(:deploy_tokens) }
+  let(:deploy_token) do
+    deploy_tokens.create(name: 'token_test',
+                         username: 'gitlab+deploy-token-1',
+                         token_encrypted: 'dr8rPXwM+Mbs2p3Bg1+gpnXqrnH/wu6vaHdcc7A3isPR67WB',
+                         read_repository: true,
+                         expires_at: Time.now + 1.year)
+  end
+
+  it 'updates the deploy_token_type column to 2' do
+    expect(deploy_token).not_to respond_to(:deploy_token_type)
+
+    migrate!
+
+    deploy_token.reload
+    expect(deploy_token.deploy_token_type).to eq(2)
+  end
+end

spec/models/deploy_token_spec.rb

@@ -8,6 +8,8 @@ describe DeployToken do
   it { is_expected.to have_many :project_deploy_tokens }
   it { is_expected.to have_many(:projects).through(:project_deploy_tokens) }
 
+  it_behaves_like 'having unique enum values'
+
   describe 'validations' do
     let(:username_format_message) { "can contain only letters, digits, '_', '-', '+', and '.'" }