Merge branch 'rename_services_template_to_instance' into 'master'

Service model: Rename template attribute to instance

See merge request gitlab-org/gitlab!23595

app/controllers/admin/services_controller.rb

@@ -7,7 +7,7 @@ class Admin::ServicesController < Admin::ApplicationController
   before_action :service, only: [:edit, :update]
 
   def index
-    @services = services_templates
+    @services = instance_level_services
   end
 
   def edit
@@ -19,7 +19,7 @@ class Admin::ServicesController < Admin::ApplicationController
 
   def update
     if service.update(service_params[:service])
-      PropagateServiceTemplateWorker.perform_async(service.id) if service.active?
+      PropagateInstanceLevelServiceWorker.perform_async(service.id) if service.active?
 
       redirect_to admin_application_settings_services_path,
         notice: 'Application settings saved successfully'
@@ -31,17 +31,17 @@ class Admin::ServicesController < Admin::ApplicationController
   private
 
   # rubocop: disable CodeReuse/ActiveRecord
-  def services_templates
+  def instance_level_services
     Service.available_services_names.map do |service_name|
-      service_template = "#{service_name}_service".camelize.constantize
-      service_template.where(template: true).first_or_create
+      service = "#{service_name}_service".camelize.constantize
+      service.where(instance: true).first_or_create
     end
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
   # rubocop: disable CodeReuse/ActiveRecord
   def service
-    @service ||= Service.where(id: params[:id], template: true).first
+    @service ||= Service.where(id: params[:id], instance: true).first
   end
   # rubocop: enable CodeReuse/ActiveRecord
 

app/models/project.rb

@@ -1221,13 +1221,13 @@ class Project < ApplicationRecord
     service = find_service(services, name)
     return service if service
 
-    # We should check if template for the service exists
-    template = find_service(services_templates, name)
+    # We should check if an instance-level service exists
+    instance_level_service = find_service(instance_level_services, name)
 
-    if template
-      Service.build_from_template(id, template)
+    if instance_level_service
+      Service.build_from_instance(id, instance_level_service)
     else
-      # If no template, we should create an instance. Ex `build_gitlab_ci_service`
+      # If no instance-level service exists, we should create a new service. Ex `build_gitlab_ci_service`
       public_send("build_#{name}_service") # rubocop:disable GitlabSecurity/PublicSend
     end
   end
@@ -2440,8 +2440,8 @@ class Project < ApplicationRecord
     end
   end
 
-  def services_templates
-    @services_templates ||= Service.where(template: true)
+  def instance_level_services
+    @instance_level_services ||= Service.where(instance: true)
   end
 
   def ensure_pages_metadatum

app/models/project_services/issue_tracker_service.rb

@@ -164,7 +164,7 @@ class IssueTrackerService < Service
   end
 
   def one_issue_tracker
-    return if template?
+    return if instance?
     return if project.blank?
 
     if project.services.external_issue_trackers.where.not(id: id).any?

app/models/project_services/prometheus_service.rb

@@ -85,7 +85,7 @@ class PrometheusService < MonitoringService
   end
 
   def prometheus_available?
-    return false if template?
+    return false if instance?
     return false unless project
 
     project.all_clusters.enabled.any? { |cluster| cluster.application_prometheus_available? }

app/models/service.rb

@@ -32,7 +32,7 @@ class Service < ApplicationRecord
   belongs_to :project, inverse_of: :services
   has_one :service_hook
 
-  validates :project_id, presence: true, unless: proc { |service| service.template? }
+  validates :project_id, presence: true, unless: proc { |service| service.instance? }
   validates :type, presence: true
 
   scope :visible, -> { where.not(type: 'GitlabIssueTrackerService') }
@@ -70,8 +70,8 @@ class Service < ApplicationRecord
     true
   end
 
-  def template?
-    template
+  def instance?
+    instance
   end
 
   def category
@@ -299,15 +299,15 @@ class Service < ApplicationRecord
     service_names.sort_by(&:downcase)
   end
 
