diff --git a/app/services/ci/create_pipeline_service.rb b/app/services/ci/create_pipeline_service.rb
index 8262691644ba45539396ade361a5361ad2488fbb..1177e7fa3b47c117839eb51603751845fed0e69e 100644
--- a/app/services/ci/create_pipeline_service.rb
+++ b/app/services/ci/create_pipeline_service.rb
@@ -141,7 +141,7 @@ def sha
end
def create_namespace_onboarding_action
- Namespaces::OnboardingPipelineCreatedWorker.perform_async(project.namespace_id)
+ Onboarding::PipelineCreatedWorker.perform_async(project.namespace_id)
end
def extra_options(content: nil, dry_run: false)
diff --git a/app/services/issues/create_service.rb b/app/services/issues/create_service.rb
index 9cf547354165856683b04a053cb576a122df6f0a..2ec28e2c4d09394c941d84169aa3eec6acf1d935 100644
--- a/app/services/issues/create_service.rb
+++ b/app/services/issues/create_service.rb
@@ -54,7 +54,7 @@ def before_create(issue)
issue.run_after_commit do
NewIssueWorker.perform_async(issue.id, user.id, issue.class.to_s)
Issues::PlacementWorker.perform_async(nil, issue.project_id)
- Namespaces::OnboardingIssueCreatedWorker.perform_async(issue.project.namespace_id)
+ Onboarding::IssueCreatedWorker.perform_async(issue.project.namespace_id)
end
end
diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb
index 38bebc1d09de79eb25089aec968f65d50bbe7e28..e243a002b8f106860ea82fb815f41841b68f15c7 100644
--- a/app/services/members/create_service.rb
+++ b/app/services/members/create_service.rb
@@ -179,7 +179,7 @@ def user_limit
def enqueue_onboarding_progress_action
return unless member_created_namespace_id
- Namespaces::OnboardingUserAddedWorker.perform_async(member_created_namespace_id)
+ Onboarding::UserAddedWorker.perform_async(member_created_namespace_id)
end
def result
diff --git a/app/services/onboarding/progress_service.rb b/app/services/onboarding/progress_service.rb
index 66f7f2bc33db866c570be18e5adcfaba4d6bd354..c67669b49abf0d3d2425c71fd13e2e469ae0eaa6 100644
--- a/app/services/onboarding/progress_service.rb
+++ b/app/services/onboarding/progress_service.rb
@@ -12,7 +12,7 @@ def initialize(namespace_id)
def execute(action:)
return unless Onboarding::Progress.not_completed?(namespace_id, action)
- Namespaces::OnboardingProgressWorker.perform_async(namespace_id, action)
+ Onboarding::ProgressWorker.perform_async(namespace_id, action)
end
end
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 9b282340d0a8401fe9bdba28581414774479c19a..26f9f45e4bd1aa34b3f30113288f32d677d9f43f 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -2739,42 +2739,6 @@
:weight: 1
:idempotent: false
:tags: []
-- :name: namespaces_onboarding_issue_created
- :worker_name: Namespaces::OnboardingIssueCreatedWorker
- :feature_category: :onboarding
- :has_external_dependencies: false
- :urgency: :low
- :resource_boundary: :unknown
- :weight: 1
- :idempotent: true
- :tags: []
-- :name: namespaces_onboarding_pipeline_created
- :worker_name: Namespaces::OnboardingPipelineCreatedWorker
- :feature_category: :onboarding
- :has_external_dependencies: false
- :urgency: :low
- :resource_boundary: :unknown
- :weight: 1
- :idempotent: true
- :tags: []
-- :name: namespaces_onboarding_progress
- :worker_name: Namespaces::OnboardingProgressWorker
- :feature_category: :onboarding
- :has_external_dependencies: false
- :urgency: :low
- :resource_boundary: :cpu
- :weight: 1
- :idempotent: true
- :tags: []
-- :name: namespaces_onboarding_user_added
- :worker_name: Namespaces::OnboardingUserAddedWorker
- :feature_category: :onboarding
- :has_external_dependencies: false
- :urgency: :low
- :resource_boundary: :unknown
- :weight: 1
- :idempotent: true
- :tags: []
- :name: namespaces_process_sync_events
:worker_name: Namespaces::ProcessSyncEventsWorker
:feature_category: :pods
@@ -2820,6 +2784,42 @@
:weight: 2
:idempotent: false
:tags: []
+- :name: onboarding_issue_created
+ :worker_name: Onboarding::IssueCreatedWorker
+ :feature_category: :onboarding
+ :has_external_dependencies: false
+ :urgency: :low
+ :resource_boundary: :unknown
+ :weight: 1
+ :idempotent: true
+ :tags: []
+- :name: onboarding_pipeline_created
+ :worker_name: Onboarding::PipelineCreatedWorker
+ :feature_category: :onboarding
+ :has_external_dependencies: false
+ :urgency: :low
+ :resource_boundary: :unknown
+ :weight: 1
+ :idempotent: true
+ :tags: []
+- :name: onboarding_progress
+ :worker_name: Onboarding::ProgressWorker
+ :feature_category: :onboarding
+ :has_external_dependencies: false
+ :urgency: :low
+ :resource_boundary: :cpu
+ :weight: 1
+ :idempotent: true
+ :tags: []
+- :name: onboarding_user_added
+ :worker_name: Onboarding::UserAddedWorker
+ :feature_category: :onboarding
+ :has_external_dependencies: false
+ :urgency: :low
+ :resource_boundary: :unknown
+ :weight: 1
+ :idempotent: true
+ :tags: []
- :name: packages_composer_cache_update
:worker_name: Packages::Composer::CacheUpdateWorker
:feature_category: :package_registry
diff --git a/app/workers/namespaces/onboarding_issue_created_worker.rb b/app/workers/onboarding/issue_created_worker.rb
similarity index 68%
rename from app/workers/namespaces/onboarding_issue_created_worker.rb
rename to app/workers/onboarding/issue_created_worker.rb
index 4f0cc71cd91142887be6356775b03a703c1cbb32..ff39fefad812c1e3ca59f025df1accdbc493e963 100644
--- a/app/workers/namespaces/onboarding_issue_created_worker.rb
+++ b/app/workers/onboarding/issue_created_worker.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
-module Namespaces
- class OnboardingIssueCreatedWorker
+module Onboarding
+ class IssueCreatedWorker
include ApplicationWorker
data_consistency :always
@@ -22,3 +22,6 @@ def perform(namespace_id)
end
end
end
+
+# remove in %15.6 as per https://gitlab.com/gitlab-org/gitlab/-/issues/372432
+Namespaces::OnboardingIssueCreatedWorker = Onboarding::IssueCreatedWorker
diff --git a/app/workers/namespaces/onboarding_pipeline_created_worker.rb b/app/workers/onboarding/pipeline_created_worker.rb
similarity index 67%
rename from app/workers/namespaces/onboarding_pipeline_created_worker.rb
rename to app/workers/onboarding/pipeline_created_worker.rb
index c3850880df04d7b7d2394959d68f163e1f04d273..6bd5863b0e07d8fa8f8e7ec02010134f488e20a8 100644
--- a/app/workers/namespaces/onboarding_pipeline_created_worker.rb
+++ b/app/workers/onboarding/pipeline_created_worker.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
-module Namespaces
- class OnboardingPipelineCreatedWorker
+module Onboarding
+ class PipelineCreatedWorker
include ApplicationWorker
data_consistency :always
@@ -22,3 +22,6 @@ def perform(namespace_id)
end
end
end
+
+# remove in %15.6 as per https://gitlab.com/gitlab-org/gitlab/-/issues/372432
+Namespaces::OnboardingPipelineCreatedWorker = Onboarding::PipelineCreatedWorker
diff --git a/app/workers/namespaces/onboarding_progress_worker.rb b/app/workers/onboarding/progress_worker.rb
similarity index 72%
rename from app/workers/namespaces/onboarding_progress_worker.rb
rename to app/workers/onboarding/progress_worker.rb
index 4962942845962773f8141e1627164bf361ae8a34..525934c4a7c474176c95572b07e8a886d9eeb9c6 100644
--- a/app/workers/namespaces/onboarding_progress_worker.rb
+++ b/app/workers/onboarding/progress_worker.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
-module Namespaces
- class OnboardingProgressWorker
+module Onboarding
+ class ProgressWorker
include ApplicationWorker
data_consistency :always
@@ -23,3 +23,6 @@ def perform(namespace_id, action)
end
end
end
+
+# remove in %15.6 as per https://gitlab.com/gitlab-org/gitlab/-/issues/372432
+Namespaces::OnboardingProgressWorker = Onboarding::ProgressWorker
diff --git a/app/workers/namespaces/onboarding_user_added_worker.rb b/app/workers/onboarding/user_added_worker.rb
similarity index 65%
rename from app/workers/namespaces/onboarding_user_added_worker.rb
rename to app/workers/onboarding/user_added_worker.rb
index a1b349eedd3a70ad93fc8fbdc8ca7e93262b73f8..38e9cd063eabdcd8e98547865dd0c82adc5cc172 100644
--- a/app/workers/namespaces/onboarding_user_added_worker.rb
+++ b/app/workers/onboarding/user_added_worker.rb
@@ -1,7 +1,7 @@
# frozen_string_literal: true
-module Namespaces
- class OnboardingUserAddedWorker
+module Onboarding
+ class UserAddedWorker
include ApplicationWorker
data_consistency :always
@@ -19,3 +19,6 @@ def perform(namespace_id)
end
end
end
+
+# remove in %15.6 as per https://gitlab.com/gitlab-org/gitlab/-/issues/372432
+Namespaces::OnboardingUserAddedWorker = Onboarding::UserAddedWorker
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 4527efe5a1cfd4499e6f2ed2a1aae124638074e7..49109ec7142724dff746bb06f80a041c0bd87825 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -319,14 +319,6 @@
- 1
- - migrate_external_diffs
- 1
-- - namespaces_onboarding_issue_created
- - 1
-- - namespaces_onboarding_pipeline_created
- - 1
-- - namespaces_onboarding_progress
- - 1
-- - namespaces_onboarding_user_added
- - 1
- - namespaces_process_sync_events
- 1
- - namespaces_sync_namespace_name
@@ -347,6 +339,14 @@
- 1
- - onboarding_create_learn_gitlab
- 1
+- - onboarding_issue_created
+ - 1
+- - onboarding_pipeline_created
+ - 1
+- - onboarding_progress
+ - 1
+- - onboarding_user_added
+ - 1
- - package_cleanup
- 1
- - package_repositories
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index c2e80316d268f639a48273b9a28936798f120388..f6030c513364c728589ef4cb1829696c9cc0a4fe 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -423,7 +423,7 @@ def previous_commit_sha_from_ref(ref)
expect(response.message).to eq('Missing CI config file')
expect(response.payload).not_to be_persisted
expect(Ci::Pipeline.count).to eq(0)
- expect(Namespaces::OnboardingPipelineCreatedWorker).not_to receive(:perform_async)
+ expect(Onboarding::PipelineCreatedWorker).not_to receive(:perform_async)
end
shared_examples 'a failed pipeline' do
@@ -1547,7 +1547,7 @@ def previous_commit_sha_from_ref(ref)
end
it 'schedules a namespace onboarding create action worker' do
- expect(Namespaces::OnboardingPipelineCreatedWorker)
+ expect(Onboarding::PipelineCreatedWorker)
.to receive(:perform_async).with(project.namespace_id)
pipeline
diff --git a/spec/services/issues/create_service_spec.rb b/spec/services/issues/create_service_spec.rb
index b2b7de338da0400d2d7ad3c2fb0eeac07bd998d8..04f603ad7de3314b7bed45017e762fdfee25bf78 100644
--- a/spec/services/issues/create_service_spec.rb
+++ b/spec/services/issues/create_service_spec.rb
@@ -399,7 +399,7 @@
end
it 'schedules a namespace onboarding create action worker' do
- expect(Namespaces::OnboardingIssueCreatedWorker).to receive(:perform_async).with(project.namespace.id)
+ expect(Onboarding::IssueCreatedWorker).to receive(:perform_async).with(project.namespace.id)
issue
end
diff --git a/spec/services/onboarding/progress_service_spec.rb b/spec/services/onboarding/progress_service_spec.rb
index e9b8ea2e859ec4e4229528202884fab06b958546..8f3f723613e4d8456a62fbb60c195a6f9fac5828 100644
--- a/spec/services/onboarding/progress_service_spec.rb
+++ b/spec/services/onboarding/progress_service_spec.rb
@@ -11,7 +11,7 @@
context 'when not onboarded' do
it 'does not schedule a worker' do
- expect(Namespaces::OnboardingProgressWorker).not_to receive(:perform_async)
+ expect(Onboarding::ProgressWorker).not_to receive(:perform_async)
execute_service
end
@@ -28,7 +28,7 @@
end
it 'does not schedule a worker' do
- expect(Namespaces::OnboardingProgressWorker).not_to receive(:perform_async)
+ expect(Onboarding::ProgressWorker).not_to receive(:perform_async)
execute_service
end
@@ -36,7 +36,7 @@
context 'when action is not yet completed' do
it 'schedules a worker' do
- expect(Namespaces::OnboardingProgressWorker).to receive(:perform_async)
+ expect(Onboarding::ProgressWorker).to receive(:perform_async)
execute_service
end
diff --git a/spec/workers/every_sidekiq_worker_spec.rb b/spec/workers/every_sidekiq_worker_spec.rb
index 6b67c2b474c9b7dfc78ffa664e0144639683f645..708f937dea3deaa11278993feeee4adc4a89c85b 100644
--- a/spec/workers/every_sidekiq_worker_spec.rb
+++ b/spec/workers/every_sidekiq_worker_spec.rb
@@ -344,10 +344,10 @@
'Metrics::Dashboard::PruneOldAnnotationsWorker' => 3,
'Metrics::Dashboard::SyncDashboardsWorker' => 3,
'MigrateExternalDiffsWorker' => 3,
- 'Namespaces::OnboardingIssueCreatedWorker' => 3,
- 'Namespaces::OnboardingPipelineCreatedWorker' => 3,
- 'Namespaces::OnboardingProgressWorker' => 3,
- 'Namespaces::OnboardingUserAddedWorker' => 3,
+ 'Onboarding::IssueCreatedWorker' => 3,
+ 'Onboarding::PipelineCreatedWorker' => 3,
+ 'Onboarding::ProgressWorker' => 3,
+ 'Onboarding::UserAddedWorker' => 3,
'Namespaces::RefreshRootStatisticsWorker' => 3,
'Namespaces::RootStatisticsWorker' => 3,
'Namespaces::ScheduleAggregationWorker' => 3,
diff --git a/spec/workers/namespaces/onboarding_issue_created_worker_spec.rb b/spec/workers/onboarding/issue_created_worker_spec.rb
similarity index 90%
rename from spec/workers/namespaces/onboarding_issue_created_worker_spec.rb
rename to spec/workers/onboarding/issue_created_worker_spec.rb
index 0a896d864b73ca988be50a6704062181bd8510c6..70a0156d44493d792c3aa58583d76b5ec02c1928 100644
--- a/spec/workers/namespaces/onboarding_issue_created_worker_spec.rb
+++ b/spec/workers/onboarding/issue_created_worker_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe Namespaces::OnboardingIssueCreatedWorker, '#perform' do
+RSpec.describe Onboarding::IssueCreatedWorker, '#perform' do
let_it_be(:issue) { create(:issue) }
let(:namespace) { issue.project.namespace }
diff --git a/spec/workers/namespaces/onboarding_pipeline_created_worker_spec.rb b/spec/workers/onboarding/pipeline_created_worker_spec.rb
similarity index 85%
rename from spec/workers/namespaces/onboarding_pipeline_created_worker_spec.rb
rename to spec/workers/onboarding/pipeline_created_worker_spec.rb
index 6d69ccb50bdff3e821012516ecb04832fa2d242b..75bdea28eefa5df5cecc777680560573f2b29ef7 100644
--- a/spec/workers/namespaces/onboarding_pipeline_created_worker_spec.rb
+++ b/spec/workers/onboarding/pipeline_created_worker_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe Namespaces::OnboardingPipelineCreatedWorker, '#perform' do
+RSpec.describe Onboarding::PipelineCreatedWorker, '#perform' do
let_it_be(:ci_pipeline) { create(:ci_pipeline) }
it_behaves_like 'records an onboarding progress action', :pipeline_created do
diff --git a/spec/workers/namespaces/onboarding_progress_worker_spec.rb b/spec/workers/onboarding/progress_worker_spec.rb
similarity index 90%
rename from spec/workers/namespaces/onboarding_progress_worker_spec.rb
rename to spec/workers/onboarding/progress_worker_spec.rb
index 76ac078ddcf07a26512b41e5e7e37fad537b9bdf..bbf4875069ea3fd453e9b1f600cc107ad7744d80 100644
--- a/spec/workers/namespaces/onboarding_progress_worker_spec.rb
+++ b/spec/workers/onboarding/progress_worker_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe Namespaces::OnboardingProgressWorker, '#perform' do
+RSpec.describe Onboarding::ProgressWorker, '#perform' do
let_it_be(:namespace) { create(:namespace) }
let_it_be(:action) { 'git_pull' }
diff --git a/spec/workers/namespaces/onboarding_user_added_worker_spec.rb b/spec/workers/onboarding/user_added_worker_spec.rb
similarity index 77%
rename from spec/workers/namespaces/onboarding_user_added_worker_spec.rb
rename to spec/workers/onboarding/user_added_worker_spec.rb
index 14428c0ecb8dc2903dc703fcc75aa85fc1c9573c..6dbd875c93b535045f6d1cb9b95761c1b1e2fe34 100644
--- a/spec/workers/namespaces/onboarding_user_added_worker_spec.rb
+++ b/spec/workers/onboarding/user_added_worker_spec.rb
@@ -2,7 +2,7 @@
require 'spec_helper'
-RSpec.describe Namespaces::OnboardingUserAddedWorker, '#perform' do
+RSpec.describe Onboarding::UserAddedWorker, '#perform' do
let_it_be(:namespace) { create(:group) }
subject { described_class.new.perform(namespace.id) }