summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan Cobb <rcobb@gitlab.com>2019-07-09 15:31:28 -0600
committerRyan Cobb <rcobb@gitlab.com>2019-07-09 17:02:08 -0600
commitdf8a56e630a4f4df93fbc54de938f31542539d31 (patch)
treedd995a9294569374fe48b244c972b0b5456100d9
parent68b37a99f4032deb9b1f196451a09c051274480c (diff)
downloadgitlab-ce-df8a56e630a4f4df93fbc54de938f31542539d31.tar.gz
Rename Gitlab::Importers module
In order to avoid confusion between Gitlab::Importers module and other like named modules, this renamed it to Gitlab::DatabaseImporters.
-rw-r--r--db/fixtures/development/99_common_metrics.rb2
-rw-r--r--db/fixtures/production/999_common_metrics.rb2
-rw-r--r--db/migrate/20180831164910_import_common_metrics.rb2
-rw-r--r--db/migrate/20181006004100_import_common_metrics_nginx_vts.rb2
-rw-r--r--db/migrate/20190326164045_import_common_metrics_knative.rb2
-rw-r--r--db/migrate/20190408163745_prometheus_knative05_fix.rb2
-rw-r--r--doc/development/prometheus_metrics.md2
-rw-r--r--lib/gitlab/database_importers/common_metrics.rb (renamed from lib/gitlab/importers/common_metrics.rb)2
-rw-r--r--lib/gitlab/database_importers/common_metrics/importer.rb (renamed from lib/gitlab/importers/common_metrics/importer.rb)2
-rw-r--r--lib/gitlab/database_importers/common_metrics/prometheus_metric.rb (renamed from lib/gitlab/importers/common_metrics/prometheus_metric.rb)2
-rw-r--r--lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb (renamed from lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb)2
-rw-r--r--spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb (renamed from spec/lib/gitlab/importers/common_metrics/importer_spec.rb)4
-rw-r--r--spec/lib/gitlab/database_importers/common_metrics/prometheus_metric_spec.rb (renamed from spec/lib/gitlab/importers/common_metrics/prometheus_metric_spec.rb)4
13 files changed, 15 insertions, 15 deletions
diff --git a/db/fixtures/development/99_common_metrics.rb b/db/fixtures/development/99_common_metrics.rb
index 0406ce0c8c9..d52f78ea536 100644
--- a/db/fixtures/development/99_common_metrics.rb
+++ b/db/fixtures/development/99_common_metrics.rb
@@ -1,3 +1,3 @@
# frozen_string_literal: true
-::Gitlab::Importers::CommonMetrics::Importer.new.execute
+::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
diff --git a/db/fixtures/production/999_common_metrics.rb b/db/fixtures/production/999_common_metrics.rb
index 0406ce0c8c9..d52f78ea536 100644
--- a/db/fixtures/production/999_common_metrics.rb
+++ b/db/fixtures/production/999_common_metrics.rb
@@ -1,3 +1,3 @@
# frozen_string_literal: true
-::Gitlab::Importers::CommonMetrics::Importer.new.execute
+::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
diff --git a/db/migrate/20180831164910_import_common_metrics.rb b/db/migrate/20180831164910_import_common_metrics.rb
index cc50ac71f49..4e61a25c1ad 100644
--- a/db/migrate/20180831164910_import_common_metrics.rb
+++ b/db/migrate/20180831164910_import_common_metrics.rb
@@ -6,7 +6,7 @@ class ImportCommonMetrics < ActiveRecord::Migration[4.2]
DOWNTIME = false
def up
- ::Gitlab::Importers::CommonMetrics::Importer.new.execute
+ ::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
end
def down
diff --git a/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb b/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
index 50d3e406496..2b238774dca 100644
--- a/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
+++ b/db/migrate/20181006004100_import_common_metrics_nginx_vts.rb
@@ -4,7 +4,7 @@ class ImportCommonMetricsNginxVts < ActiveRecord::Migration[5.0]
DOWNTIME = false
def up
- ::Gitlab::Importers::CommonMetrics::Importer.new.execute
+ ::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
end
def down
diff --git a/db/migrate/20190326164045_import_common_metrics_knative.rb b/db/migrate/20190326164045_import_common_metrics_knative.rb
index 46f074ef780..6b331755774 100644
--- a/db/migrate/20190326164045_import_common_metrics_knative.rb
+++ b/db/migrate/20190326164045_import_common_metrics_knative.rb
@@ -6,7 +6,7 @@ class ImportCommonMetricsKnative < ActiveRecord::Migration[5.0]
DOWNTIME = false
def up
- ::Gitlab::Importers::CommonMetrics::Importer.new.execute
+ ::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
end
def down
diff --git a/db/migrate/20190408163745_prometheus_knative05_fix.rb b/db/migrate/20190408163745_prometheus_knative05_fix.rb
index 1b8e07a8c08..3d0aa782669 100644
--- a/db/migrate/20190408163745_prometheus_knative05_fix.rb
+++ b/db/migrate/20190408163745_prometheus_knative05_fix.rb
@@ -9,7 +9,7 @@ class PrometheusKnative05Fix < ActiveRecord::Migration[5.0]
DOWNTIME = false
def up
- ::Gitlab::Importers::CommonMetrics::Importer.new.execute
+ ::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
end
def down
diff --git a/doc/development/prometheus_metrics.md b/doc/development/prometheus_metrics.md
index bca0b22b650..576601372a3 100644
--- a/doc/development/prometheus_metrics.md
+++ b/doc/development/prometheus_metrics.md
@@ -36,7 +36,7 @@ class ImportCommonMetrics < ActiveRecord::Migration[4.2]
DOWNTIME = false
def up
- ::Gitlab::Importers::CommonMetrics::Importer.new.execute
+ ::Gitlab::DatabaseImporters::CommonMetrics::Importer.new.execute
end
def down
diff --git a/lib/gitlab/importers/common_metrics.rb b/lib/gitlab/database_importers/common_metrics.rb
index 532615c57a8..f964ae8a275 100644
--- a/lib/gitlab/importers/common_metrics.rb
+++ b/lib/gitlab/database_importers/common_metrics.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Gitlab
- module Importers
+ module DatabaseImporters
module CommonMetrics
end
end
diff --git a/lib/gitlab/importers/common_metrics/importer.rb b/lib/gitlab/database_importers/common_metrics/importer.rb
index aded55c64c7..43be5a8ee59 100644
--- a/lib/gitlab/importers/common_metrics/importer.rb
+++ b/lib/gitlab/database_importers/common_metrics/importer.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Gitlab
- module Importers
+ module DatabaseImporters
module CommonMetrics
class Importer
MissingQueryId = Class.new(StandardError)
diff --git a/lib/gitlab/importers/common_metrics/prometheus_metric.rb b/lib/gitlab/database_importers/common_metrics/prometheus_metric.rb
index a9397f4c055..b4a392cbea9 100644
--- a/lib/gitlab/importers/common_metrics/prometheus_metric.rb
+++ b/lib/gitlab/database_importers/common_metrics/prometheus_metric.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Gitlab
- module Importers
+ module DatabaseImporters
module CommonMetrics
class PrometheusMetric < ApplicationRecord
enum group: PrometheusMetricEnums.groups
diff --git a/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb b/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb
index dbf4c9e9b55..c9e957ec7c0 100644
--- a/lib/gitlab/importers/common_metrics/prometheus_metric_enums.rb
+++ b/lib/gitlab/database_importers/common_metrics/prometheus_metric_enums.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
module Gitlab
- module Importers
+ module DatabaseImporters
module CommonMetrics
module PrometheusMetricEnums
def self.groups
diff --git a/spec/lib/gitlab/importers/common_metrics/importer_spec.rb b/spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb
index 31745186a8d..57c8bafd488 100644
--- a/spec/lib/gitlab/importers/common_metrics/importer_spec.rb
+++ b/spec/lib/gitlab/database_importers/common_metrics/importer_spec.rb
@@ -2,7 +2,7 @@
require 'rails_helper'
-describe Gitlab::Importers::CommonMetrics::Importer do
+describe Gitlab::DatabaseImporters::CommonMetrics::Importer do
subject { described_class.new }
context "does import common_metrics.yml" do
@@ -87,7 +87,7 @@ describe Gitlab::Importers::CommonMetrics::Importer do
let(:query_identifier) { }
it 'raises exception' do
- expect { subject.execute }.to raise_error(Gitlab::Importers::CommonMetrics::Importer::MissingQueryId)
+ expect { subject.execute }.to raise_error(Gitlab::DatabaseImporters::CommonMetrics::Importer::MissingQueryId)
end
end
diff --git a/spec/lib/gitlab/importers/common_metrics/prometheus_metric_spec.rb b/spec/lib/gitlab/database_importers/common_metrics/prometheus_metric_spec.rb
index 5ce0b0aff64..1103da72501 100644
--- a/spec/lib/gitlab/importers/common_metrics/prometheus_metric_spec.rb
+++ b/spec/lib/gitlab/database_importers/common_metrics/prometheus_metric_spec.rb
@@ -2,7 +2,7 @@
require 'rails_helper'
-describe Gitlab::Importers::CommonMetrics::PrometheusMetric do
+describe Gitlab::DatabaseImporters::CommonMetrics::PrometheusMetric do
let(:existing_group_titles) do
::PrometheusMetricEnums.group_details.each_with_object({}) do |(key, value), memo|
memo[key] = value[:group_title]
@@ -14,6 +14,6 @@ describe Gitlab::Importers::CommonMetrics::PrometheusMetric do
end
it '.group_titles equals ::PrometheusMetric' do
- expect(Gitlab::Importers::CommonMetrics::PrometheusMetricEnums.group_titles).to eq(existing_group_titles)
+ expect(Gitlab::DatabaseImporters::CommonMetrics::PrometheusMetricEnums.group_titles).to eq(existing_group_titles)
end
end