Add latest changes from gitlab-org/gitlab@master

10 files changed, 90 insertions, 8 deletions

diff --git a/db/fixtures/development/17_cycle_analytics.rb b/db/fixtures/development/17_cycle_analytics.rb
index 95d956fb402..fa19775a571 100644
--- a/db/fixtures/development/17_cycle_analytics.rb
+++ b/db/fixtures/development/17_cycle_analytics.rb
@@ -157,16 +157,17 @@ class Gitlab::Seeder::CycleAnalytics
   end
 
   def create_new_vsm_project
+    namespace = FactoryBot.create(
+      :group,
+      name: "Value Stream Management Group #{suffix}",
+      path: "vsmg-#{suffix}"
+    )
     project = FactoryBot.create(
       :project,
       name: "Value Stream Management Project #{suffix}",
       path: "vsmp-#{suffix}",
       creator: admin,
-      namespace: FactoryBot.create(
-        :group,
-        name: "Value Stream Management Group #{suffix}",
-        path: "vsmg-#{suffix}"
-      )
+      namespace: namespace
     )
 
     project.create_repository
diff --git a/db/migrate/20211028132247_create_packages_npm_metadata.rb b/db/migrate/20211028132247_create_packages_npm_metadata.rb
new file mode 100644
index 00000000000..cbe5429fca1
--- /dev/null
+++ b/db/migrate/20211028132247_create_packages_npm_metadata.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class CreatePackagesNpmMetadata < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  def up
+    with_lock_retries do
+      create_table :packages_npm_metadata, id: false do |t|
+        t.references :package, primary_key: true, default: nil, index: false, foreign_key: { to_table: :packages_packages, on_delete: :cascade }, type: :bigint
+        t.jsonb :package_json, default: {}, null: false
+
+        t.check_constraint 'char_length(package_json::text) < 20000'
+      end
+    end
+  end
+
+  def down
+    with_lock_retries do
+      drop_table :packages_npm_metadata
+    end
+  end
+end
diff --git a/db/migrate/20211105125756_add_read_at_to_dependency_proxy_manifests.rb b/db/migrate/20211105125756_add_read_at_to_dependency_proxy_manifests.rb
new file mode 100644
index 00000000000..a594674f470
--- /dev/null
+++ b/db/migrate/20211105125756_add_read_at_to_dependency_proxy_manifests.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReadAtToDependencyProxyManifests < Gitlab::Database::Migration[1.0]
+  def change
+    add_column :dependency_proxy_manifests, :read_at, :datetime_with_timezone, null: false, default: -> { 'NOW()' }
+  end
+end
diff --git a/db/migrate/20211105125813_add_read_at_to_dependency_proxy_blobs.rb b/db/migrate/20211105125813_add_read_at_to_dependency_proxy_blobs.rb
new file mode 100644
index 00000000000..1808a541498
--- /dev/null
+++ b/db/migrate/20211105125813_add_read_at_to_dependency_proxy_blobs.rb
@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class AddReadAtToDependencyProxyBlobs < Gitlab::Database::Migration[1.0]
+  def change
+    add_column :dependency_proxy_blobs, :read_at, :datetime_with_timezone, null: false, default: -> { 'NOW()' }
+  end
+end
diff --git a/db/migrate/20211108203248_update_dependency_proxy_indexes_with_read_at.rb b/db/migrate/20211108203248_update_dependency_proxy_indexes_with_read_at.rb
new file mode 100644
index 00000000000..ac0f0ddca17
--- /dev/null
+++ b/db/migrate/20211108203248_update_dependency_proxy_indexes_with_read_at.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class UpdateDependencyProxyIndexesWithReadAt < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  NEW_BLOB_INDEX = 'index_dependency_proxy_blobs_on_group_id_status_read_at_id'
+  OLD_BLOB_INDEX = 'index_dependency_proxy_blobs_on_group_id_status_and_id'
+
+  NEW_MANIFEST_INDEX = 'index_dependency_proxy_manifests_on_group_id_status_read_at_id'
+  OLD_MANIFEST_INDEX = 'index_dependency_proxy_manifests_on_group_id_status_and_id'
+
+  def up
+    add_concurrent_index :dependency_proxy_blobs, [:group_id, :status, :read_at, :id], name: NEW_BLOB_INDEX
+    add_concurrent_index :dependency_proxy_manifests, [:group_id, :status, :read_at, :id], name: NEW_MANIFEST_INDEX
+
+    remove_concurrent_index_by_name :dependency_proxy_blobs, OLD_BLOB_INDEX
+    remove_concurrent_index_by_name :dependency_proxy_manifests, OLD_MANIFEST_INDEX
+  end
+
+  def down
+    add_concurrent_index :dependency_proxy_blobs, [:group_id, :status, :id], name: OLD_BLOB_INDEX
+    add_concurrent_index :dependency_proxy_manifests, [:group_id, :status, :id], name: OLD_MANIFEST_INDEX
+
+    remove_concurrent_index_by_name :dependency_proxy_blobs, NEW_BLOB_INDEX
+    remove_concurrent_index_by_name :dependency_proxy_manifests, NEW_MANIFEST_INDEX
+  end
+end
diff --git a/db/schema_migrations/20211028132247 b/db/schema_migrations/20211028132247
new file mode 100644
index 00000000000..ab8fa3b55eb
--- /dev/null
+++ b/db/schema_migrations/20211028132247
@@ -0,0 +1 @@
+50a5c8af2cde1ae79d627f70d3b266488f76f76b481aefca8516db5360cfa843
\ No newline at end of file
diff --git a/db/schema_migrations/20211105125756 b/db/schema_migrations/20211105125756
new file mode 100644
index 00000000000..842187d9ae2
--- /dev/null
+++ b/db/schema_migrations/20211105125756
@@ -0,0 +1 @@
+13cf3d164d541df48b6d14d7cc1953113476ba8ea5975d7d0c5f84098e2e0e61
\ No newline at end of file
diff --git a/db/schema_migrations/20211105125813 b/db/schema_migrations/20211105125813
new file mode 100644
index 00000000000..449c3d95d6a
--- /dev/null
+++ b/db/schema_migrations/20211105125813
@@ -0,0 +1 @@
+a48f62bed7e4c4a0e69acd3b340065317aff71602e696970276a4e443f1dcabf
\ No newline at end of file
diff --git a/db/schema_migrations/20211108203248 b/db/schema_migrations/20211108203248
new file mode 100644
index 00000000000..4f8c570b627
--- /dev/null
+++ b/db/schema_migrations/20211108203248
@@ -0,0 +1 @@
+a2556a3d8b21e59caa6cbf7f83d621fef391904d0c13c77c0e5da713a580b4c9
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index a109953a827..669d2549dd8 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -13237,7 +13237,8 @@ CREATE TABLE dependency_proxy_blobs (
     file_store integer,
     file_name character varying NOT NULL,
     file text NOT NULL,
-    status smallint DEFAULT 0 NOT NULL
+    status smallint DEFAULT 0 NOT NULL,
+    read_at timestamp with time zone DEFAULT now() NOT NULL
 );
 
 CREATE SEQUENCE dependency_proxy_blobs_id_seq
