Add latest changes from gitlab-org/gitlab@master

6 files changed, 14 insertions, 11 deletions

diff --git a/.rubocop_todo/gitlab/strong_memoize_attr.yml b/.rubocop_todo/gitlab/strong_memoize_attr.yml
index 06efefef2f1..f05e7ba35af 100644
--- a/.rubocop_todo/gitlab/strong_memoize_attr.yml
+++ b/.rubocop_todo/gitlab/strong_memoize_attr.yml
@@ -180,7 +180,7 @@ Gitlab/StrongMemoizeAttr:
     - 'app/services/ci/pipelines/hook_service.rb'
     - 'app/services/ci/queue/build_queue_service.rb'
     - 'app/services/ci/update_build_state_service.rb'
-    - 'app/services/clusters/agents/refresh_authorization_service.rb'
+    - 'app/services/clusters/agents/authorizations/ci_access/refresh_service.rb'
     - 'app/services/clusters/integrations/prometheus_health_check_service.rb'
     - 'app/services/concerns/alert_management/alert_processing.rb'
     - 'app/services/concerns/incident_management/settings.rb'
diff --git a/.rubocop_todo/layout/line_length.yml b/.rubocop_todo/layout/line_length.yml
index a59997afc55..9f11c94f242 100644
--- a/.rubocop_todo/layout/line_length.yml
+++ b/.rubocop_todo/layout/line_length.yml
@@ -105,7 +105,7 @@ Layout/LineLength:
     - 'app/controllers/users_controller.rb'
     - 'app/finders/analytics/cycle_analytics/stage_finder.rb'
     - 'app/finders/ci/runners_finder.rb'
-    - 'app/finders/clusters/agent_authorizations_finder.rb'
+    - 'app/finders/clusters/agents/authorizations/ci_access/finder.rb'
     - 'app/finders/group_descendants_finder.rb'
     - 'app/finders/group_members_finder.rb'
     - 'app/finders/group_projects_finder.rb'
@@ -507,6 +507,7 @@ Layout/LineLength:
     - 'app/services/ci/runners/register_runner_service.rb'
     - 'app/services/ci/runners/unregister_runner_service.rb'
     - 'app/services/clusters/agent_tokens/create_service.rb'
+    - 'app/services/clusters/agents/authorizations/ci_access/refresh_service.rb'
     - 'app/services/clusters/agents/delete_service.rb'
     - 'app/services/clusters/build_kubernetes_namespace_service.rb'
     - 'app/services/clusters/integrations/create_service.rb'
@@ -2038,7 +2039,7 @@ Layout/LineLength:
     - 'ee/spec/models/ci/minutes/namespace_monthly_usage_spec.rb'
     - 'ee/spec/models/ci/minutes/project_monthly_usage_spec.rb'
     - 'ee/spec/models/ci/pipeline_spec.rb'
-    - 'ee/spec/models/concerns/ee/clusters/agents/authorization_config_scopes_spec.rb'
+    - 'ee/spec/models/concerns/ee/clusters/agents/authorizations/ci_access/config_scopes_spec.rb'
     - 'ee/spec/models/concerns/ee/issuable_spec.rb'
     - 'ee/spec/models/concerns/ee/noteable_spec.rb'
     - 'ee/spec/models/concerns/ee/project_security_scanners_information_spec.rb'
@@ -3516,6 +3517,8 @@ Layout/LineLength:
     - 'spec/factories/ci/job_artifacts.rb'
     - 'spec/factories/ci/pipelines.rb'
     - 'spec/factories/ci/reports/codequality_degradations.rb'
+    - 'spec/factories/clusters/agents/authorizations/ci_access/group_authorizations.rb'
+    - 'spec/factories/clusters/agents/authorizations/ci_access/project_authorizations.rb'
     - 'spec/factories/container_repositories.rb'
     - 'spec/factories/dependency_proxy.rb'
     - 'spec/factories/deployments.rb'
