From d8877c12347443fa02e0ba53ad8d5cd318f6fa28 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 11 Jan 2024 15:09:58 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .rubocop_todo/layout/line_length.yml | 10 +- .rubocop_todo/lint/symbol_conversion.yml | 2 +- .../naming/heredoc_delimiter_naming.yml | 2 +- .rubocop_todo/performance/map_compact.yml | 2 +- .../rspec/before_all_role_assignment.yml | 2 +- .rubocop_todo/rspec/context_wording.yml | 2 +- .rubocop_todo/rspec/named_subject.yml | 4 +- .rubocop_todo/style/if_unless_modifier.yml | 2 +- .../style/inline_disable_annotation.yml | 2 +- .../components/workload_details.vue | 2 +- .../components/workload_layout.vue | 14 +- .../components/workload_table.vue | 9 +- .../kubernetes_dashboard/constants.js | 5 +- .../releases/components/app_edit_new.vue | 3 +- .../releases/components/tag_field_new.vue | 3 + .../stores/modules/edit_new/actions.js | 15 +- .../stores/modules/edit_new/getters.js | 12 +- .../releases/stores/modules/edit_new/state.js | 1 + .../google_cloud/configuration_controller.rb | 2 +- .../google_cloud/databases_controller.rb | 6 +- .../google_cloud/deployments_controller.rb | 6 +- .../google_cloud/gcp_regions_controller.rb | 2 +- .../service_accounts_controller.rb | 2 +- app/models/application_setting.rb | 240 ++++++------------ app/models/ci/pipeline_config.rb | 4 + .../concerns/ci/partitionable/testing.rb | 1 + app/models/group.rb | 6 +- app/models/member.rb | 5 +- .../cloud_seed/google_cloud/base_service.rb | 67 +++++ .../create_cloudsql_instance_service.rb | 80 ++++++ .../create_service_accounts_service.rb | 42 +++ .../google_cloud/enable_cloud_run_service.rb | 23 ++ .../google_cloud/enable_cloudsql_service.rb | 27 ++ .../google_cloud/enable_vision_ai_service.rb | 21 ++ .../fetch_google_ip_list_service.rb | 93 +++++++ .../gcp_region_add_or_replace_service.rb | 25 ++ .../google_cloud/generate_pipeline_service.rb | 100 ++++++++ .../get_cloudsql_instances_service.rb | 20 ++ .../google_cloud/service_accounts_service.rb | 53 ++++ .../setup_cloudsql_instance_service.rb | 120 +++++++++ app/services/google_cloud/base_service.rb | 65 ----- .../create_cloudsql_instance_service.rb | 78 ------ .../create_service_accounts_service.rb | 40 --- .../google_cloud/enable_cloud_run_service.rb | 21 -- .../google_cloud/enable_cloudsql_service.rb | 25 -- .../google_cloud/enable_vision_ai_service.rb | 19 -- .../fetch_google_ip_list_service.rb | 91 ------- .../gcp_region_add_or_replace_service.rb | 23 -- .../google_cloud/generate_pipeline_service.rb | 98 ------- .../get_cloudsql_instances_service.rb | 18 -- .../google_cloud/service_accounts_service.rb | 51 ---- .../setup_cloudsql_instance_service.rb | 118 --------- .../create_cloudsql_instance_worker.rb | 2 +- .../fetch_google_ip_list_worker.rb | 2 +- ...6-8-deprecate-pg_schema-backup-setting.yml | 14 + ...ckfill_partition_id_ci_pipeline_config.yml | 9 + ...839_add_partition_id_to_pipeline_config.rb | 10 + ...ackfill_partition_id_ci_pipeline_config.rb | 26 ++ ...e_index_removal_ci_build_trace_metadata.rb | 18 ++ ...2_drop_index_from_ci_job_artifact_state.rb | 17 ++ ...10_remove_fk_from_ci_job_artifact_state.rb | 36 +++ db/schema_migrations/20240109145839 | 1 + db/schema_migrations/20240110090352 | 1 + db/schema_migrations/20240110093654 | 1 + db/schema_migrations/20240110094002 | 1 + db/schema_migrations/20240110094510 | 1 + db/structure.sql | 8 +- .../cells/impacted_features/git-access.md | 37 ++- .../ci_insights.md | 154 +++++++++++ .../img/current_page.png | Bin 0 -> 132200 bytes .../ci_builds_runner_fleet_metrics/index.md | 4 + doc/ci/yaml/index.md | 6 +- doc/update/background_migrations.md | 207 +-------------- .../background_migrations_troubleshooting.md | 210 +++++++++++++++ doc/update/deprecations.md | 19 ++ doc/update/versions/gitlab_14_changes.md | 2 +- .../dependency_scanning/index.md | 35 +-- .../merge_requests/approvals/settings.md | 5 +- ...ackfill_partition_id_ci_pipeline_config.rb | 37 +++ .../importer/replay_events_importer.rb | 4 +- locale/gitlab.pot | 23 +- spec/db/schema_spec.rb | 1 + spec/factories/ci/pipeline_config.rb | 8 + .../__snapshots__/list_spec.js.snap | 2 +- .../custom_emoji/components/list_spec.js | 3 + .../emoji/components/emoji_group_spec.js | 1 + .../components/workload_table_spec.js | 11 +- .../package_list_row_spec.js.snap | 8 +- .../components/list/package_list_row_spec.js | 2 + .../releases/components/app_edit_new_spec.js | 19 ++ .../stores/modules/detail/actions_spec.js | 52 ++++ .../stores/modules/detail/getters_spec.js | 15 +- ...ll_partition_id_ci_pipeline_config_spec.rb | 73 ++++++ .../importer/replay_events_importer_spec.rb | 87 +++++-- ...ll_partition_id_ci_pipeline_config_spec.rb | 56 ++++ spec/models/ci/pipeline_config_spec.rb | 17 +- spec/models/group_spec.rb | 10 +- .../google_cloud/databases_controller_spec.rb | 8 +- .../deployments_controller_spec.rb | 10 +- .../create_cloudsql_instance_service_spec.rb | 2 +- .../create_service_accounts_service_spec.rb | 2 +- .../enable_cloud_run_service_spec.rb | 2 +- .../enable_cloudsql_service_spec.rb | 2 +- .../enable_vision_ai_service_spec.rb | 2 +- .../fetch_google_ip_list_service_spec.rb | 2 +- .../gcp_region_add_or_replace_service_spec.rb | 2 +- .../generate_pipeline_service_spec.rb | 22 +- .../get_cloudsql_instances_service_spec.rb | 2 +- .../service_accounts_service_spec.rb | 2 +- .../setup_cloudsql_instance_service_spec.rb | 2 +- .../helpers/database/duplicate_indexes.yml | 3 - .../models/member_shared_examples.rb | 32 ++- .../object_storage/cdn/google_cdn_spec.rb | 2 +- .../create_cloudsql_instance_worker_spec.rb | 8 +- .../fetch_google_ip_list_worker_spec.rb | 2 +- 115 files changed, 1858 insertions(+), 1188 deletions(-) create mode 100644 app/services/cloud_seed/google_cloud/base_service.rb create mode 100644 app/services/cloud_seed/google_cloud/create_cloudsql_instance_service.rb create mode 100644 app/services/cloud_seed/google_cloud/create_service_accounts_service.rb create mode 100644 app/services/cloud_seed/google_cloud/enable_cloud_run_service.rb create mode 100644 app/services/cloud_seed/google_cloud/enable_cloudsql_service.rb create mode 100644 app/services/cloud_seed/google_cloud/enable_vision_ai_service.rb create mode 100644 app/services/cloud_seed/google_cloud/fetch_google_ip_list_service.rb create mode 100644 app/services/cloud_seed/google_cloud/gcp_region_add_or_replace_service.rb create mode 100644 app/services/cloud_seed/google_cloud/generate_pipeline_service.rb create mode 100644 app/services/cloud_seed/google_cloud/get_cloudsql_instances_service.rb create mode 100644 app/services/cloud_seed/google_cloud/service_accounts_service.rb create mode 100644 app/services/cloud_seed/google_cloud/setup_cloudsql_instance_service.rb delete mode 100644 app/services/google_cloud/base_service.rb delete mode 100644 app/services/google_cloud/create_cloudsql_instance_service.rb delete mode 100644 app/services/google_cloud/create_service_accounts_service.rb delete mode 100644 app/services/google_cloud/enable_cloud_run_service.rb delete mode 100644 app/services/google_cloud/enable_cloudsql_service.rb delete mode 100644 app/services/google_cloud/enable_vision_ai_service.rb delete mode 100644 app/services/google_cloud/fetch_google_ip_list_service.rb delete mode 100644 app/services/google_cloud/gcp_region_add_or_replace_service.rb delete mode 100644 app/services/google_cloud/generate_pipeline_service.rb delete mode 100644 app/services/google_cloud/get_cloudsql_instances_service.rb delete mode 100644 app/services/google_cloud/service_accounts_service.rb delete mode 100644 app/services/google_cloud/setup_cloudsql_instance_service.rb create mode 100644 data/deprecations/16-8-deprecate-pg_schema-backup-setting.yml create mode 100644 db/docs/batched_background_migrations/backfill_partition_id_ci_pipeline_config.yml create mode 100644 db/migrate/20240109145839_add_partition_id_to_pipeline_config.rb create mode 100644 db/post_migrate/20240110090352_queue_backfill_partition_id_ci_pipeline_config.rb create mode 100644 db/post_migrate/20240110093654_schedule_index_removal_ci_build_trace_metadata.rb create mode 100644 db/post_migrate/20240110094002_drop_index_from_ci_job_artifact_state.rb create mode 100644 db/post_migrate/20240110094510_remove_fk_from_ci_job_artifact_state.rb create mode 100644 db/schema_migrations/20240109145839 create mode 100644 db/schema_migrations/20240110090352 create mode 100644 db/schema_migrations/20240110093654 create mode 100644 db/schema_migrations/20240110094002 create mode 100644 db/schema_migrations/20240110094510 create mode 100644 doc/architecture/blueprints/ci_builds_runner_fleet_metrics/ci_insights.md create mode 100644 doc/architecture/blueprints/ci_builds_runner_fleet_metrics/img/current_page.png create mode 100644 doc/update/background_migrations_troubleshooting.md create mode 100644 lib/gitlab/background_migration/backfill_partition_id_ci_pipeline_config.rb create mode 100644 spec/factories/ci/pipeline_config.rb create mode 100644 spec/lib/gitlab/background_migration/backfill_partition_id_ci_pipeline_config_spec.rb create mode 100644 spec/migrations/20240110090352_queue_backfill_partition_id_ci_pipeline_config_spec.rb rename spec/services/{ => cloud_seed}/google_cloud/create_cloudsql_instance_service_spec.rb (96%) rename spec/services/{ => cloud_seed}/google_cloud/create_service_accounts_service_spec.rb (95%) rename spec/services/{ => cloud_seed}/google_cloud/enable_cloud_run_service_spec.rb (93%) rename spec/services/{ => cloud_seed}/google_cloud/enable_cloudsql_service_spec.rb (97%) rename spec/services/{ => cloud_seed}/google_cloud/enable_vision_ai_service_spec.rb (92%) rename spec/services/{ => cloud_seed}/google_cloud/fetch_google_ip_list_service_spec.rb (95%) rename spec/services/{ => cloud_seed}/google_cloud/gcp_region_add_or_replace_service_spec.rb (88%) rename spec/services/{ => cloud_seed}/google_cloud/generate_pipeline_service_spec.rb (94%) rename spec/services/{ => cloud_seed}/google_cloud/get_cloudsql_instances_service_spec.rb (93%) rename spec/services/{ => cloud_seed}/google_cloud/service_accounts_service_spec.rb (97%) rename spec/services/{ => cloud_seed}/google_cloud/setup_cloudsql_instance_service_spec.rb (98%) 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' diff --git a/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue b/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue index 41fb2527036..bcc0ddf824a 100644 --- a/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue +++ b/app/assets/javascripts/kubernetes_dashboard/components/workload_details.vue @@ -50,7 +50,7 @@ export default {