diff options
Diffstat (limited to 'danger')
-rw-r--r-- | danger/database/Dangerfile | 2 | ||||
-rw-r--r-- | danger/datateam/Dangerfile | 2 | ||||
-rw-r--r-- | danger/feature_flag/Dangerfile | 58 | ||||
-rw-r--r-- | danger/multiversion/Dangerfile | 3 | ||||
-rw-r--r-- | danger/plugins/multiversion.rb | 9 | ||||
-rw-r--r-- | danger/product_intelligence/Dangerfile | 2 | ||||
-rw-r--r-- | danger/roulette/Dangerfile | 3 | ||||
-rw-r--r-- | danger/specs/Dangerfile | 8 |
8 files changed, 76 insertions, 11 deletions
diff --git a/danger/database/Dangerfile b/danger/database/Dangerfile index df6ffab7c94..96134ea66a6 100644 --- a/danger/database/Dangerfile +++ b/danger/database/Dangerfile @@ -45,6 +45,8 @@ geo_migration_created = !git.added_files.grep(%r{\Aee/db/geo/(post_)?migrate/}). format_str = helper.ci? ? SCHEMA_NOT_UPDATED_MESSAGE_FULL : SCHEMA_NOT_UPDATED_MESSAGE_SHORT +return if stable_branch.valid_stable_branch? + if non_geo_migration_created && !non_geo_db_schema_updated warn format(format_str, migrations: 'migrations', schema: helper.html_link("db/structure.sql")) end diff --git a/danger/datateam/Dangerfile b/danger/datateam/Dangerfile index ed2703f31e6..3cd0578a068 100644 --- a/danger/datateam/Dangerfile +++ b/danger/datateam/Dangerfile @@ -1,3 +1,5 @@ # frozen_string_literal: true +return if stable_branch.valid_stable_branch? + markdown(datateam.build_message) if datateam.impacted? diff --git a/danger/feature_flag/Dangerfile b/danger/feature_flag/Dangerfile index d5b907377aa..602ff1128f2 100644 --- a/danger/feature_flag/Dangerfile +++ b/danger/feature_flag/Dangerfile @@ -3,6 +3,9 @@ SEE_DOC = "See the [feature flag documentation](https://docs.gitlab.com/ee/development/feature_flags#feature-flag-definition-and-validation)." FEATURE_FLAG_LABEL = "feature flag" +FEATURE_FLAG_EXISTS_LABEL = "#{FEATURE_FLAG_LABEL}::exists" +FEATURE_FLAG_SKIPPED_LABEL = "#{FEATURE_FLAG_LABEL}::skipped" +DEVOPS_LABELS_REQUIRING_FEATURE_FLAG_REVIEW = ["devops::verify"] SUGGEST_MR_COMMENT = <<~SUGGEST_COMMENT ```suggestion @@ -12,6 +15,17 @@ group: "%<group>s" #{SEE_DOC} SUGGEST_COMMENT +FEATURE_FLAG_ENFORCEMENT_WARNING = <<~WARNING_MESSAGE +There were no new or modified feature flag YAML files detected in this MR. + +If the changes here are already controlled under an existing feature flag, please add +the ~"#{FEATURE_FLAG_EXISTS_LABEL}". Otherwise, if you think the changes here don't need +to be under a feature flag, please add the label ~"#{FEATURE_FLAG_SKIPPED_LABEL}", and +add a short comment about why we skipped the feature flag. + +For guidance on when to use a feature flag, please see the [documentation](https://about.gitlab.com/handbook/product-development-flow/feature-flag-lifecycle/#when-to-use-feature-flags). +WARNING_MESSAGE + def check_feature_flag_yaml(feature_flag) mr_group_label = helper.group_label @@ -64,22 +78,56 @@ def message_for_feature_flag_with_group!(feature_flag:, mr_group_label:) end end +def added_feature_flag_files + feature_flag.feature_flag_files(change_type: :added) +end + +def modified_feature_flag_files + feature_flag.feature_flag_files(change_type: :modified) +end + def feature_flag_file_added? - feature_flag.feature_flag_files(change_type: :added).any? + added_feature_flag_files.any? end -def feature_flag_file_added_or_removed? - feature_flag_file_added? || feature_flag.feature_flag_files(change_type: :deleted).any? +def feature_flag_file_modified? + modified_feature_flag_files.any? end -feature_flag.feature_flag_files(change_type: :added).each do |feature_flag| +def feature_flag_file_added_or_modified? + feature_flag_file_added? || feature_flag_file_modified? +end + +def mr_has_backend_or_frontend_changes? + changes = helper.changes_by_category + changes.has_key?(:backend) || changes.has_key?(:frontend) +end + +def mr_missing_feature_flag_status_label? + ([FEATURE_FLAG_EXISTS_LABEL, FEATURE_FLAG_SKIPPED_LABEL] & helper.mr_labels).none? +end + +def stage_requires_feature_flag_review? + DEVOPS_LABELS_REQUIRING_FEATURE_FLAG_REVIEW.include?(feature_flag.stage_label) +end + +added_feature_flag_files.each do |feature_flag| check_feature_flag_yaml(feature_flag) end -feature_flag.feature_flag_files(change_type: :modified).each do |feature_flag| +modified_feature_flag_files.each do |feature_flag| message_for_global_rollout(feature_flag) end if helper.security_mr? && feature_flag_file_added? fail "Feature flags are discouraged from security merge requests. Read the [security documentation](https://gitlab.com/gitlab-org/release/docs/-/blob/master/general/security/utilities/feature_flags.md) for details." end + +if !helper.security_mr? && mr_has_backend_or_frontend_changes? && stage_requires_feature_flag_review? + if feature_flag_file_added_or_modified? && !helper.mr_has_labels?(FEATURE_FLAG_EXISTS_LABEL) + # Feature flag config file touched in this MR, so let's add the label to avoid the warning. + helper.labels_to_add << FEATURE_FLAG_EXISTS_LABEL + end + + warn FEATURE_FLAG_ENFORCEMENT_WARNING if mr_missing_feature_flag_status_label? +end diff --git a/danger/multiversion/Dangerfile b/danger/multiversion/Dangerfile new file mode 100644 index 00000000000..9a53592abdb --- /dev/null +++ b/danger/multiversion/Dangerfile @@ -0,0 +1,3 @@ +# frozen_string_literal: true + +multiversion.check! diff --git a/danger/plugins/multiversion.rb b/danger/plugins/multiversion.rb new file mode 100644 index 00000000000..b180580cf70 --- /dev/null +++ b/danger/plugins/multiversion.rb @@ -0,0 +1,9 @@ +# frozen_string_literal: true + +require_relative '../../tooling/danger/multiversion' + +module Danger + class Multiversion < ::Danger::Plugin + include Tooling::Danger::Multiversion + end +end diff --git a/danger/product_intelligence/Dangerfile b/danger/product_intelligence/Dangerfile index 86888fe542e..b20c56a7b7c 100644 --- a/danger/product_intelligence/Dangerfile +++ b/danger/product_intelligence/Dangerfile @@ -1,5 +1,7 @@ # frozen_string_literal: true +return if stable_branch.valid_stable_branch? + product_intelligence.check! product_intelligence.check_affected_scopes! diff --git a/danger/roulette/Dangerfile b/danger/roulette/Dangerfile index 32899c4d74f..3256ff25bbf 100644 --- a/danger/roulette/Dangerfile +++ b/danger/roulette/Dangerfile @@ -104,6 +104,9 @@ categories << :product_intelligence if helper.mr_labels.include?("product intell # Skip Product intelligence reviews for growth experiment MRs categories.delete(:product_intelligence) if helper.mr_labels.include?("growth experiment") +# Skip specialty reviews for stable branch MRs since they have already been merged to the default branch +categories.subtract([:database, :ux, :product_intelligence]) if stable_branch.valid_stable_branch? + if changes.any? random_roulette_spins = roulette.spin(nil, categories, timezone_experiment: false) diff --git a/danger/specs/Dangerfile b/danger/specs/Dangerfile index d17c17bc545..ff766cf688e 100644 --- a/danger/specs/Dangerfile +++ b/danger/specs/Dangerfile @@ -50,12 +50,8 @@ if has_ee_app_changes && has_spec_changes && !(has_app_changes || has_ee_spec_ch end # Forbidding a new file addition under `/spec/controllers` or `/ee/spec/controllers` -if helper.changes.added.files.grep(%r{^(ee/)?spec/controllers/}).any? - warn CONTROLLER_SPEC_DEPRECATION_MESSAGE -end +warn CONTROLLER_SPEC_DEPRECATION_MESSAGE if helper.changes.added.files.grep(%r{^(ee/)?spec/controllers/}).any? specs.changed_specs_files.each do |filename| - specs.add_suggestions_for_match_with_array(filename) - specs.add_suggestions_for_project_factory_usage(filename) - specs.add_suggestions_for_feature_category(filename) + specs.add_suggestions_for(filename) end |