Add latest changes from gitlab-org/gitlab@master

6 files changed, 58 insertions, 8 deletions

diff --git a/db/docs/dast_profile_schedules.yml b/db/docs/dast_profile_schedules.yml
index b7846b6d798..5c2b07e4fae 100644
--- a/db/docs/dast_profile_schedules.yml
+++ b/db/docs/dast_profile_schedules.yml
@@ -7,4 +7,12 @@ feature_categories:
 description: Scheduling for scans using DAST Profiles
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65327
 milestone: '14.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects
diff --git a/db/docs/dast_profiles.yml b/db/docs/dast_profiles.yml
index a7999915039..9c951e67bb7 100644
--- a/db/docs/dast_profiles.yml
+++ b/db/docs/dast_profiles.yml
@@ -7,4 +7,12 @@ feature_categories:
 description: Profile used to run a DAST on-demand scan
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/51296
 milestone: '13.9'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects
diff --git a/db/docs/dast_scanner_profiles.yml b/db/docs/dast_scanner_profiles.yml
index 8d69bef4b60..f079debaf02 100644
--- a/db/docs/dast_scanner_profiles.yml
+++ b/db/docs/dast_scanner_profiles.yml
@@ -4,7 +4,16 @@ classes:
 - DastScannerProfile
 feature_categories:
 - dynamic_application_security_testing
-description: A scanner profile defines the scanner settings used to run an on-demand scan
+description: A scanner profile defines the scanner settings used to run an on-demand
+  scan
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/37404
 milestone: '13.3'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects
diff --git a/db/docs/dast_site_profiles.yml b/db/docs/dast_site_profiles.yml
index e9542426cd7..b48b2a3ad7c 100644
--- a/db/docs/dast_site_profiles.yml
+++ b/db/docs/dast_site_profiles.yml
@@ -4,7 +4,16 @@ classes:
 - DastSiteProfile
 feature_categories:
 - dynamic_application_security_testing
-description: A site profile describes the attributes of a web site to scan on demand with DAST
+description: A site profile describes the attributes of a web site to scan on demand
+  with DAST
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36659
 milestone: '13.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects
diff --git a/db/docs/dast_site_tokens.yml b/db/docs/dast_site_tokens.yml
index c96c76c9ded..38f117d8070 100644
--- a/db/docs/dast_site_tokens.yml
+++ b/db/docs/dast_site_tokens.yml
@@ -7,4 +7,12 @@ feature_categories:
 description: Token for the site to be validated
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41639
 milestone: '13.4'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects
diff --git a/db/docs/dast_sites.yml b/db/docs/dast_sites.yml
index 8e0faf2217e..0e1cb6b755f 100644
--- a/db/docs/dast_sites.yml
+++ b/db/docs/dast_sites.yml
@@ -7,4 +7,12 @@ feature_categories:
 description: Site to run dast scan on
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36659
 milestone: '13.2'
-gitlab_schema: gitlab_main
+gitlab_schema: gitlab_main_cell
+allow_cross_joins:
+- gitlab_main_clusterwide
+allow_cross_transactions:
+- gitlab_main_clusterwide
+allow_cross_foreign_keys:
+- gitlab_main_clusterwide
+sharding_key:
+  project_id: projects