-  def self.build_from_template(project_id, template)
-    service = template.dup
+  def self.build_from_instance(project_id, instance_level_service)
+    service = instance_level_service.dup
 
-    if template.supports_data_fields?
-      data_fields = template.data_fields.dup
+    if instance_level_service.supports_data_fields?
+      data_fields = instance_level_service.data_fields.dup
       data_fields.service = service
     end
 
-    service.template = false
+    service.instance = false
     service.project_id = project_id
     service.active = false if service.active? && !service.valid?
     service
@@ -321,10 +321,6 @@ class Service < ApplicationRecord
     nil
   end
 
-  def self.find_by_template
-    find_by(template: true)
-  end
-
   # override if needed
   def supports_data_fields?
     false

app/services/projects/create_service.rb

@@ -134,7 +134,7 @@ module Projects
 
         if @project.save
           unless @project.gitlab_project_import?
-            create_services_from_active_templates(@project)
+            create_services_from_active_instance_level_services(@project)
             @project.create_labels
           end
 
@@ -160,9 +160,9 @@ module Projects
     end
 
     # rubocop: disable CodeReuse/ActiveRecord
-    def create_services_from_active_templates(project)
-      Service.where(template: true, active: true).each do |template|
-        service = Service.build_from_template(project.id, template)
+    def create_services_from_active_instance_level_services(project)
+      Service.where(instance: true, active: true).each do |template|
+        service = Service.build_from_instance(project.id, template)
         service.save!
       end
     end

app/services/projects/propagate_service_template.rb → app/services/projects/propagate_instance_level_service.rb

 # frozen_string_literal: true
 
 module Projects
-  class PropagateServiceTemplate
+  class PropagateInstanceLevelService
     BATCH_SIZE = 100
 
     def self.propagate(*args)
       new(*args).propagate
     end
 
-    def initialize(template)
-      @template = template
+    def initialize(instance_level_service)
+      @instance_level_service = instance_level_service
     end
 
     def propagate
-      return unless @template.active?
+      return unless @instance_level_service.active?
 
-      Rails.logger.info("Propagating services for template #{@template.id}") # rubocop:disable Gitlab/RailsLogger
+      Rails.logger.info("Propagating services for instance_level_service #{@instance_level_service.id}") # rubocop:disable Gitlab/RailsLogger
 
-      propagate_projects_with_template
+      propagate_projects_with_instance_level_service
     end
 
     private
 
-    def propagate_projects_with_template
+    def propagate_projects_with_instance_level_service
       loop do
         batch = Project.uncached { project_ids_batch }
 
-        bulk_create_from_template(batch) unless batch.empty?
+        bulk_create_from_instance_level_service(batch) unless batch.empty?
 
         break if batch.size < BATCH_SIZE
       end
     end
 
-    def bulk_create_from_template(batch)
+    def bulk_create_from_instance_level_service(batch)
       service_list = batch.map do |project_id|
         service_hash.values << project_id
       end
@@ -52,7 +52,7 @@ module Projects
             SELECT true
             FROM services
             WHERE services.project_id = projects.id
-            AND services.type = '#{@template.type}'
+            AND services.type = '#{@instance_level_service.type}'
           )
           AND projects.pending_delete = false
           AND projects.archived = false
@@ -73,9 +73,9 @@ module Projects
     def service_hash
       @service_hash ||=
         begin
-          template_hash = @template.as_json(methods: :type).except('id', 'template', 'project_id')
+          instance_hash = @instance_level_service.as_json(methods: :type).except('id', 'instance', 'project_id')
 
-          template_hash.each_with_object({}) do |(key, value), service_hash|
+          instance_hash.each_with_object({}) do |(key, value), service_hash|
             value = value.is_a?(Hash) ? value.to_json : value
 
             service_hash[ActiveRecord::Base.connection.quote_column_name(key)] =
@@ -97,11 +97,11 @@ module Projects
     # rubocop: enable CodeReuse/ActiveRecord
 
     def active_external_issue_tracker?
