update for PR feedback

Author: jeddai

components/support/nimbus-fml/fixtures/fe/misc-features.yaml

@@ -11,14 +11,12 @@ channels:
   - debug
 features:
   onboarding:
-    description: A feature containing a field with pref
+    description: A feature containing a field with pref-key
     variables:
       enabled:
         description: If true, enable new style onboarding.
         type: Boolean
-        pref:
-          key: enrollment_enabled
-          branch: default
+        pref-key: enrollment_enabled
         default: false
   messaging:
     description: A feature allowing coenrollment

components/support/nimbus-fml/fixtures/fe/pref_overrides.fml.yaml

@@ -16,28 +16,20 @@ features:
       my-boolean:
         type: Boolean
         description: A boolean
-        pref:
-          key: my-boolean-pref-key
-          branch: default
+        pref-key: my-boolean-pref-key
         default: false
       my-int:
         type: Int
         description: An Int
-        pref:
-          key: my-int-pref-key
-          branch: default
+        pref-key: my-int-pref-key
         default: 0
       my-string:
         type: String
         description: A String
-        pref:
-          key: my-string-pref-key
-          branch: default
+        pref-key: my-string-pref-key
         default: from manifest
       my-text:
         type: Text
         description: A Text
-        pref:
-          key: my-text-pref-key
-          branch: default
+        pref-key: my-text-pref-key
         default: from manifest

components/support/nimbus-fml/src/schema/validator.rs

@@ -13,24 +13,20 @@ use std::collections::{BTreeMap, HashSet};
 
 const DISALLOWED_PREFS: &[(&str, &str)] = &[
     (
-        r#"app\.shield\.optoutstudies\.enabled"#,
+        r#"^app\.shield\.optoutstudies\.enabled$"#,
         "disabling Nimbus causes immediate unenrollment",
     ),
     (
-        r#"datareporting\.healthreport\.uploadEnabled"#,
+        r#"^datareporting\.healthreport\.uploadEnabled$"#,
         "disabling telemetry causes immediate unenrollment",
     ),
     (
-        r#"services\.settings\.server"#,
+        r#"^services\.settings\.server$"#,
         "changing the Remote Settings endpoint will break clients",
     ),
+    (r#"^nimbus\.debug$"#, "internal Nimbus preference for QA"),
     (
-        r#"messaging-system\.rsexperimentloader\.collection"#,
-        "changing the Nimbus collection will break clients",
-    ),
-    (r#"nimbus\.debug"#, "internal Nimbus preference for QA"),
-    (
-        r#"security\.turn_off_all_security_so_that_viruses_can_take_over_this_computer"#,
+        r#"^security\.turn_off_all_security_so_that_viruses_can_take_over_this_computer$"#,
         "this pref is automation-only and is unsafe to enable outside tests",
     ),
 ];