Add latest changes from gitlab-org/gitlab@master

5 files changed, 37 insertions, 4 deletions

diff --git a/spec/lib/gitlab/database/schema_validation/runner_spec.rb b/spec/lib/gitlab/database/schema_validation/runner_spec.rb
index e07deec3062..13980cb148b 100644
--- a/spec/lib/gitlab/database/schema_validation/runner_spec.rb
+++ b/spec/lib/gitlab/database/schema_validation/runner_spec.rb
@@ -32,7 +32,7 @@ RSpec.describe Gitlab::Database::SchemaValidation::Runner, feature_category: :da
 
       let(:extra_indexes) { class_double(class_name) }
       let(:instace_extra_index) { instance_double(class_name, execute: [inconsistency]) }
-      let(:inconsistency) { instance_double(inconsistency_class_name, name: 'test') }
+      let(:inconsistency) { instance_double(inconsistency_class_name, object_name: 'test') }
 
       let(:validators) { [extra_indexes] }
 
@@ -43,7 +43,7 @@ RSpec.describe Gitlab::Database::SchemaValidation::Runner, feature_category: :da
           expect(validator).not_to receive(:new).with(structure_sql, database)
         end
 
-        expect(inconsistencies.map(&:name)).to eql ['test']
+        expect(inconsistencies.map(&:object_name)).to eql ['test']
       end
     end
   end
diff --git a/spec/lib/gitlab/database/schema_validation/validators/base_validator_spec.rb b/spec/lib/gitlab/database/schema_validation/validators/base_validator_spec.rb
index adac5b4e579..cf5207aee95 100644
--- a/spec/lib/gitlab/database/schema_validation/validators/base_validator_spec.rb
+++ b/spec/lib/gitlab/database/schema_validation/validators/base_validator_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Gitlab::Database::SchemaValidation::Validators::BaseValidator, fe
       expect(all_validators).to eq([
         Gitlab::Database::SchemaValidation::Validators::ExtraIndexes,
         Gitlab::Database::SchemaValidation::Validators::MissingIndexes,
-        Gitlab::Database::SchemaValidation::Validators::WrongIndexes
+        Gitlab::Database::SchemaValidation::Validators::DifferentDefinitionIndexes
       ])
     end
   end
diff --git a/spec/lib/gitlab/database/schema_validation/validators/wrong_indexes_spec.rb b/spec/lib/gitlab/database/schema_validation/validators/different_definition_indexes_spec.rb
index 026f3fb710c..b9744c86b80 100644
--- a/spec/lib/gitlab/database/schema_validation/validators/wrong_indexes_spec.rb
+++ b/spec/lib/gitlab/database/schema_validation/validators/different_definition_indexes_spec.rb
@@ -2,6 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Gitlab::Database::SchemaValidation::Validators::WrongIndexes, feature_category: :database do
+RSpec.describe Gitlab::Database::SchemaValidation::Validators::DifferentDefinitionIndexes,
+  feature_category: :database do
   include_examples 'index validators', described_class, ['wrong_index']
 end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index a22b9d11214..73f29f6debe 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -297,6 +297,7 @@ ci_pipelines:
 - job_artifacts
 - vulnerabilities_finding_pipelines
 - vulnerability_findings
+- vulnerability_state_transitions
 - pipeline_config
 - security_scans
 - security_findings
@@ -396,6 +397,7 @@ builds:
 - job_artifacts_cyclonedx
 - job_artifacts_requirements_v2
 - runner_machine
+- runner_machine_build
 - runner_session
 - trace_metadata
 - terraform_state_versions
diff --git a/spec/lib/gitlab/usage/metrics/instrumentations/index_inconsistencies_metric_spec.rb b/spec/lib/gitlab/usage/metrics/instrumentations/index_inconsistencies_metric_spec.rb
new file mode 100644
index 00000000000..afc9d610207
--- /dev/null
+++ b/spec/lib/gitlab/usage/metrics/instrumentations/index_inconsistencies_metric_spec.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Gitlab::Usage::Metrics::Instrumentations::IndexInconsistenciesMetric, feature_category: :database do
+  it_behaves_like 'a correct instrumented metric value', { time_frame: 'all' } do
+    let(:expected_value) do
+      [
+        { inconsistency_type: 'wrong_indexes', object_name: 'index_name_1' },
+        { inconsistency_type: 'missing_indexes', object_name: 'index_name_2' },
+        { inconsistency_type: 'extra_indexes', object_name: 'index_name_3' }
+      ]
+    end
+
+    let(:runner) { instance_double(Gitlab::Database::SchemaValidation::Runner, execute: inconsistencies) }
+    let(:inconsistency_class) { Gitlab::Database::SchemaValidation::Validators::BaseValidator::Inconsistency }
+
+    let(:inconsistencies) do
+      [
+        instance_double(inconsistency_class, object_name: 'index_name_1', type: 'wrong_indexes'),
+        instance_double(inconsistency_class, object_name: 'index_name_2', type: 'missing_indexes'),
+        instance_double(inconsistency_class, object_name: 'index_name_3', type: 'extra_indexes')
+      ]
+    end
+
+    before do
+      allow(Gitlab::Database::SchemaValidation::Runner).to receive(:new).and_return(runner)
+    end
+  end
+end