-      @template.issue_tracker? && !@template.default
+      @instance_level_service.issue_tracker? && !@instance_level_service.default
     end
 
     def active_external_wiki?
-      @template.type == 'ExternalWikiService'
+      @instance_level_service.type == 'ExternalWikiService'
     end
   end
 end

app/views/projects/services/mattermost_slash_commands/_help.html.haml

@@ -10,8 +10,8 @@
     %p.inline
       = s_("MattermostService|See list of available commands in Mattermost after setting up this service, by entering")
     %kbd.inline /<trigger> help
-    - unless enabled || @service.template?
+    - unless enabled || @service.instance?
       = render 'projects/services/mattermost_slash_commands/detailed_help', subject: @service
 
-- if enabled && !@service.template?
+- if enabled && !@service.instance?
   = render 'projects/services/mattermost_slash_commands/installation_info', subject: @service

app/views/projects/services/slack_slash_commands/_help.html.haml

@@ -11,7 +11,7 @@
     %p.inline
       = s_("SlackService|See list of available commands in Slack after setting up this service, by entering")
     %kbd.inline /<command> help
-    - unless @service.template?
+    - unless @service.instance?
       %p= _("To set up this service:")
       %ul.list-unstyled.indent-list
         %li

app/workers/all_queues.yml

@@ -951,7 +951,7 @@
   :latency_sensitive: 
   :resource_boundary: :unknown
   :weight: 1
-- :name: propagate_service_template
+- :name: propagate_instance_level_service
   :feature_category: :source_code_management
   :has_external_dependencies: 
   :latency_sensitive: 

app/workers/propagate_service_template_worker.rb → app/workers/propagate_instance_level_service_worker.rb

 # frozen_string_literal: true
 
 # Worker for updating any project specific caches.
-class PropagateServiceTemplateWorker
+class PropagateInstanceLevelServiceWorker
   include ApplicationWorker
 
   feature_category :source_code_management
@@ -9,18 +9,18 @@ class PropagateServiceTemplateWorker
   LEASE_TIMEOUT = 4.hours.to_i
 
   # rubocop: disable CodeReuse/ActiveRecord
-  def perform(template_id)
-    return unless try_obtain_lease_for(template_id)
+  def perform(instance_level_service_id)
+    return unless try_obtain_lease_for(instance_level_service_id)
 
-    Projects::PropagateServiceTemplate.propagate(Service.find_by(id: template_id))
+    Projects::PropagateInstanceLevelService.propagate(Service.find_by(id: instance_level_service_id))
   end
   # rubocop: enable CodeReuse/ActiveRecord
 
   private
 
-  def try_obtain_lease_for(template_id)
+  def try_obtain_lease_for(instance_level_service_id)
     Gitlab::ExclusiveLease
-      .new("propagate_service_template_worker:#{template_id}", timeout: LEASE_TIMEOUT)
+      .new("propagate_instance_level_service_worker:#{instance_level_service_id}", timeout: LEASE_TIMEOUT)
       .try_obtain
   end
 end

changelogs/unreleased/rename_services_template_to_instance.yml

+---
+title: 'Service model: Rename template attribute to instance'
+merge_request: 23595
+author:
+type: other

config/sidekiq_queues.yml

@@ -194,7 +194,7 @@
   - 1
 - - project_update_repository_storage
   - 1
-- - propagate_service_template
+- - propagate_instance_level_service
   - 1
 - - reactive_caching
   - 1

db/migrate/20200123092602_rename_services_template_to_instance.rb

+# frozen_string_literal: true
+
+class RenameServicesTemplateToInstance < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    rename_column_concurrently :services, :template, :instance
+  end
+
+  def down
+    undo_rename_column_concurrently :services, :template, :instance
+  end
+end

db/post_migrate/20191021101942_remove_empty_github_service_templates.rb

@@ -23,6 +23,10 @@ class RemoveEmptyGithubServiceTemplates < ActiveRecord::Migration[5.2]
   private
 
   def relationship
