Add latest changes from gitlab-org/gitlab@14-3-stable-eev14.3.0-rc42

6 files changed, 106 insertions, 3 deletions

diff --git a/app/models/integrations/base_chat_notification.rb b/app/models/integrations/base_chat_notification.rb
index 5eae8bce92a..c6335782b5e 100644
--- a/app/models/integrations/base_chat_notification.rb
+++ b/app/models/integrations/base_chat_notification.rb
@@ -253,3 +253,5 @@ module Integrations
     end
   end
 end
+
+Integrations::BaseChatNotification.prepend_mod_with('Integrations::BaseChatNotification')
diff --git a/app/models/integrations/datadog.rb b/app/models/integrations/datadog.rb
index 6422f6bddab..72e0ca22ac2 100644
--- a/app/models/integrations/datadog.rb
+++ b/app/models/integrations/datadog.rb
@@ -7,7 +7,7 @@ module Integrations
     extend Gitlab::Utils::Override
 
     DEFAULT_DOMAIN = 'datadoghq.com'
-    URL_TEMPLATE = 'https://webhooks-http-intake.logs.%{datadog_domain}/api/v2/webhook'
+    URL_TEMPLATE = 'https://webhook-intake.%{datadog_domain}/api/v2/webhook'
     URL_API_KEYS_DOCS = "https://docs.#{DEFAULT_DOMAIN}/account_management/api-app-keys/"
 
     SUPPORTED_EVENTS = %w[
diff --git a/app/models/integrations/prometheus.rb b/app/models/integrations/prometheus.rb
index 54cb823d606..5746343c31c 100644
--- a/app/models/integrations/prometheus.rb
+++ b/app/models/integrations/prometheus.rb
@@ -76,7 +76,7 @@ module Integrations
           name: 'google_iap_audience_client_id',
           title: 'Google IAP Audience Client ID',
           placeholder: s_('PrometheusService|IAP_CLIENT_ID.apps.googleusercontent.com'),
-          help: s_('PrometheusService|PrometheusService|The ID of the IAP-secured resource.'),
+          help: s_('PrometheusService|The ID of the IAP-secured resource.'),
           autocomplete: 'off',
           required: false
         },
diff --git a/app/models/integrations/slack_slash_commands.rb b/app/models/integrations/slack_slash_commands.rb
index ff1f806df45..72e3c4a8cbc 100644
--- a/app/models/integrations/slack_slash_commands.rb
+++ b/app/models/integrations/slack_slash_commands.rb
@@ -9,7 +9,7 @@ module Integrations
     end
 
     def description
-      "Perform common operations in Slack"
+      "Perform common operations in Slack."
     end
 
     def self.to_param
diff --git a/app/models/integrations/zentao.rb b/app/models/integrations/zentao.rb
new file mode 100644
index 00000000000..68c02f54c61
--- /dev/null
+++ b/app/models/integrations/zentao.rb
@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+module Integrations
+  class Zentao < Integration
+    data_field :url, :api_url, :api_token, :zentao_product_xid
+
+    validates :url, public_url: true, presence: true, if: :activated?
+    validates :api_url, public_url: true, allow_blank: true
+    validates :api_token, presence: true, if: :activated?
+    validates :zentao_product_xid, presence: true, if: :activated?
+
+    def data_fields
+      zentao_tracker_data || self.build_zentao_tracker_data
+    end
+
+    def title
+      self.class.name.demodulize
+    end
+
+    def description
+      s_("ZentaoIntegration|Use Zentao as this project's issue tracker.")
+    end
+
+    def self.to_param
+      name.demodulize.downcase
+    end
+
+    def test(*_args)
+      client.ping
+    end
+
+    def self.supported_events
+      %w()
+    end
+
+    def self.supported_event_actions
+      %w()
+    end
+
+    def fields
+      [
+        {
+          type: 'text',
+          name: 'url',
+          title: s_('ZentaoIntegration|Zentao Web URL'),
+          placeholder: 'https://www.zentao.net',
+          help: s_('ZentaoIntegration|Base URL of the Zentao instance.'),
+          required: true
+        },
+        {
+          type: 'text',
+          name: 'api_url',
+          title: s_('ZentaoIntegration|Zentao API URL (optional)'),
+          help: s_('ZentaoIntegration|If different from Web URL.')
+        },
+        {
+          type: 'password',
+          name: 'api_token',
+          title: s_('ZentaoIntegration|Zentao API token'),
+          non_empty_password_title: s_('ZentaoIntegration|Enter API token'),
+          required: true
+        },
+        {
+          type: 'text',
+          name: 'zentao_product_xid',
+          title: s_('ZentaoIntegration|Zentao Product ID'),
+          required: true
+        }
+      ]
+    end
+
+    private
+
+    def client
+      @client ||= ::Gitlab::Zentao::Client.new(self)
+    end
+  end
+end
diff --git a/app/models/integrations/zentao_tracker_data.rb b/app/models/integrations/zentao_tracker_data.rb
new file mode 100644
index 00000000000..468e4e5d7d7
--- /dev/null
+++ b/app/models/integrations/zentao_tracker_data.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Integrations
+  class ZentaoTrackerData < ApplicationRecord
+    belongs_to :integration, inverse_of: :zentao_tracker_data, foreign_key: :integration_id
+    delegate :activated?, to: :integration
+    validates :integration, presence: true
+
+    scope :encryption_options, -> do
+      {
+        key: Settings.attr_encrypted_db_key_base_32,
+        encode: true,
+        mode: :per_attribute_iv,
+        algorithm: 'aes-256-gcm'
+      }
+    end
+
+    attr_encrypted :url, encryption_options
+    attr_encrypted :api_url, encryption_options
+    attr_encrypted :zentao_product_xid, encryption_options
+    attr_encrypted :api_token, encryption_options
+  end
+end