@@ -3744,6 +3747,7 @@ Layout/LineLength:
     - 'spec/finders/ci/pipelines_finder_spec.rb'
     - 'spec/finders/ci/pipelines_for_merge_request_finder_spec.rb'
     - 'spec/finders/ci/runners_finder_spec.rb'
+    - 'spec/finders/clusters/agents/authorizations/ci_access/finder_spec.rb'
     - 'spec/finders/clusters/agent_authorizations_finder_spec.rb'
     - 'spec/finders/clusters_finder_spec.rb'
     - 'spec/finders/deploy_tokens/tokens_finder_spec.rb'
@@ -4570,7 +4574,7 @@ Layout/LineLength:
     - 'spec/models/concerns/cache_markdown_field_spec.rb'
     - 'spec/models/concerns/cacheable_attributes_spec.rb'
     - 'spec/models/concerns/ci/artifactable_spec.rb'
-    - 'spec/models/concerns/clusters/agents/authorization_config_scopes_spec.rb'
+    - 'spec/models/concerns/clusters/agents/authorizations/ci_access/config_scopes_spec.rb'
     - 'spec/models/concerns/deployment_platform_spec.rb'
     - 'spec/models/concerns/group_descendant_spec.rb'
     - 'spec/models/concerns/id_in_ordered_spec.rb'
@@ -5020,6 +5024,7 @@ Layout/LineLength:
     - 'spec/services/ci/test_failure_history_service_spec.rb'
     - 'spec/services/ci/unlock_artifacts_service_spec.rb'
     - 'spec/services/ci/update_pending_build_service_spec.rb'
+    - 'spec/services/clusters/agents/authorizations/ci_access/filter_service_spec.rb'
     - 'spec/services/clusters/create_service_spec.rb'
     - 'spec/services/clusters/integrations/prometheus_health_check_service_spec.rb'
     - 'spec/services/clusters/kubernetes/create_or_update_namespace_service_spec.rb'
diff --git a/.rubocop_todo/rspec/context_wording.yml b/.rubocop_todo/rspec/context_wording.yml
index 63b24a04c56..a7ec2fcd55a 100644
--- a/.rubocop_todo/rspec/context_wording.yml
+++ b/.rubocop_todo/rspec/context_wording.yml
@@ -181,7 +181,7 @@ RSpec/ContextWording:
     - 'ee/spec/finders/dast_site_profiles_finder_spec.rb'
     - 'ee/spec/finders/dast_site_validations_finder_spec.rb'
     - 'ee/spec/finders/ee/alert_management/http_integrations_finder_spec.rb'
-    - 'ee/spec/finders/ee/clusters/agent_authorizations_finder_spec.rb'
+    - 'ee/spec/finders/ee/clusters/agents/authorizations/ci_access/finder_spec.rb'
     - 'ee/spec/finders/ee/clusters/agents_finder_spec.rb'
     - 'ee/spec/finders/ee/group_members_finder_spec.rb'
     - 'ee/spec/finders/ee/namespaces/projects_finder_spec.rb'
@@ -1343,6 +1343,7 @@ RSpec/ContextWording:
     - 'spec/finders/ci/pipelines_finder_spec.rb'
     - 'spec/finders/ci/runners_finder_spec.rb'
     - 'spec/finders/cluster_ancestors_finder_spec.rb'
+    - 'spec/finders/clusters/agents/authorizations/ci_access/finder_spec.rb'
     - 'spec/finders/clusters/agent_authorizations_finder_spec.rb'
     - 'spec/finders/clusters/agents_finder_spec.rb'
     - 'spec/finders/clusters/kubernetes_namespace_finder_spec.rb'
@@ -1528,7 +1529,7 @@ RSpec/ContextWording:
     - 'spec/initializers/validate_database_config_spec.rb'
     - 'spec/lib/api/entities/application_setting_spec.rb'
     - 'spec/lib/api/entities/basic_project_details_spec.rb'
-    - 'spec/lib/api/entities/clusters/agent_authorization_spec.rb'
+    - 'spec/lib/api/entities/clusters/agents/authorizations/ci_access_spec.rb'
     - 'spec/lib/api/entities/nuget/dependency_group_spec.rb'
     - 'spec/lib/api/entities/user_spec.rb'
     - 'spec/lib/api/every_api_endpoint_spec.rb'
