Add latest changes from gitlab-org/gitlab@master

11 files changed, 178 insertions, 0 deletions

diff --git a/db/migrate/20210414100914_add_bulk_import_exports_table.rb b/db/migrate/20210414100914_add_bulk_import_exports_table.rb
new file mode 100644
index 00000000000..14a7421c1e4
--- /dev/null
+++ b/db/migrate/20210414100914_add_bulk_import_exports_table.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class AddBulkImportExportsTable < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    create_table_with_constraints :bulk_import_exports do |t|
+      t.bigint :group_id
+      t.bigint :project_id
+      t.timestamps_with_timezone null: false
+      t.integer :status, limit: 2, null: false, default: 0
+      t.text :relation, null: false
+      t.text :jid, unique: true
+      t.text :error
+
+      t.text_limit :relation, 255
+      t.text_limit :jid, 255
+      t.text_limit :error, 255
+    end
+  end
+
+  def down
+    drop_table :bulk_import_exports
+  end
+end
diff --git a/db/migrate/20210414130017_add_foreign_key_to_bulk_import_exports_on_project.rb b/db/migrate/20210414130017_add_foreign_key_to_bulk_import_exports_on_project.rb
new file mode 100644
index 00000000000..2f7d3713302
--- /dev/null
+++ b/db/migrate/20210414130017_add_foreign_key_to_bulk_import_exports_on_project.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddForeignKeyToBulkImportExportsOnProject < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :bulk_import_exports, :projects, column: :project_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :bulk_import_exports, column: :project_id
+    end
+  end
+end
diff --git a/db/migrate/20210414130526_add_foreign_key_to_bulk_import_exports_on_group.rb b/db/migrate/20210414130526_add_foreign_key_to_bulk_import_exports_on_group.rb
new file mode 100644
index 00000000000..b7172c6987e
--- /dev/null
+++ b/db/migrate/20210414130526_add_foreign_key_to_bulk_import_exports_on_group.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+class AddForeignKeyToBulkImportExportsOnGroup < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  def up
+    add_concurrent_foreign_key :bulk_import_exports, :namespaces, column: :group_id, on_delete: :cascade
+  end
+
+  def down
+    with_lock_retries do
+      remove_foreign_key :bulk_import_exports, column: :group_id
+    end
+  end
+end
diff --git a/db/migrate/20210414131807_add_bulk_import_exports_table_indexes.rb b/db/migrate/20210414131807_add_bulk_import_exports_table_indexes.rb
new file mode 100644
index 00000000000..1cbd1cadf5e
--- /dev/null
+++ b/db/migrate/20210414131807_add_bulk_import_exports_table_indexes.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+class AddBulkImportExportsTableIndexes < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  disable_ddl_transaction!
+
+  GROUP_INDEX_NAME = 'partial_index_bulk_import_exports_on_group_id_and_relation'
+  PROJECT_INDEX_NAME = 'partial_index_bulk_import_exports_on_project_id_and_relation'
+
+  def up
+    add_concurrent_index :bulk_import_exports,
+                         [:group_id, :relation],
+                         unique: true,
+                         where: 'group_id IS NOT NULL',
+                         name: GROUP_INDEX_NAME
+
+    add_concurrent_index :bulk_import_exports,
+                         [:project_id, :relation],
+                         unique: true,
+                         where: 'project_id IS NOT NULL',
+                         name: PROJECT_INDEX_NAME
+  end
+
+  def down
+    remove_concurrent_index_by_name(:bulk_import_exports, GROUP_INDEX_NAME)
+    remove_concurrent_index_by_name(:bulk_import_exports, PROJECT_INDEX_NAME)
+  end
+end
diff --git a/db/migrate/20210414133310_add_bulk_import_export_uploads_table.rb b/db/migrate/20210414133310_add_bulk_import_export_uploads_table.rb
new file mode 100644
index 00000000000..d20e57848e9
--- /dev/null
+++ b/db/migrate/20210414133310_add_bulk_import_export_uploads_table.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class AddBulkImportExportUploadsTable < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  def up
+    create_table_with_constraints :bulk_import_export_uploads do |t|
+      t.references :export, index: true, null: false, foreign_key: { to_table: :bulk_import_exports, on_delete: :cascade }
+      t.datetime_with_timezone :updated_at, null: false
+      t.text :export_file
+
+      t.text_limit :export_file, 255
+    end
+  end
+
+  def down
+    drop_table :bulk_import_export_uploads
+  end
+end
diff --git a/db/schema_migrations/20210414100914 b/db/schema_migrations/20210414100914
new file mode 100644
index 00000000000..dcbc93d9987
--- /dev/null
+++ b/db/schema_migrations/20210414100914
@@ -0,0 +1 @@
+4950567ba7071183bc008936e4bbe1391dd0100c5caa2a6821be85dc3d2423fc
\ No newline at end of file
diff --git a/db/schema_migrations/20210414130017 b/db/schema_migrations/20210414130017
new file mode 100644
index 00000000000..0eaffe4ddd1
--- /dev/null
+++ b/db/schema_migrations/20210414130017
@@ -0,0 +1 @@
+202409998a03fd29c52e3ee9546ab8ec7aa3c56173ee755e9342f1cc6a5f1f6b
\ No newline at end of file
diff --git a/db/schema_migrations/20210414130526 b/db/schema_migrations/20210414130526
new file mode 100644
index 00000000000..ebba5c47f22
--- /dev/null
+++ b/db/schema_migrations/20210414130526
@@ -0,0 +1 @@
+2343decc3abb79b38bcde6aba5a8fd208842096d7fb7a4c51872f66f1a125296
\ No newline at end of file
diff --git a/db/schema_migrations/20210414131807 b/db/schema_migrations/20210414131807
new file mode 100644
index 00000000000..9a7800b86f8
--- /dev/null
+++ b/db/schema_migrations/20210414131807
@@ -0,0 +1 @@
+4db08c0fecd210b329492596cf029518484d256bdb06efff233b3a38677fd6a6
\ No newline at end of file
diff --git a/db/schema_migrations/20210414133310 b/db/schema_migrations/20210414133310
new file mode 100644
index 00000000000..9a0a224e09b
--- /dev/null
+++ b/db/schema_migrations/20210414133310
@@ -0,0 +1 @@
+f306cf9553e4bd237cfdff31d5432d4ff44302a923e475c477f76d32ccb4d257
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index f52f5457dd2..3cb671164c1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -10212,6 +10212,47 @@ CREATE SEQUENCE bulk_import_entities_id_seq
 
 ALTER SEQUENCE bulk_import_entities_id_seq OWNED BY bulk_import_entities.id;
 
