Add latest changes from gitlab-org/gitlab@master

9 files changed, 14 insertions, 14 deletions

diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index 1b241836da3..8ca02a6a1d0 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -496,8 +496,8 @@ Layout/LineLength:
     - 'app/services/environments/schedule_to_delete_review_apps_service.rb'
     - 'app/services/feature_flags/update_service.rb'
     - 'app/services/git/process_ref_changes_service.rb'
-    - 'app/services/google_cloud/create_service_accounts_service.rb'
-    - 'app/services/google_cloud/generate_pipeline_service.rb'
+    - 'app/services/cloud_seed/google_cloud/create_service_accounts_service.rb'
+    - 'app/services/cloud_seed/google_cloud/generate_pipeline_service.rb'
     - 'app/services/groups/create_service.rb'
     - 'app/services/groups/destroy_service.rb'
     - 'app/services/groups/transfer_service.rb'
@@ -4457,9 +4457,9 @@ Layout/LineLength:
     - 'spec/services/files/update_service_spec.rb'
     - 'spec/services/git/branch_hooks_service_spec.rb'
     - 'spec/services/git/branch_push_service_spec.rb'
-    - 'spec/services/google_cloud/enable_cloud_run_service_spec.rb'
-    - 'spec/services/google_cloud/gcp_region_add_or_replace_service_spec.rb'
-    - 'spec/services/google_cloud/service_accounts_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/enable_cloud_run_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/gcp_region_add_or_replace_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/service_accounts_service_spec.rb'
     - 'spec/services/groups/autocomplete_service_spec.rb'
     - 'spec/services/groups/transfer_service_spec.rb'
     - 'spec/services/groups/update_service_spec.rb'
diff --git a/.rubocop_todo/lint/symbol_conversion.yml b/.rubocop_todo/lint/symbol_conversion.yml
index eae5c89eef7..893e457ddff 100644
--- a/.rubocop_todo/lint/symbol_conversion.yml
+++ b/.rubocop_todo/lint/symbol_conversion.yml
@@ -5,7 +5,7 @@ Lint/SymbolConversion:
     - 'app/helpers/breadcrumbs_helper.rb'
     - 'app/helpers/environments_helper.rb'
     - 'app/helpers/tooling/visual_review_helper.rb'
-    - 'app/services/google_cloud/create_cloudsql_instance_service.rb'
+    - 'app/services/cloud_seed/google_cloud/create_cloudsql_instance_service.rb'
     - 'config/puma.rb'
     - 'ee/app/components/billing/plan_component.rb'
     - 'ee/app/controllers/projects/security/scanned_resources_controller.rb'
diff --git a/.rubocop_todo/naming/heredoc_delimiter_naming.yml b/.rubocop_todo/naming/heredoc_delimiter_naming.yml
index 92f5994092b..50f359fa448 100644
--- a/.rubocop_todo/naming/heredoc_delimiter_naming.yml
+++ b/.rubocop_todo/naming/heredoc_delimiter_naming.yml
@@ -105,7 +105,7 @@ Naming/HeredocDelimiterNaming:
     - 'spec/services/ci/create_web_ide_terminal_service_spec.rb'
     - 'spec/services/ci/parse_dotenv_artifact_service_spec.rb'
     - 'spec/services/ci/pipeline_processing/atomic_processing_service_spec.rb'
-    - 'spec/services/google_cloud/generate_pipeline_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/generate_pipeline_service_spec.rb'
     - 'spec/services/task_list_toggle_service_spec.rb'
     - 'spec/support/helpers/repo_helpers.rb'
     - 'spec/support/helpers/seed_repo.rb'
diff --git a/.rubocop_todo/performance/map_compact.yml b/.rubocop_todo/performance/map_compact.yml
index 22cefbab067..576a610006e 100644
--- a/.rubocop_todo/performance/map_compact.yml
+++ b/.rubocop_todo/performance/map_compact.yml
@@ -31,7 +31,7 @@ Performance/MapCompact:
     - 'app/services/events/render_service.rb'
     - 'app/services/feature_flags/update_service.rb'
     - 'app/services/git/base_hooks_service.rb'
-    - 'app/services/google_cloud/fetch_google_ip_list_service.rb'
+    - 'app/services/cloud_seed/google_cloud/fetch_google_ip_list_service.rb'
     - 'app/services/jira_import/start_import_service.rb'
     - 'app/services/jira_import/users_mapper_service.rb'
     - 'app/services/labels/available_labels_service.rb'