+    # The column `template` was renamed to `instance`. Column information needs
+    # to be resetted to avoid cache problems after migrating down.
+    RemoveEmptyGithubServiceTemplates::Service.reset_column_information
+
     RemoveEmptyGithubServiceTemplates::Service.where(template: true, type: 'GithubService')
   end
 end

db/post_migrate/20200123101859_cleanup_rename_services_template_to_instance.rb

+# frozen_string_literal: true
+
+class CleanupRenameServicesTemplateToInstance < ActiveRecord::Migration[5.2]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    cleanup_concurrent_column_rename :services, :template, :instance
+  end
+
+  def down
+    undo_cleanup_concurrent_column_rename :services, :template, :instance
+  end
+end

db/post_migrate/20200206111847_migrate_propagate_service_template_sidekiq_queue.rb

+# frozen_string_literal: true
+
+class MigratePropagateServiceTemplateSidekiqQueue < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  def up
+    sidekiq_queue_migrate 'propagate_service_template', to: 'propagate_instance_level_service'
+  end
+
+  def down
+    sidekiq_queue_migrate 'propagate_instance_level_service', to: 'propagate_service_template'
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2020_02_06_091544) do
+ActiveRecord::Schema.define(version: 2020_02_06_111847) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "pg_trgm"
@@ -3827,7 +3827,6 @@ ActiveRecord::Schema.define(version: 2020_02_06_091544) do
     t.datetime "updated_at"
     t.boolean "active", default: false, null: false
     t.text "properties"
-    t.boolean "template", default: false
     t.boolean "push_events", default: true
     t.boolean "issues_events", default: true
     t.boolean "merge_requests_events", default: true
@@ -3844,9 +3843,10 @@ ActiveRecord::Schema.define(version: 2020_02_06_091544) do
     t.boolean "deployment_events", default: false, null: false
     t.string "description", limit: 500
     t.boolean "comment_on_event_enabled", default: true, null: false
+    t.boolean "instance", default: false
+    t.index ["instance"], name: "index_services_on_instance"
     t.index ["project_id"], name: "index_services_on_project_id"
     t.index ["project_id"], name: "tmp_index_on_project_id_partial_with_prometheus_services", where: "((type)::text = 'PrometheusService'::text)"
-    t.index ["template"], name: "index_services_on_template"
     t.index ["type"], name: "index_services_on_type"
   end
 

ee/app/views/projects/services/gitlab_slack_application/_help.html.haml

@@ -9,5 +9,5 @@
     See the list of available commands in Slack after setting up this service
     by entering
   %kbd.inline /gitlab help
-  - unless @service.template?
+  - unless @service.instance?
     = render "projects/services/#{@service.to_param}/slack_integration_form"

lib/api/services.rb

@@ -132,7 +132,7 @@ module API
       helpers do
         # rubocop: disable CodeReuse/ActiveRecord
         def slash_command_service(project, service_slug, params)
-          project.services.active.where(template: false).find do |service|
+          project.services.active.where(instance: false).find do |service|
             service.try(:token) == params[:token] && service.to_param == service_slug.underscore
           end
         end

lib/gitlab/import_export/import_export.yml

@@ -257,7 +257,7 @@ excluded_attributes:
     - :token
     - :token_encrypted
   services:
-    - :template
+    - :instance
   error_tracking_setting:
     - :encrypted_token
     - :encrypted_token_iv

lib/gitlab/usage_data.rb

@@ -179,7 +179,7 @@ module Gitlab
 
       # rubocop: disable CodeReuse/ActiveRecord
       def services_usage
-        service_counts = count(Service.active.where(template: false).where.not(type: 'JiraService').group(:type), fallback: Hash.new(-1))
+        service_counts = count(Service.active.where(instance: false).where.not(type: 'JiraService').group(:type), fallback: Hash.new(-1))
 
         results = Service.available_services_names.each_with_object({}) do |service_name, response|
           response["projects_#{service_name}_active".to_sym] = service_counts["#{service_name}_service".camelize] || 0

