diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-20 14:34:42 +0000 |
commit | 9f46488805e86b1bc341ea1620b866016c2ce5ed (patch) | |
tree | f9748c7e287041e37d6da49e0a29c9511dc34768 /danger/telemetry | |
parent | dfc92d081ea0332d69c8aca2f0e745cb48ae5e6d (diff) | |
download | gitlab-ce-9f46488805e86b1bc341ea1620b866016c2ce5ed.tar.gz |
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'danger/telemetry')
-rw-r--r-- | danger/telemetry/Dangerfile | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/danger/telemetry/Dangerfile b/danger/telemetry/Dangerfile index f308fb206bb..c18a15fcb03 100644 --- a/danger/telemetry/Dangerfile +++ b/danger/telemetry/Dangerfile @@ -9,24 +9,27 @@ USAGE_DATA_FILES_MESSAGE = <<~MSG For the following files, a review from the [Data team and Telemetry team](https://gitlab.com/groups/gitlab-org/growth/telemetry/engineers/-/group_members?with_inherited_permissions=exclude) is recommended: MSG -usage_data_changed_files = git.modified_files.grep(%r{usage_data}) +tracking_files = [ + 'lib/gitlab/tracking.rb', + 'spec/lib/gitlab/tracking_spec.rb', + 'app/helpers/tracking_helper.rb', + 'spec/helpers/tracking_helper_spec.rb', + 'app/assets/javascripts/tracking.js', + 'spec/frontend/tracking_spec.js' + ] -def has_label?(label) - gitlab.mr_labels.include?(label) -end +usage_data_changed_files = git.modified_files.grep(%r{usage_data}) +snowplow_events_changed_files = git.modified_files & tracking_files -def labels_for_merge_request(labels) - labels_list = labels.map { |label| %Q{~"#{label}"} }.join(' ') - "/label #{labels_list}" -end +changed_files = (usage_data_changed_files + snowplow_events_changed_files) -if usage_data_changed_files.any? +if changed_files.any? warn format(TELEMETRY_CHANGED_FILES_MESSAGE) - markdown(USAGE_DATA_FILES_MESSAGE + helper.markdown_list(usage_data_changed_files)) + markdown(USAGE_DATA_FILES_MESSAGE + helper.markdown_list(changed_files)) telemetry_labels = ['telemetry'] - telemetry_labels << 'telemetry::review pending' unless has_label?('telemetry::reviewed') + telemetry_labels << 'telemetry::review pending' unless helper.mr_has_labels?('telemetry::reviewed') - markdown(labels_for_merge_request(telemetry_labels)) + markdown(helper.prepare_labels_for_mr(telemetry_labels)) end |