+CREATE TABLE bulk_import_export_uploads (
+    id bigint NOT NULL,
+    export_id bigint NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    export_file text,
+    CONSTRAINT check_5add76239d CHECK ((char_length(export_file) <= 255))
+);
+
+CREATE SEQUENCE bulk_import_export_uploads_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE bulk_import_export_uploads_id_seq OWNED BY bulk_import_export_uploads.id;
+
+CREATE TABLE bulk_import_exports (
+    id bigint NOT NULL,
+    group_id bigint,
+    project_id bigint,
+    created_at timestamp with time zone NOT NULL,
+    updated_at timestamp with time zone NOT NULL,
+    status smallint DEFAULT 0 NOT NULL,
+    relation text NOT NULL,
+    jid text,
+    error text,
+    CONSTRAINT check_24cb010672 CHECK ((char_length(relation) <= 255)),
+    CONSTRAINT check_8f0f357334 CHECK ((char_length(error) <= 255)),
+    CONSTRAINT check_9ee6d14d33 CHECK ((char_length(jid) <= 255))
+);
+
+CREATE SEQUENCE bulk_import_exports_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE bulk_import_exports_id_seq OWNED BY bulk_import_exports.id;
+
 CREATE TABLE bulk_import_failures (
     id bigint NOT NULL,
     bulk_import_entity_id bigint NOT NULL,
@@ -19268,6 +19309,10 @@ ALTER TABLE ONLY bulk_import_configurations ALTER COLUMN id SET DEFAULT nextval(
 
 ALTER TABLE ONLY bulk_import_entities ALTER COLUMN id SET DEFAULT nextval('bulk_import_entities_id_seq'::regclass);
 
+ALTER TABLE ONLY bulk_import_export_uploads ALTER COLUMN id SET DEFAULT nextval('bulk_import_export_uploads_id_seq'::regclass);
+
+ALTER TABLE ONLY bulk_import_exports ALTER COLUMN id SET DEFAULT nextval('bulk_import_exports_id_seq'::regclass);
+
 ALTER TABLE ONLY bulk_import_failures ALTER COLUMN id SET DEFAULT nextval('bulk_import_failures_id_seq'::regclass);
 
 ALTER TABLE ONLY bulk_import_trackers ALTER COLUMN id SET DEFAULT nextval('bulk_import_trackers_id_seq'::regclass);
@@ -20387,6 +20432,12 @@ ALTER TABLE ONLY bulk_import_configurations
 ALTER TABLE ONLY bulk_import_entities
     ADD CONSTRAINT bulk_import_entities_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY bulk_import_export_uploads
+    ADD CONSTRAINT bulk_import_export_uploads_pkey PRIMARY KEY (id);
+
+ALTER TABLE ONLY bulk_import_exports
+    ADD CONSTRAINT bulk_import_exports_pkey PRIMARY KEY (id);
+
 ALTER TABLE ONLY bulk_import_failures
     ADD CONSTRAINT bulk_import_failures_pkey PRIMARY KEY (id);
 
@@ -22207,6 +22258,8 @@ CREATE INDEX index_bulk_import_entities_on_parent_id ON bulk_import_entities USI
 
 CREATE INDEX index_bulk_import_entities_on_project_id ON bulk_import_entities USING btree (project_id);
 
+CREATE INDEX index_bulk_import_export_uploads_on_export_id ON bulk_import_export_uploads USING btree (export_id);
+
 CREATE INDEX index_bulk_import_failures_on_bulk_import_entity_id ON bulk_import_failures USING btree (bulk_import_entity_id);
 
 CREATE INDEX index_bulk_import_failures_on_correlation_id_value ON bulk_import_failures USING btree (correlation_id_value);
@@ -24511,6 +24564,10 @@ CREATE INDEX packages_packages_needs_verification ON packages_package_files USIN
 
 CREATE INDEX packages_packages_pending_verification ON packages_package_files USING btree (verified_at NULLS FIRST) WHERE (verification_state = 0);
 
+CREATE UNIQUE INDEX partial_index_bulk_import_exports_on_group_id_and_relation ON bulk_import_exports USING btree (group_id, relation) WHERE (group_id IS NOT NULL);
+
+CREATE UNIQUE INDEX partial_index_bulk_import_exports_on_project_id_and_relation ON bulk_import_exports USING btree (project_id, relation) WHERE (project_id IS NOT NULL);
+
 CREATE INDEX partial_index_ci_builds_on_scheduled_at_with_scheduled_jobs ON ci_builds USING btree (scheduled_at) WHERE ((scheduled_at IS NOT NULL) AND ((type)::text = 'Ci::Build'::text) AND ((status)::text = 'scheduled'::text));
 
 CREATE INDEX partial_index_deployments_for_legacy_successful_deployments ON deployments USING btree (id) WHERE ((finished_at IS NULL) AND (status = 2));
@@ -25002,6 +25059,9 @@ ALTER TABLE ONLY sprints
 ALTER TABLE ONLY push_event_payloads
     ADD CONSTRAINT fk_36c74129da FOREIGN KEY (event_id) REFERENCES events(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY bulk_import_exports
+    ADD CONSTRAINT fk_39c726d3b5 FOREIGN KEY (project_id) REFERENCES projects(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY ci_builds
     ADD CONSTRAINT fk_3a9eaa254d FOREIGN KEY (stage_id) REFERENCES ci_stages(id) ON DELETE CASCADE;
 
@@ -25197,6 +25257,9 @@ ALTER TABLE ONLY issues
 ALTER TABLE ONLY protected_branch_merge_access_levels
     ADD CONSTRAINT fk_8a3072ccb3 FOREIGN KEY (protected_branch_id) REFERENCES protected_branches(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY bulk_import_exports
+    ADD CONSTRAINT fk_8c6f33cebe FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY releases
     ADD CONSTRAINT fk_8e4456f90f FOREIGN KEY (author_id) REFERENCES users(id) ON DELETE SET NULL;
 
@@ -26859,6 +26922,9 @@ ALTER TABLE ONLY incident_management_oncall_shifts
 ALTER TABLE ONLY analytics_cycle_analytics_group_stages
     ADD CONSTRAINT fk_rails_dfb37c880d FOREIGN KEY (end_event_label_id) REFERENCES labels(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY bulk_import_export_uploads
+    ADD CONSTRAINT fk_rails_dfbfb45eca FOREIGN KEY (export_id) REFERENCES bulk_import_exports(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY label_priorities
     ADD CONSTRAINT fk_rails_e161058b0f FOREIGN KEY (label_id) REFERENCES labels(id) ON DELETE CASCADE;