@@ -13286,6 +13287,7 @@ CREATE TABLE dependency_proxy_manifests (
     digest text NOT NULL,
     content_type text,
     status smallint DEFAULT 0 NOT NULL,
+    read_at timestamp with time zone DEFAULT now() NOT NULL,
     CONSTRAINT check_079b293a7b CHECK ((char_length(file) <= 255)),
     CONSTRAINT check_167a9a8a91 CHECK ((char_length(content_type) <= 255)),
     CONSTRAINT check_c579e3f586 CHECK ((char_length(file_name) <= 255)),
@@ -17199,6 +17201,12 @@ CREATE SEQUENCE packages_maven_metadata_id_seq
 
 ALTER SEQUENCE packages_maven_metadata_id_seq OWNED BY packages_maven_metadata.id;
 
+CREATE TABLE packages_npm_metadata (
+    package_id bigint NOT NULL,
+    package_json jsonb DEFAULT '{}'::jsonb NOT NULL,
+    CONSTRAINT chk_rails_e5cbc301ae CHECK ((char_length((package_json)::text) < 20000))
+);
+
 CREATE TABLE packages_nuget_dependency_link_metadata (
     dependency_link_id bigint NOT NULL,
     target_framework text NOT NULL,
@@ -23524,6 +23532,9 @@ ALTER TABLE ONLY packages_helm_file_metadata
 ALTER TABLE ONLY packages_maven_metadata
     ADD CONSTRAINT packages_maven_metadata_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY packages_npm_metadata
+    ADD CONSTRAINT packages_npm_metadata_pkey PRIMARY KEY (package_id);
+
 ALTER TABLE ONLY packages_nuget_dependency_link_metadata
     ADD CONSTRAINT packages_nuget_dependency_link_metadata_pkey PRIMARY KEY (dependency_link_id);
 
@@ -25637,13 +25648,13 @@ CREATE UNIQUE INDEX index_dep_prox_manifests_on_group_id_file_name_and_status ON
 
 CREATE INDEX index_dependency_proxy_blobs_on_group_id_and_file_name ON dependency_proxy_blobs USING btree (group_id, file_name);
 
-CREATE INDEX index_dependency_proxy_blobs_on_group_id_status_and_id ON dependency_proxy_blobs USING btree (group_id, status, id);
+CREATE INDEX index_dependency_proxy_blobs_on_group_id_status_read_at_id ON dependency_proxy_blobs USING btree (group_id, status, read_at, id);
 
 CREATE INDEX index_dependency_proxy_blobs_on_status ON dependency_proxy_blobs USING btree (status);
 
 CREATE INDEX index_dependency_proxy_group_settings_on_group_id ON dependency_proxy_group_settings USING btree (group_id);
 
-CREATE INDEX index_dependency_proxy_manifests_on_group_id_status_and_id ON dependency_proxy_manifests USING btree (group_id, status, id);
+CREATE INDEX index_dependency_proxy_manifests_on_group_id_status_read_at_id ON dependency_proxy_manifests USING btree (group_id, status, read_at, id);
 
 CREATE INDEX index_dependency_proxy_manifests_on_status ON dependency_proxy_manifests USING btree (status);
 
@@ -30779,6 +30790,9 @@ ALTER TABLE ONLY atlassian_identities
 ALTER TABLE ONLY serverless_domain_cluster
     ADD CONSTRAINT fk_rails_c09009dee1 FOREIGN KEY (pages_domain_id) REFERENCES pages_domains(id) ON DELETE CASCADE;
 
+ALTER TABLE ONLY packages_npm_metadata
+    ADD CONSTRAINT fk_rails_c0e5fce6f3 FOREIGN KEY (package_id) REFERENCES packages_packages(id) ON DELETE CASCADE;
+
 ALTER TABLE ONLY labels
     ADD CONSTRAINT fk_rails_c1ac5161d8 FOREIGN KEY (group_id) REFERENCES namespaces(id) ON DELETE CASCADE;