Bug 1186803 - remove %product_sec_groups from bmo/lib/data.pm

2 files changed, 58 insertions, 62 deletions

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index ccf079b06..2682657c6 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -1151,7 +1151,64 @@ sub install_update_db {
         # and there's nothing to migrate
         my ($group_count) = $dbh->selectrow_array("SELECT COUNT(*) FROM groups");
         if ($group_count) {
-            # Migrate values in Data.pm
+            # Migrate old product_sec_group mappings from the time this change was made
+            my %product_sec_groups = (
+                "addons.mozilla.org"            => 'client-services-security',
+                "Air Mozilla"                   => 'mozilla-employee-confidential',
+                "Android Background Services"   => 'cloud-services-security',
+                "Audio/Visual Infrastructure"   => 'mozilla-employee-confidential',
+                "AUS"                           => 'client-services-security',
+                "Bugzilla"                      => 'bugzilla-security',
+                "bugzilla.mozilla.org"          => 'bugzilla-security',
+                "Cloud Services"                => 'cloud-services-security',
+                "Community Tools"               => 'websites-security',
+                "Data & BI Services Team"       => 'metrics-private',
+                "Developer Documentation"       => 'websites-security',
+                "Developer Ecosystem"           => 'client-services-security',
+                "Finance"                       => 'finance',
+                "Firefox Friends"               => 'mozilla-employee-confidential',
+                "Firefox Health Report"         => 'cloud-services-security',
+                "Infrastructure & Operations"   => 'mozilla-employee-confidential',
+                "Input"                         => 'websites-security',
+                "Intellego"                     => 'intellego-team',
+                "Internet Public Policy"        => 'mozilla-employee-confidential',
+                "L20n"                          => 'l20n-security',
+                "Legal"                         => 'legal',
+                "Marketing"                     => 'marketing-private',
+                "Marketplace"                   => 'client-services-security',
+                "Mozilla Communities"           => 'mozilla-communities-security',
+                "Mozilla Corporation"           => 'mozilla-employee-confidential',
+                "Mozilla Developer Network"     => 'websites-security',
+                "Mozilla Foundation"            => 'mozilla-employee-confidential',
+                "Mozilla Foundation Operations" => 'mozilla-foundation-operations',
+                "Mozilla Grants"                => 'grants',
+                "mozillaignite"                 => 'websites-security',
+                "Mozilla Messaging"             => 'mozilla-messaging-confidential',
+                "Mozilla Metrics"               => 'metrics-private',
+                "mozilla.org"                   => 'mozilla-employee-confidential',
+                "Mozilla PR"                    => 'pr-private',
+                "Mozilla QA"                    => 'mozilla-employee-confidential',
+                "Mozilla Reps"                  => 'mozilla-reps',
+                "Popcorn"                       => 'websites-security',
+                "Privacy"                       => 'privacy',
+                "quality.mozilla.org"           => 'websites-security',
+                "Recruiting"                    => 'hr',
+                "Release Engineering"           => 'mozilla-employee-confidential',
+                "Snippets"                      => 'websites-security',
+                "Socorro"                       => 'client-services-security',
+                "support.mozillamessaging.com"  => 'websites-security',
+                "support.mozilla.org"           => 'websites-security',
+                "Talkback"                      => 'talkback-private',
+                "Tamarin"                       => 'tamarin-security',
+                "Taskcluster"                   => 'taskcluster-security',
+                "Testopia"                      => 'bugzilla-security',
+                "Tree Management"               => 'mozilla-employee-confidential',
+                "Web Apps"                      => 'client-services-security',
+                "Webmaker"                      => 'websites-security',
+                "Websites"                      => 'websites-security',
+                "Webtools"                      => 'webtools-security',
+                "www.mozilla.org"               => 'websites-security',
+            );
             # 1. Set all to core-security by default
             my $core_sec_group = Bugzilla::Group->new({ name => 'core-security' });
             $dbh->do("UPDATE products SET security_group_id = ?", undef, $core_sec_group->id);
diff --git a/extensions/BMO/lib/Data.pm b/extensions/BMO/lib/Data.pm
index dc2a289a4..d4fce4a4c 100644
--- a/extensions/BMO/lib/Data.pm
+++ b/extensions/BMO/lib/Data.pm
@@ -16,7 +16,6 @@ our @EXPORT = qw( $cf_visible_in_products
                   $cf_setters
                   @always_fileable_groups
                   %group_auto_cc
-                  %product_sec_groups
                   %create_bug_formats
                   @default_named_queries
                   %autodetect_attach_urls );
@@ -179,66 +178,6 @@ our @always_fileable_groups = qw(
     webtools-security
 );
 
-# Mapping of products to their security bits
-our %product_sec_groups = (
-    "addons.mozilla.org"           => 'client-services-security',
-    "Air Mozilla"                  => 'mozilla-employee-confidential',
-    "Android Background Services"  => 'cloud-services-security',
-    "Audio/Visual Infrastructure"  => 'mozilla-employee-confidential',
-    "AUS"                          => 'client-services-security',
-    "Bugzilla"                     => 'bugzilla-security',
-    "bugzilla.mozilla.org"         => 'bugzilla-security',
-    "Community Tools"              => 'websites-security',
-    "Data & BI Services Team"      => 'metrics-private',
-    "Developer Documentation"      => 'websites-security',
-    "Developer Ecosystem"          => 'client-services-security',
-    "Finance"                      => 'finance',
-    "Firefox Friends"              => 'mozilla-employee-confidential',
-    "Firefox Health Report"        => 'cloud-services-security',
-    "Infrastructure & Operations"  => 'mozilla-employee-confidential',
-    "Input"                        => 'websites-security',
-    "Intellego"                    => 'intellego-team',
-    "Internet Public Policy"       => 'mozilla-employee-confidential',
-    "L20n"                         => 'l20n-security',
-    "Legal"                        => 'legal',
-    "Recruiting"                   => 'hr',
-    "Marketing"                    => 'marketing-private',
-    "Marketplace"                  => 'client-services-security',
-    "Mozilla Communities"          => 'mozilla-communities-security',
-    "Mozilla Corporation"          => 'mozilla-employee-confidential',
-    "Mozilla Developer Network"    => 'websites-security',
-    "Mozilla Foundation"           => 'mozilla-employee-confidential',
-    "Mozilla Grants"               => 'grants',
-    "mozillaignite"                => 'websites-security',
-    "Mozilla Messaging"            => 'mozilla-messaging-confidential',
-    "Mozilla Metrics"              => 'metrics-private',
-    "mozilla.org"                  => 'mozilla-employee-confidential',
-    "Mozilla PR"                   => 'pr-private',
-    "Mozilla QA"                   => 'mozilla-employee-confidential',
-    "Mozilla Reps"                 => 'mozilla-reps',
-    "Cloud Services"               => 'cloud-services-security',
-    "Popcorn"                      => 'websites-security',
-    "Privacy"                      => 'privacy',
-    "quality.mozilla.org"          => 'websites-security',
-    "Release Engineering"          => 'mozilla-employee-confidential',
-    "Snippets"                     => 'websites-security',
-    "Socorro"                      => 'client-services-security',
-    "support.mozillamessaging.com" => 'websites-security',
-    "support.mozilla.org"          => 'websites-security',
-    "Talkback"                     => 'talkback-private',
-    "Tamarin"                      => 'tamarin-security',
-    "Taskcluster"                  => 'taskcluster-security',
-    "Testopia"                     => 'bugzilla-security',
-    "Tree Management"              => 'mozilla-employee-confidential',
-    "Web Apps"                     => 'client-services-security',
-    "Webmaker"                     => 'websites-security',
-    "Websites"                     => 'websites-security',
-    "Webtools"                     => 'webtools-security',
-    "www.mozilla.org"              => 'websites-security',
-    "Mozilla Foundation Operations" => 'mozilla-foundation-operations',
-    "_default"                     => 'core-security'
-);
-
 # Automatically CC users to bugs filed into configured groups and products
 our %group_auto_cc = (
     'partner-confidential' => {