Merge branch '335181-ignore-template-column-in-integrations-table' into 'master'

Ignore template column in Integration model

See merge request gitlab-org/gitlab!80514

app/models/integration.rb

@@ -9,6 +9,9 @@ class Integration < ApplicationRecord
   include Integrations::HasDataFields
   include FromUnion
   include EachBatch
+  include IgnorableColumns
+
+  ignore_column :template, remove_with: '14.10', remove_after: '2022-03-22'
 
   INTEGRATION_NAMES = %w[
     asana assembla bamboo bugzilla buildkite campfire confluence custom_issue_tracker datadog discord

app/models/integrations/base_issue_tracker.rb

@@ -145,7 +145,7 @@ module Integrations
     end
 
     def one_issue_tracker
-      return if template? || instance?
+      return if instance?
       return if project.blank?
 
       if project.integrations.external_issue_trackers.where.not(id: id).any?

app/models/integrations/prometheus.rb

@@ -115,7 +115,6 @@ module Integrations
     end
 
     def prometheus_available?
-      return false if template?
       return false unless project
 
       project.all_clusters.enabled.eager_load(:integration_prometheus).any? do |cluster|

app/services/bulk_create_integration_service.rb

@@ -32,11 +32,7 @@ class BulkCreateIntegrationService
   end
 
   def integration_hash
-    if integration.template?
-      integration.to_integration_hash
-    else
-      integration.to_integration_hash.tap { |json| json['inherit_from_id'] = integration.inherit_from_id || integration.id }
-    end
+    integration.to_integration_hash.tap { |json| json['inherit_from_id'] = integration.inherit_from_id || integration.id }
   end
 
   def data_fields_hash

app/services/integrations/propagate_template_service.rb

-# frozen_string_literal: true
-
-module Integrations
-  # TODO: Remove this as part of https://gitlab.com/gitlab-org/gitlab/-/issues/335178
-  class PropagateTemplateService
-    def self.propagate(_integration)
-      # no-op
-    end
-  end
-end

spec/factories/integrations.rb

@@ -217,11 +217,6 @@ FactoryBot.define do
     end
   end
 
-  trait :template do
-    project { nil }
-    template { true }
-  end
-
   trait :group do
     group
     project { nil }

spec/lib/gitlab/integrations/sti_type_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe Gitlab::Integrations::StiType do
     context 'SQL SELECT' do
       let(:expected_sql) do
         <<~SQL.strip
-          SELECT "integrations".* FROM "integrations" WHERE "integrations"."type" = 'AsanaService'
+          FROM "integrations" WHERE "integrations"."type" = 'AsanaService'
         SQL
       end
 
@@ -18,7 +18,7 @@ RSpec.describe Gitlab::Integrations::StiType do
           Integration.where(type: type).to_sql
         end
 
-        expect(sql_statements).to all(eq(expected_sql))
+        expect(sql_statements).to all(end_with(expected_sql))
       end
     end
 

spec/models/integration_spec.rb

@@ -268,7 +268,7 @@ RSpec.describe Integration do
   describe '.build_from_integration' do
     context 'when integration is invalid' do
       let(:invalid_integration) do
-        build(:prometheus_integration, :template, active: true, properties: {})
+        build(:prometheus_integration, :instance, active: true, properties: {})
           .tap { |integration| integration.save!(validate: false) }
       end
 

spec/services/bulk_create_integration_service_spec.rb

@@ -13,7 +13,6 @@ RSpec.describe BulkCreateIntegrationService do
   let_it_be(:excluded_project) { create(:project, group: excluded_group) }
 
   let(:instance_integration) { create(:jira_integration, :instance) }
-  let(:template_integration) { create(:jira_integration, :template) }
   let(:excluded_attributes) { %w[id project_id group_id inherit_from_id instance template created_at updated_at] }
 
   shared_examples 'creates integration from batch ids' do