spec/controllers/admin/services_controller_spec.rb

@@ -15,11 +15,11 @@ describe Admin::ServicesController do
     Service.available_services_names.each do |service_name|
       context "#{service_name}" do
         let!(:service) do
-          service_template = "#{service_name}_service".camelize.constantize
-          service_template.where(template: true).first_or_create
+          service_instance = "#{service_name}_service".camelize.constantize
+          service_instance.where(instance: true).first_or_create
         end
 
-        it 'successfully displays the template' do
+        it 'successfully displays the service' do
           get :edit, params: { id: service.id }
 
           expect(response).to have_gitlab_http_status(:ok)
@@ -34,7 +34,7 @@ describe Admin::ServicesController do
       RedmineService.create(
         project: project,
         active: false,
-        template: true,
+        instance: true,
         properties: {
           project_url: 'http://abc',
           issues_url: 'http://abc',
@@ -44,7 +44,7 @@ describe Admin::ServicesController do
     end
 
     it 'calls the propagation worker when service is active' do
-      expect(PropagateServiceTemplateWorker).to receive(:perform_async).with(service.id)
+      expect(PropagateInstanceLevelServiceWorker).to receive(:perform_async).with(service.id)
 
       put :update, params: { id: service.id, service: { active: true } }
 
@@ -52,7 +52,7 @@ describe Admin::ServicesController do
     end
 
     it 'does not call the propagation worker when service is not active' do
-      expect(PropagateServiceTemplateWorker).not_to receive(:perform_async)
+      expect(PropagateInstanceLevelServiceWorker).not_to receive(:perform_async)
 
       put :update, params: { id: service.id, service: { properties: {} } }
 

spec/controllers/projects/services_controller_spec.rb

@@ -154,12 +154,12 @@ describe Projects::ServicesController do
         end
       end
 
-      context 'when activating Jira service from a template' do
+      context 'when activating Jira service from instance level service' do
         let(:service) do
-          create(:jira_service, project: project, template: true)
+          create(:jira_service, project: project, instance: true)
         end
 
-        it 'activate Jira service from template' do
+        it 'activate Jira service from instance level service' do
           expect(flash[:notice]).to eq 'Jira activated.'
         end
       end

spec/fixtures/trace/sample_trace

@@ -2736,7 +2736,7 @@ Service
       when repository is empty
         test runs execute
   Template
-    .build_from_template
+    .build_from_instance
       when template is invalid
         sets service template to inactive when template is invalid
     for pushover service

spec/lib/gitlab/import_export/project_tree_restorer_spec.rb

@@ -652,10 +652,10 @@ describe Gitlab::ImportExport::ProjectTreeRestorer do
         setup_import_export_config('light')
       end
 
-      it 'does not import any templated services' do
+      it 'does not import any instance-level services' do
         expect(restored_project_json).to eq(true)
 
-        expect(project.services.where(template: true).count).to eq(0)
+        expect(project.services.where(instance: true).count).to eq(0)
       end
 
       it 'imports labels' do

spec/lib/gitlab/import_export/safe_model_attributes.yml

@@ -452,7 +452,7 @@ Service:
 - updated_at
 - active
 - properties
-- template
+- instance
 - push_events
 - issues_events
 - commit_events

spec/lib/gitlab/usage_data_spec.rb

@@ -18,7 +18,7 @@ describe Gitlab::UsageData do
       create(:service, project: projects[1], type: 'SlackService', active: true)
       create(:service, project: projects[2], type: 'SlackService', active: true)
       create(:service, project: projects[2], type: 'MattermostService', active: false)
-      create(:service, project: projects[2], type: 'MattermostService', active: true, template: true)
+      create(:service, project: projects[2], type: 'MattermostService', active: true, instance: true)
       create(:service, project: projects[2], type: 'CustomIssueTrackerService', active: true)
       create(:project_error_tracking_setting, project: projects[0])
       create(:project_error_tracking_setting, project: projects[1], enabled: false)

spec/migrations/migrate_propagate_service_template_sidekiq_queue_spec.rb

+# frozen_string_literal: true
+
+require 'spec_helper'
+require Rails.root.join('db', 'post_migrate', '20200206111847_migrate_propagate_service_template_sidekiq_queue.rb')
+
+describe MigratePropagateServiceTemplateSidekiqQueue, :sidekiq, :redis do
+  include Gitlab::Database::MigrationHelpers
+  include StubWorker
+
+  context 'when there are jobs in the queue' do
+    it 'correctly migrates queue when migrating up' do
+      Sidekiq::Testing.disable! do
+        stub_worker(queue: 'propagate_service_template').perform_async('Something', [1])
+        stub_worker(queue: 'propagate_instance_level_service').perform_async('Something', [1])
+
+        described_class.new.up
+
+        expect(sidekiq_queue_length('propagate_service_template')).to eq 0
+        expect(sidekiq_queue_length('propagate_instance_level_service')).to eq 2
+      end
+    end
+  end
+
+  context 'when there are no jobs in the queues' do
+    it 'does not raise error when migrating up' do
+      expect { described_class.new.up }.not_to raise_error
+    end
+  end
+end

spec/models/service_spec.rb

@@ -97,23 +97,23 @@ describe Service do
     end
   end
 
-  describe "Template" do
+  describe "Instance" do
     let(:project) { create(:project) }
 
-    describe '.build_from_template' do
-      context 'when template is invalid' do
-        it 'sets service template to inactive when template is invalid' do
-          template = build(:prometheus_service, template: true, active: true, properties: {})
-          template.save(validate: false)
+    describe '.build_from_instance' do
+      context 'when instance level integration is invalid' do
+        it 'sets instance level integration to inactive when instance is invalid' do
+          instance = build(:prometheus_service, instance: true, active: true, properties: {})
+          instance.save(validate: false)
 
-          service = described_class.build_from_template(project.id, template)
+          service = described_class.build_from_instance(project.id, instance)
 
           expect(service).to be_valid
           expect(service.active).to be false
         end
       end
 
-      describe 'build issue tracker from a template' do
+      describe 'build issue tracker from a instance level integration' do
         let(:title) { 'custom title' }
         let(:description) { 'custom description' }
         let(:url) { 'http://jira.example.com' }
@@ -127,9 +127,9 @@ describe Service do
           }
         end
 
-        shared_examples 'service creation from a template' do
+        shared_examples 'integration creation from instance level' do
           it 'creates a correct service' do
-            service = described_class.build_from_template(project.id, template)
+            service = described_class.build_from_instance(project.id, instance_level_integration)
 
             expect(service).to be_active
             expect(service.title).to eq(title)
@@ -144,38 +144,38 @@ describe Service do
         # this  will be removed as part of https://gitlab.com/gitlab-org/gitlab/issues/29404
         context 'when data are stored in properties' do
           let(:properties) { data_params.merge(title: title, description: description) }
-          let!(:template) do
-            create(:jira_service, :without_properties_callback, template: true, properties: properties.merge(additional: 'something'))
+          let!(:instance_level_integration) do
+            create(:jira_service, :without_properties_callback, instance: true, properties: properties.merge(additional: 'something'))
           end
 
-          it_behaves_like 'service creation from a template'
+          it_behaves_like 'integration creation from instance level'
         end
 
         context 'when data are stored in separated fields' do
-          let(:template) do
-            create(:jira_service, data_params.merge(properties: {}, title: title, description: description, template: true))
+          let(:instance_level_integration) do
+            create(:jira_service, data_params.merge(properties: {}, title: title, description: description, instance: true))
           end
 
-          it_behaves_like 'service creation from a template'
+          it_behaves_like 'integration creation from instance level'
         end
 
         context 'when data are stored in both properties and separated fields' do
           let(:properties) { data_params.merge(title: title, description: description) }
-          let(:template) do
-            create(:jira_service, :without_properties_callback, active: true, template: true, properties: properties).tap do |service|
+          let(:instance_level_integration) do
+            create(:jira_service, :without_properties_callback, active: true, instance: true, properties: properties).tap do |service|
               create(:jira_tracker_data, data_params.merge(service: service))
             end
           end
 
-          it_behaves_like 'service creation from a template'
+          it_behaves_like 'integration creation from instance level'
         end
       end
     end
 
     describe "for pushover service" do
-      let!(:service_template) do
+      let!(:instance_level_integration) do
         PushoverService.create(
-          template: true,
+          instance: true,
           properties: {
             device: 'MyDevice',
             sound: 'mic',
@@ -188,7 +188,7 @@ describe Service do
         it "has all fields prefilled" do
           service = project.find_or_initialize_service('pushover')
 
-          expect(service.template).to eq(false)
+          expect(service.instance).to eq(false)
           expect(service.device).to eq('MyDevice')
           expect(service.sound).to eq('mic')
           expect(service.priority).to eq(4)
@@ -391,14 +391,6 @@ describe Service do
     end
   end
 
-  describe '.find_by_template' do
-    let!(:service) { create(:service, template: true) }
-
-    it 'returns service template' do
-      expect(described_class.find_by_template).to eq(service)
-    end
-  end
-
   describe '#api_field_names' do
     let(:fake_service) do
       Class.new(Service) do

spec/services/projects/create_service_spec.rb

@@ -15,7 +15,7 @@ describe Projects::CreateService, '#execute' do
     }
   end
 
-  it 'creates labels on Project creation if there are templates' do
+  it 'creates labels on Project creation if there are instance level services' do
     Label.create(title: "bug", template: true)
     project = create_project(user, opts)
 
@@ -90,7 +90,7 @@ describe Projects::CreateService, '#execute' do
     end
 
     it 'sets invalid service as inactive' do
-      create(:service, type: 'JiraService', project: nil, template: true, active: true)
+      create(:service, type: 'JiraService', project: nil, instance: true, active: true)
 
       project = create_project(user, opts)
       service = project.services.first
@@ -336,22 +336,22 @@ describe Projects::CreateService, '#execute' do
     end
   end
 
-  context 'when there is an active service template' do
+  context 'when there is an active instance level service' do
     before do
-      create(:service, project: nil, template: true, active: true)
+      create(:service, project: nil, instance: true, active: true)
     end
 
-    it 'creates a service from this template' do
+    it 'creates a service from instance level service' do
       project = create_project(user, opts)
 
       expect(project.services.count).to eq 1
     end
   end
 
-  context 'when a bad service template is created' do
+  context 'when a bad instance level service is created' do
     it 'sets service to be inactive' do
       opts[:import_url] = 'http://www.gitlab.com/gitlab-org/gitlab-foss'
-      create(:service, type: 'DroneCiService', project: nil, template: true, active: true)
+      create(:service, type: 'DroneCiService', project: nil, instance: true, active: true)
 
       project = create_project(user, opts)
       service = project.services.first

spec/services/projects/propagate_service_template_spec.rb → spec/services/projects/propagate_instance_level_service_spec.rb

@@ -2,11 +2,11 @@
 
 require 'spec_helper'
 
-describe Projects::PropagateServiceTemplate do
+describe Projects::PropagateInstanceLevelService do
   describe '.propagate' do
-    let!(:service_template) do
+    let!(:instance_level_integration) do
       PushoverService.create(
-        template: true,
+        instance: true,
         active: true,
         properties: {
           device: 'MyDevice',
@@ -22,14 +22,14 @@ describe Projects::PropagateServiceTemplate do
     it 'creates services for projects' do
       expect(project.pushover_service).to be_nil
 
-      described_class.propagate(service_template)
+      described_class.propagate(instance_level_integration)
 
       expect(project.reload.pushover_service).to be_present
     end
 
     it 'creates services for a project that has another service' do
       BambooService.create(
-        template: true,
+        instance: true,
         active: true,
         project: project,
         properties: {
@@ -42,14 +42,14 @@ describe Projects::PropagateServiceTemplate do
 
       expect(project.pushover_service).to be_nil
 
-      described_class.propagate(service_template)
+      described_class.propagate(instance_level_integration)
 
       expect(project.reload.pushover_service).to be_present
     end
 
     it 'does not create the service if it exists already' do
       other_service = BambooService.create(
-        template: true,
+        instance: true,
         active: true,
         properties: {
           bamboo_url: 'http://gitlab.com',
@@ -59,17 +59,17 @@ describe Projects::PropagateServiceTemplate do
         }
       )
 
-      Service.build_from_template(project.id, service_template).save!
-      Service.build_from_template(project.id, other_service).save!
+      Service.build_from_instance(project.id, instance_level_integration).save!
+      Service.build_from_instance(project.id, other_service).save!
 
-      expect { described_class.propagate(service_template) }
+      expect { described_class.propagate(instance_level_integration) }
         .not_to change { Service.count }
     end
 
-    it 'creates the service containing the template attributes' do
-      described_class.propagate(service_template)
+    it 'creates the service containing the instance attributes' do
+      described_class.propagate(instance_level_integration)
 
-      expect(project.pushover_service.properties).to eq(service_template.properties)
+      expect(project.pushover_service.properties).to eq(instance_level_integration.properties)
     end
 
     describe 'bulk update', :use_sql_query_cache do
@@ -80,7 +80,7 @@ describe Projects::PropagateServiceTemplate do
 
         project_total.times { create(:project) }
 
-        described_class.propagate(service_template)
+        described_class.propagate(instance_level_integration)
       end
 
       it 'creates services for all projects' do
@@ -90,18 +90,18 @@ describe Projects::PropagateServiceTemplate do
 
     describe 'external tracker' do
       it 'updates the project external tracker' do
-        service_template.update!(category: 'issue_tracker', default: false)
+        instance_level_integration.update!(category: 'issue_tracker', default: false)
 
-        expect { described_class.propagate(service_template) }
+        expect { described_class.propagate(instance_level_integration) }
           .to change { project.reload.has_external_issue_tracker }.to(true)
       end
     end
 
     describe 'external wiki' do
       it 'updates the project external tracker' do
-        service_template.update!(type: 'ExternalWikiService')
+        instance_level_integration.update!(type: 'ExternalWikiService')
 
-        expect { described_class.propagate(service_template) }
+        expect { described_class.propagate(instance_level_integration) }
           .to change { project.reload.has_external_wiki }.to(true)
       end
     end

spec/workers/propagate_service_template_worker_spec.rb → spec/workers/propagate_instance_level_service_worker_spec.rb

@@ -2,13 +2,13 @@
 
 require 'spec_helper'
 
-describe PropagateServiceTemplateWorker do
+describe PropagateInstanceLevelServiceWorker do
   include ExclusiveLeaseHelpers
 
   describe '#perform' do
-    it 'calls the propagate service with the template' do
-      template = PushoverService.create(
-        template: true,
+    it 'calls the propagate service with the instance level service' do
+      instance_level_service = PushoverService.create(
+        instance: true,
         active: true,
         properties: {
           device: 'MyDevice',
@@ -18,14 +18,14 @@ describe PropagateServiceTemplateWorker do
           api_key: '123456789'
         })
 
-      stub_exclusive_lease("propagate_service_template_worker:#{template.id}",
-        timeout: PropagateServiceTemplateWorker::LEASE_TIMEOUT)
+      stub_exclusive_lease("propagate_instance_level_service_worker:#{instance_level_service.id}",
+        timeout: PropagateInstanceLevelServiceWorker::LEASE_TIMEOUT)
 
-      expect(Projects::PropagateServiceTemplate)
+      expect(Projects::PropagateInstanceLevelService)
         .to receive(:propagate)
-        .with(template)
+        .with(instance_level_service)
 
-      subject.perform(template.id)
+      subject.perform(instance_level_service.id)
     end
   end
 end