diff --git a/.rubocop_todo/rspec/before_all_role_assignment.yml b/.rubocop_todo/rspec/before_all_role_assignment.yml
index 8e1a2a28f1f..d1078cf4735 100644
--- a/.rubocop_todo/rspec/before_all_role_assignment.yml
+++ b/.rubocop_todo/rspec/before_all_role_assignment.yml
@@ -1402,7 +1402,7 @@ RSpec/BeforeAllRoleAssignment:
     - 'spec/services/environments/schedule_to_delete_review_apps_service_spec.rb'
     - 'spec/services/files/base_service_spec.rb'
     - 'spec/services/git/branch_push_service_spec.rb'
-    - 'spec/services/google_cloud/generate_pipeline_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/generate_pipeline_service_spec.rb'
     - 'spec/services/groups/auto_devops_service_spec.rb'
     - 'spec/services/groups/autocomplete_service_spec.rb'
     - 'spec/services/groups/group_links/create_service_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index de893e11a73..fa8f44aeb9f 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -2558,7 +2558,7 @@ RSpec/ContextWording:
     - 'spec/services/git/tag_push_service_spec.rb'
     - 'spec/services/git/wiki_push_service/change_spec.rb'
     - 'spec/services/git/wiki_push_service_spec.rb'
-    - 'spec/services/google_cloud/generate_pipeline_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/generate_pipeline_service_spec.rb'
     - 'spec/services/gpg_keys/create_service_spec.rb'
     - 'spec/services/groups/deploy_tokens/revoke_service_spec.rb'
     - 'spec/services/groups/destroy_service_spec.rb'
diff --git a/.rubocop_todo/rspec/named_subject.yml b/.rubocop_todo/rspec/named_subject.yml
index 58076addbcf..ab6ddc4c89a 100644
--- a/.rubocop_todo/rspec/named_subject.yml
+++ b/.rubocop_todo/rspec/named_subject.yml
@@ -3269,8 +3269,8 @@ RSpec/NamedSubject:
     - 'spec/services/git/process_ref_changes_service_spec.rb'
     - 'spec/services/git/tag_push_service_spec.rb'
     - 'spec/services/git/wiki_push_service_spec.rb'
-    - 'spec/services/google_cloud/fetch_google_ip_list_service_spec.rb'
-    - 'spec/services/google_cloud/setup_cloudsql_instance_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/fetch_google_ip_list_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/setup_cloudsql_instance_service_spec.rb'
     - 'spec/services/gpg_keys/create_service_spec.rb'
     - 'spec/services/gpg_keys/destroy_service_spec.rb'
     - 'spec/services/groups/autocomplete_service_spec.rb'
diff --git a/.rubocop_todo/style/if_unless_modifier.yml b/.rubocop_todo/style/if_unless_modifier.yml
index db8f6d8d851..c99e96f3e55 100644
--- a/.rubocop_todo/style/if_unless_modifier.yml
+++ b/.rubocop_todo/style/if_unless_modifier.yml
@@ -245,7 +245,7 @@ Style/IfUnlessModifier:
     - 'app/services/environments/canary_ingress/update_service.rb'
     - 'app/services/environments/reset_auto_stop_service.rb'
     - 'app/services/git/process_ref_changes_service.rb'
-    - 'app/services/google_cloud/generate_pipeline_service.rb'
+    - 'app/services/cloud_seed/google_cloud/generate_pipeline_service.rb'
     - 'app/services/groups/create_service.rb'
     - 'app/services/groups/transfer_service.rb'
     - 'app/services/groups/update_statistics_service.rb'
diff --git a/.rubocop_todo/style/inline_disable_annotation.yml b/.rubocop_todo/style/inline_disable_annotation.yml
index 473378c24fb..6c2c802d516 100644
--- a/.rubocop_todo/style/inline_disable_annotation.yml
+++ b/.rubocop_todo/style/inline_disable_annotation.yml
@@ -3126,7 +3126,7 @@ Style/InlineDisableAnnotation:
     - 'spec/services/ci/pipeline_schedules/calculate_next_run_service_spec.rb'
     - 'spec/services/draft_notes/destroy_service_spec.rb'
     - 'spec/services/event_create_service_spec.rb'
-    - 'spec/services/google_cloud/enable_cloudsql_service_spec.rb'
+    - 'spec/services/cloud_seed/google_cloud/enable_cloudsql_service_spec.rb'
     - 'spec/services/import/gitlab_projects/file_acquisition_strategies/remote_file_spec.rb'
     - 'spec/services/merge_requests/create_service_spec.rb'
     - 'spec/services/merge_requests/delete_non_latest_diffs_service_spec.rb'