Rename feature_flags_instances to feature_flags_clients

db/schema.rb

@@ -1954,12 +1954,12 @@ ActiveRecord::Schema.define(version: 20180926140319) do
 
   add_index "operations_feature_flags", ["project_id", "name"], name: "index_operations_feature_flags_on_project_id_and_name", unique: true, using: :btree
 
-  create_table "operations_feature_flags_instances", force: :cascade do |t|
+  create_table "operations_feature_flags_clients", force: :cascade do |t|
     t.integer "project_id", null: false
     t.string "token", null: false
   end
 
-  add_index "operations_feature_flags_instances", ["token"], name: "index_operations_feature_flags_instances_on_token", unique: true, using: :btree
+  add_index "operations_feature_flags_clients", ["token"], name: "index_operations_feature_flags_clients_on_token", unique: true, using: :btree
 
   create_table "packages_maven_metadata", id: :bigserial, force: :cascade do |t|
     t.integer "package_id", limit: 8, null: false
@@ -3252,7 +3252,7 @@ ActiveRecord::Schema.define(version: 20180926140319) do
   add_foreign_key "notification_settings", "users", name: "fk_0c95e91db7", on_delete: :cascade
   add_foreign_key "oauth_openid_requests", "oauth_access_grants", column: "access_grant_id", name: "fk_oauth_openid_requests_oauth_access_grants_access_grant_id"
   add_foreign_key "operations_feature_flags", "projects", on_delete: :cascade
-  add_foreign_key "operations_feature_flags_instances", "projects", on_delete: :cascade
+  add_foreign_key "operations_feature_flags_clients", "projects", on_delete: :cascade
   add_foreign_key "packages_maven_metadata", "packages_packages", column: "package_id", name: "fk_be88aed360", on_delete: :cascade
   add_foreign_key "packages_package_files", "packages_packages", column: "package_id", name: "fk_86f0f182f8", on_delete: :cascade
   add_foreign_key "packages_packages", "projects", on_delete: :cascade

ee/app/helpers/feature_flags_helper.rb

@@ -6,6 +6,6 @@ module FeatureFlagsHelper
   end
 
   def unleash_api_instanceid(project)
-    project.feature_flags_instance_token
+    project.feature_flags_client_token
   end
 end

ee/app/models/ee/project.rb

@@ -51,7 +51,7 @@ module EE
       has_many :prometheus_alert_events, inverse_of: :project
 
       has_many :operations_feature_flags, class_name: 'Operations::FeatureFlag'
-      has_one :operations_feature_flags_instance, class_name: 'Operations::FeatureFlagsInstance'
+      has_one :operations_feature_flags_client, class_name: 'Operations::FeatureFlagsClient'
 
       scope :with_shared_runners_limit_enabled, -> { with_shared_runners.non_public_only }
 
@@ -562,8 +562,8 @@ module EE
       change_head(root_ref) if root_ref.present? && root_ref != default_branch
     end
 
-    def feature_flags_instance_token
-      instance = operations_feature_flags_instance || create_operations_feature_flags_instance!
+    def feature_flags_client_token
+      instance = operations_feature_flags_client || create_operations_feature_flags_client!
       instance.token
     end
 

ee/app/models/operations/feature_flag.rb

@@ -13,6 +13,6 @@ module Operations
         message: Gitlab::Regex.feature_flag_regex_message
       }
     validates :name, uniqueness: { scope: :project_id }
-    validates :description, length: 0..255
+    validates :description, allow_blank: true, length: 0..255
   end
 end

ee/app/models/operations/feature_flags_instance.rb → ee/app/models/operations/feature_flags_client.rb

 module Operations
-  class FeatureFlagsInstance < ActiveRecord::Base
+  class FeatureFlagsClient < ActiveRecord::Base
     include TokenAuthenticatable
 
-    self.table_name = 'operations_feature_flags_instances'
+    self.table_name = 'operations_feature_flags_clients'
 
     belongs_to :project
 

ee/db/migrate/20180626171125_add_feature_flags_to_projects.rb

@@ -4,7 +4,7 @@ class AddFeatureFlagsToProjects < ActiveRecord::Migration
   # Set this constant to true if this migration requires downtime.
   DOWNTIME = false
 
-  def up
+  def change
     create_table :operations_feature_flags do |t|
       t.integer :project_id, null: false
       t.datetime_with_timezone :created_at, null: false
@@ -19,7 +19,7 @@ class AddFeatureFlagsToProjects < ActiveRecord::Migration
       t.index [:project_id, :name], unique: true
     end
 
-    create_table :operations_feature_flags_instances do |t|
+    create_table :operations_feature_flags_clients do |t|
       t.integer :project_id, null: false
       t.string :token, null: false
 
@@ -28,9 +28,4 @@ class AddFeatureFlagsToProjects < ActiveRecord::Migration
       t.foreign_key :projects, column: :project_id, on_delete: :cascade
     end
   end
-
-  def down
-    drop_table :operations_feature_flags
-    drop_table :operations_feature_flags_instances
-  end
 end

ee/spec/factories/operations/feature_flags_instances.rb → ee/spec/factories/operations/feature_flags_clients.rb

 FactoryBot.define do
-  factory :operations_feature_flags_instance, class: Operations::FeatureFlagsInstance do
+  factory :operations_feature_flags_client, class: Operations::FeatureFlagsClient do
     project
   end
 end

ee/spec/models/operations/feature_flag_spec.rb

+require 'spec_helper'
+
+describe Operations::FeatureFlag do
+  subject { create(:operations_feature_flag) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:project) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:project) }
+    it { is_expected.to validate_presence_of(:name) }
+    it { is_expected.to validate_uniqueness_of(:name).scoped_to(:project_id) }
+  end
+end

ee/spec/models/operations/feature_flags_client_spec.rb

+require 'spec_helper'
+
+describe Operations::FeatureFlagsClient do
+  subject { create(:operations_feature_flags_client) }
+
+  describe 'associations' do
+    it { is_expected.to belong_to(:project) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:project) }
+  end
+
+  describe '#token' do
+    it "ensures that token is always set" do
+      expect(subject.token).not_to be_empty
+    end
+  end
+end

ee/spec/models/project_spec.rb

@@ -1780,7 +1780,7 @@ describe Project do
     end
 
     context 'when there is access token' do
-      let!(:instance) { create(:operations_feature_flags_instance, project: project, token: 'token') }
+      let!(:instance) { create(:operations_feature_flags_client, project: project, token: 'token') }
 
       it "provides an existing one" do
         is_expected.to eq('token')