Add latest changes from gitlab-org/gitlab@master

5 files changed, 34 insertions, 0 deletions

diff --git a/db/migrate/20210430100947_add_elasticsearch_username_password_to_application_settings.rb b/db/migrate/20210430100947_add_elasticsearch_username_password_to_application_settings.rb
new file mode 100644
index 00000000000..446ac93c75b
--- /dev/null
+++ b/db/migrate/20210430100947_add_elasticsearch_username_password_to_application_settings.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class AddElasticsearchUsernamePasswordToApplicationSettings < ActiveRecord::Migration[6.0]
+  def change
+    # rubocop:disable Migration/AddLimitToTextColumns
+    # limit is added in 20210505124816_add_text_limit_to_elasticsearch_username
+    add_column :application_settings, :elasticsearch_username, :text
+    # rubocop:enable Migration/AddLimitToTextColumns
+
+    add_column :application_settings, :encrypted_elasticsearch_password, :binary
+    add_column :application_settings, :encrypted_elasticsearch_password_iv, :binary
+  end
+end
diff --git a/db/migrate/20210505124816_add_text_limit_to_elasticsearch_username.rb b/db/migrate/20210505124816_add_text_limit_to_elasticsearch_username.rb
new file mode 100644
index 00000000000..324b9193efb
--- /dev/null
+++ b/db/migrate/20210505124816_add_text_limit_to_elasticsearch_username.rb
@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class AddTextLimitToElasticsearchUsername < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :application_settings, :elasticsearch_username, 255
+  end
+
+  def down
+    remove_text_limit :application_settings, :elasticsearch_username
+  end
+end
diff --git a/db/schema_migrations/20210430100947 b/db/schema_migrations/20210430100947
new file mode 100644
index 00000000000..409d807ff2a
--- /dev/null
+++ b/db/schema_migrations/20210430100947
@@ -0,0 +1 @@
+c8875e02134542370cc5a792bdaefc77b66f58a33a46720f5ef562c33c5b8f41
\ No newline at end of file
diff --git a/db/schema_migrations/20210505124816 b/db/schema_migrations/20210505124816
new file mode 100644
index 00000000000..a5877ffee20
--- /dev/null
+++ b/db/schema_migrations/20210505124816
@@ -0,0 +1 @@
+56aa9590f4bc37d8f8c4ed869a4b095ba39925fb06ab58500eead895d19ee336
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index eaab32aa66f..efc5811c52e 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -9514,6 +9514,9 @@ CREATE TABLE application_settings (
     encrypted_spam_check_api_key bytea,
     encrypted_spam_check_api_key_iv bytea,
     floc_enabled boolean DEFAULT false NOT NULL,
+    elasticsearch_username text,
+    encrypted_elasticsearch_password bytea,
+    encrypted_elasticsearch_password_iv bytea,
     CONSTRAINT app_settings_container_reg_cleanup_tags_max_list_size_positive CHECK ((container_registry_cleanup_tags_service_max_list_size >= 0)),
     CONSTRAINT app_settings_ext_pipeline_validation_service_url_text_limit CHECK ((char_length(external_pipeline_validation_service_url) <= 255)),
     CONSTRAINT app_settings_registry_exp_policies_worker_capacity_positive CHECK ((container_registry_expiration_policies_worker_capacity >= 0)),
@@ -9529,6 +9532,7 @@ CREATE TABLE application_settings (
     CONSTRAINT check_a5704163cc CHECK ((char_length(secret_detection_revocation_token_types_url) <= 255)),
     CONSTRAINT check_d03919528d CHECK ((char_length(container_registry_vendor) <= 255)),
     CONSTRAINT check_d820146492 CHECK ((char_length(spam_check_endpoint_url) <= 255)),
+    CONSTRAINT check_e5024c8801 CHECK ((char_length(elasticsearch_username) <= 255)),
     CONSTRAINT check_e5aba18f02 CHECK ((char_length(container_registry_version) <= 255)),
     CONSTRAINT check_ef6176834f CHECK ((char_length(encrypted_cloud_license_auth_token_iv) <= 255))
 );