diff --git a/config/events/1643968255_projectsnew_select_deployment_target.yml b/config/events/1643968255_projectsnew_select_deployment_target.yml index 2ffa4d59613cf8762669567fd1c10f1bae803316..669e69306a7c8837490c7758f2983803a0ad7712 100644 --- a/config/events/1643968255_projectsnew_select_deployment_target.yml +++ b/config/events/1643968255_projectsnew_select_deployment_target.yml @@ -5,9 +5,6 @@ action: select_deployment_target product_group: environments milestone: "14.8" introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79873 -distributions: -- ce -- ee tiers: - free - premium diff --git a/config/events/schema.json b/config/events/schema.json index 3689238550ed67498940587fc54138b991b06293..afe15227aeaaad2c9cf0e9105e2fc72451889199 100644 --- a/config/events/schema.json +++ b/config/events/schema.json @@ -6,11 +6,16 @@ "product_group", "introduced_by_url", "milestone", - "tiers", - "distributions" + "tiers" ], "additionalProperties": false, "properties": { + "distributions": { + "type": [ + "array", + "null" + ] + }, "description": { "type": "string" }, @@ -157,16 +162,6 @@ ], "pattern": "^<?[0-9]+\\.[0-9]+$" }, - "distributions": { - "type": "array", - "items": { - "type": "string", - "enum": [ - "ee", - "ce" - ] - } - }, "tiers": { "type": "array", "items": { diff --git a/scripts/internal_events/cli/event.rb b/scripts/internal_events/cli/event.rb index 4fe54d5932d0c93e469cf6f746ebf34d4520e237..d262ce15bd5e68a3707d9e718a5d85941167793c 100755 --- a/scripts/internal_events/cli/event.rb +++ b/scripts/internal_events/cli/event.rb @@ -13,7 +13,6 @@ module InternalEventsCli :product_group, :milestone, :introduced_by_url, - :distributions, :tiers ].freeze @@ -45,7 +44,7 @@ def formatted_output def file_path File.join( *[ - ('ee' unless distributions.include?('ce')), + ('ee' unless tiers.include?('free')), 'config', 'events', "#{action}.yml" diff --git a/scripts/internal_events/cli/flows/event_definer.rb b/scripts/internal_events/cli/flows/event_definer.rb index 28b048a0d17e78503dbabfb3f68a9691a1a1c8cd..15207a1cb2a98a0057bcf200e93f0e7e65e0a843 100644 --- a/scripts/internal_events/cli/flows/event_definer.rb +++ b/scripts/internal_events/cli/flows/event_definer.rb @@ -204,8 +204,6 @@ def prompt_for_tier 'Which tiers will the event be recorded on?', [%w[free premium ultimate], %w[premium ultimate], %w[ultimate]] ) - - event.distributions = event.tiers.include?('free') ? %w[ce ee] : %w[ee] end def create_event_file diff --git a/scripts/internal_events/cli/flows/metric_definer.rb b/scripts/internal_events/cli/flows/metric_definer.rb index 4d6ff7973caa42884bf80e8f501026ed4d087de3..12f2540b6ee65d1ee3317c93a20fd5141a1fc562 100755 --- a/scripts/internal_events/cli/flows/metric_definer.rb +++ b/scripts/internal_events/cli/flows/metric_definer.rb @@ -537,7 +537,6 @@ def collect_values_for_shared_event_properties fields[:product_group] << event.product_group fields[:stage] << find_stage(event.product_group) fields[:section] << find_section(event.product_group) - fields[:distribution] << event.distributions&.sort fields[:tiers] << event.tiers&.sort end diff --git a/spec/fixtures/scripts/internal_events/events/ee_event_without_identifiers.yml b/spec/fixtures/scripts/internal_events/events/ee_event_without_identifiers.yml index 0155bbd6c801087af17305d167eaa176d85b1c55..6f843daa5e83a00353b7954c33026db95b06ccd1 100644 --- a/spec/fixtures/scripts/internal_events/events/ee_event_without_identifiers.yml +++ b/spec/fixtures/scripts/internal_events/events/ee_event_without_identifiers.yml @@ -5,8 +5,6 @@ action: internal_events_cli_opened product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: TODO -distributions: -- ee tiers: - premium - ultimate diff --git a/spec/fixtures/scripts/internal_events/events/event_with_additional_properties.yml b/spec/fixtures/scripts/internal_events/events/event_with_additional_properties.yml index 1ce3a544cf209010811856a245fb8b671de33fa1..639bd9a46aa229502d31ce8da7df4089ad86726a 100644 --- a/spec/fixtures/scripts/internal_events/events/event_with_additional_properties.yml +++ b/spec/fixtures/scripts/internal_events/events/event_with_additional_properties.yml @@ -16,9 +16,6 @@ additional_properties: product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: TODO -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/internal_events/events/event_with_all_additional_properties.yml b/spec/fixtures/scripts/internal_events/events/event_with_all_additional_properties.yml index 1917907dea5fffc4dd6bda0aa9514887d78dcf56..5128efbad650f20e33fb03ccfdb566f1bac55648 100644 --- a/spec/fixtures/scripts/internal_events/events/event_with_all_additional_properties.yml +++ b/spec/fixtures/scripts/internal_events/events/event_with_all_additional_properties.yml @@ -16,9 +16,6 @@ additional_properties: product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: TODO -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/internal_events/events/event_with_feature_enabled_by_namespace_ids_identifier.yml b/spec/fixtures/scripts/internal_events/events/event_with_feature_enabled_by_namespace_ids_identifier.yml index 7bc7c035f15df949833e5606f3770e3e0d8e0f21..79a0605098ef21479ccbf3cfd24c96617641a505 100644 --- a/spec/fixtures/scripts/internal_events/events/event_with_feature_enabled_by_namespace_ids_identifier.yml +++ b/spec/fixtures/scripts/internal_events/events/event_with_feature_enabled_by_namespace_ids_identifier.yml @@ -17,9 +17,6 @@ additional_properties: product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: TODO -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/internal_events/events/event_with_identifiers.yml b/spec/fixtures/scripts/internal_events/events/event_with_identifiers.yml index 3841530ca5db105a371edc4a5d8f898a404b0fb5..5d0ac8112a360a8638c65b7d3abd17ceb746676a 100644 --- a/spec/fixtures/scripts/internal_events/events/event_with_identifiers.yml +++ b/spec/fixtures/scripts/internal_events/events/event_with_identifiers.yml @@ -9,9 +9,6 @@ identifiers: product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: TODO -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/internal_events/events/event_with_mr_url.yml b/spec/fixtures/scripts/internal_events/events/event_with_mr_url.yml index f0a3b932084c4e79f7084fcf8f27bbf417323485..1e7e7852d4b921fdc3948765d22e79cf0a3d77de 100644 --- a/spec/fixtures/scripts/internal_events/events/event_with_mr_url.yml +++ b/spec/fixtures/scripts/internal_events/events/event_with_mr_url.yml @@ -9,9 +9,6 @@ identifiers: product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/143433 -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/internal_events/events/event_with_multiple_custom_properties.yml b/spec/fixtures/scripts/internal_events/events/event_with_multiple_custom_properties.yml index 552647fda285b560072eab03b1864e01af73e0b4..6c129f0c96cbd87b1ca875b94e8655295d44951a 100644 --- a/spec/fixtures/scripts/internal_events/events/event_with_multiple_custom_properties.yml +++ b/spec/fixtures/scripts/internal_events/events/event_with_multiple_custom_properties.yml @@ -22,9 +22,6 @@ additional_properties: product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: TODO -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/internal_events/events/keyboard_smashed_event.yml b/spec/fixtures/scripts/internal_events/events/keyboard_smashed_event.yml index 6a6b9fa5eaebd0228c2ef18e559a3e5a508fe2fa..9978a08e03903db7f2786b31ec245df10d235e4a 100644 --- a/spec/fixtures/scripts/internal_events/events/keyboard_smashed_event.yml +++ b/spec/fixtures/scripts/internal_events/events/keyboard_smashed_event.yml @@ -9,9 +9,6 @@ identifiers: product_group: import_and_integrate milestone: '16.6' introduced_by_url: TODO -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/internal_events/events/secondary_event_with_additional_properties.yml b/spec/fixtures/scripts/internal_events/events/secondary_event_with_additional_properties.yml index c5dc95994f63c0f64909389dbfca43c5701d3cb7..c53316044723276c67de9874e3971ce37e0a80cb 100644 --- a/spec/fixtures/scripts/internal_events/events/secondary_event_with_additional_properties.yml +++ b/spec/fixtures/scripts/internal_events/events/secondary_event_with_additional_properties.yml @@ -14,9 +14,6 @@ additional_properties: product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: TODO -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/internal_events/events/secondary_event_with_identifiers.yml b/spec/fixtures/scripts/internal_events/events/secondary_event_with_identifiers.yml index ce1633cdf3f71ad76ab87b340e7d18dcb80aca01..f2ba9016ff3596b8eb2f5545391961ccac6bbd7d 100644 --- a/spec/fixtures/scripts/internal_events/events/secondary_event_with_identifiers.yml +++ b/spec/fixtures/scripts/internal_events/events/secondary_event_with_identifiers.yml @@ -9,9 +9,6 @@ identifiers: product_group: analytics_instrumentation milestone: '16.6' introduced_by_url: TODO -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/product_group_renamer/event_definition.yml b/spec/fixtures/scripts/product_group_renamer/event_definition.yml index dd4b48e762a6a8e8e91e5da57f230fe9748b9a5c..ec954f040a348ed7bb20770db7b8175705731b9d 100644 --- a/spec/fixtures/scripts/product_group_renamer/event_definition.yml +++ b/spec/fixtures/scripts/product_group_renamer/event_definition.yml @@ -9,9 +9,6 @@ identifiers: product_group: a_group_name milestone: '16.6' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149010 -distributions: -- ce -- ee tiers: - free - premium diff --git a/spec/fixtures/scripts/product_group_renamer/event_definition_from_another_group.yml b/spec/fixtures/scripts/product_group_renamer/event_definition_from_another_group.yml index 57bf3a1b779c6d31ab2c67fb82e790680c7139f6..6a5a5a1bffa0d0a1aaaa685c5276b94a491dd376 100644 --- a/spec/fixtures/scripts/product_group_renamer/event_definition_from_another_group.yml +++ b/spec/fixtures/scripts/product_group_renamer/event_definition_from_another_group.yml @@ -9,9 +9,6 @@ identifiers: product_group: another_group milestone: '17.0' introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/149010 -distributions: -- ce -- ee tiers: - free - premium