@@ -2685,7 +2686,7 @@ RSpec/ContextWording:
     - 'spec/services/ci/update_pending_build_service_spec.rb'
     - 'spec/services/clusters/agent_tokens/track_usage_service_spec.rb'
     - 'spec/services/clusters/agents/delete_expired_events_service_spec.rb'
-    - 'spec/services/clusters/agents/refresh_authorization_service_spec.rb'
+    - 'spec/services/clusters/agents/authorizations/ci_access/refresh_service_spec.rb'
     - 'spec/services/clusters/build_kubernetes_namespace_service_spec.rb'
     - 'spec/services/clusters/create_service_spec.rb'
     - 'spec/services/clusters/kubernetes/create_or_update_namespace_service_spec.rb'
diff --git a/.rubocop_todo/rspec/missing_feature_category.yml b/.rubocop_todo/rspec/missing_feature_category.yml
index 5790af0ac12..c4b8c206433 100644
--- a/.rubocop_todo/rspec/missing_feature_category.yml
+++ b/.rubocop_todo/rspec/missing_feature_category.yml
@@ -4544,7 +4544,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/lib/gitlab/slash_commands/presenters/issue_show_spec.rb'
     - 'spec/lib/gitlab/slash_commands/presenters/run_spec.rb'
     - 'spec/lib/gitlab/slash_commands/run_spec.rb'
-    - 'spec/lib/gitlab/slug/environment_spec.rb'
     - 'spec/lib/gitlab/snippet_search_results_spec.rb'
     - 'spec/lib/gitlab/sourcegraph_spec.rb'
     - 'spec/lib/gitlab/spamcheck/client_spec.rb'
@@ -5239,7 +5238,6 @@ RSpec/MissingFeatureCategory:
     - 'spec/models/namespaces/user_namespace_spec.rb'
     - 'spec/models/network/graph_spec.rb'
     - 'spec/models/note_diff_file_spec.rb'
-    - 'spec/models/note_spec.rb'
     - 'spec/models/notification_setting_spec.rb'
     - 'spec/models/oauth_access_grant_spec.rb'
     - 'spec/models/oauth_access_token_spec.rb'
diff --git a/.rubocop_todo/style/percent_literal_delimiters.yml b/.rubocop_todo/style/percent_literal_delimiters.yml
index cd15e2aa858..b3fbf73a75f 100644
--- a/.rubocop_todo/style/percent_literal_delimiters.yml
+++ b/.rubocop_todo/style/percent_literal_delimiters.yml
@@ -54,7 +54,7 @@ Style/PercentLiteralDelimiters:
     - 'app/models/ci/pipeline.rb'
     - 'app/models/clusters/platforms/kubernetes.rb'
     - 'app/models/commit.rb'
-    - 'app/models/concerns/clusters/agents/authorization_config_scopes.rb'
+    - 'app/models/concerns/clusters/agents/authorizations/ci_access/config_scopes.rb'
     - 'app/models/concerns/diff_positionable_note.rb'
     - 'app/models/concerns/enums/prometheus_metric.rb'
     - 'app/models/concerns/issuable.rb'
diff --git a/.rubocop_todo/style/string_concatenation.yml b/.rubocop_todo/style/string_concatenation.yml
index 8e0858e982c..8209781e78a 100644
--- a/.rubocop_todo/style/string_concatenation.yml
+++ b/.rubocop_todo/style/string_concatenation.yml
@@ -121,7 +121,6 @@ Style/StringConcatenation:
     - 'lib/gitlab/route_map.rb'
     - 'lib/gitlab/sanitizers/exception_message.rb'
     - 'lib/gitlab/sidekiq_logging/json_formatter.rb'
-    - 'lib/gitlab/slug/environment.rb'
     - 'lib/gitlab/sql/set_operator.rb'
     - 'lib/gitlab/ssh_public_key.rb'
     - 'lib/gitlab/throttle.rb'