Skip to content
代码片段 群组 项目
未验证 提交 8fab7c31 编辑于 作者: Tiger Watson's avatar Tiger Watson 提交者: GitLab
浏览文件

Apply 1 suggestion(s) to 1 file(s)

上级 22546706
No related branches found
No related tags found
无相关合并请求
...@@ -110,6 +110,10 @@ def desired_sharding_key ...@@ -110,6 +110,10 @@ def desired_sharding_key
data['desired_sharding_key'] data['desired_sharding_key']
end end
def sharding_key_issue_url
data['sharding_key_issue_url']
end
def exempt_from_sharding? def exempt_from_sharding?
!!data['exempt_from_sharding'] !!data['exempt_from_sharding']
end end
......
...@@ -210,6 +210,21 @@ ...@@ -210,6 +210,21 @@
"Please change the `gitlab_schema` of these tables accordingly." "Please change the `gitlab_schema` of these tables accordingly."
end end
it 'does not allow invalid follow-up issue URLs', :aggregate_failures do
issue_url_regex = %r{\Ahttps://gitlab\.com/gitlab-org/gitlab/-/issues/\d+\z}
entries_with_issue_link.each do |entry|
if entry.sharding_key.present?
expect(entry.sharding_key_issue_url).not_to be_present,
"You must remove `sharding_key_issue_url` from #{entry.table_name} now that it has a valid sharding key." \
else
expect(entry.sharding_key_issue_url).to match(issue_url_regex),
"Invalid `sharding_key_issue_url` url for #{entry.table_name}. Please use the following format: " \
"https://gitlab.com/gitlab-org/gitlab/-/issues/XXX"
end
end
end
private private
def error_message(table_name) def error_message(table_name)
...@@ -231,6 +246,12 @@ def tables_missing_sharding_key(starting_from_milestone:) ...@@ -231,6 +246,12 @@ def tables_missing_sharding_key(starting_from_milestone:)
end end
end end
def entries_with_issue_link
::Gitlab::Database::Dictionary.entries.select do |entry|
entry.sharding_key_issue_url.present?
end
end
def all_tables_to_sharding_key def all_tables_to_sharding_key
entries_with_sharding_key = ::Gitlab::Database::Dictionary.entries.select do |entry| entries_with_sharding_key = ::Gitlab::Database::Dictionary.entries.select do |entry|
entry.sharding_key.present? entry.sharding_key.present?
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册