Fix exposure of 'uses_only_baseline_capabilities' field in Remote Set…

…tings (ref #2047)

normandy/recipes/api/v1/serializers.py

@@ -113,6 +113,7 @@ class MinimalRecipeSerializer(RecipeSerializer):
     """
 
     revision_id = serializers.SerializerMethodField()
+    uses_only_baseline_capabilities = serializers.SerializerMethodField()
 
     class Meta(RecipeSerializer.Meta):
         # Attributes serialized here are made available to filter expressions via
@@ -126,6 +127,7 @@ class Meta(RecipeSerializer.Meta):
             "arguments",
             "filter_expression",
             "capabilities",
+            "uses_only_baseline_capabilities"
         ]
 
     def get_revision_id(self, recipe):
@@ -136,6 +138,9 @@ def get_revision_id(self, recipe):
         else:
             None
 
+    def get_uses_only_baseline_capabilities(self, recipe):
+        return recipe.uses_only_baseline_capabilities()
+
 
 class RecipeRevisionSerializer(serializers.ModelSerializer):
     date_created = serializers.DateTimeField(source="created", read_only=True)

normandy/recipes/exports.py

@@ -25,14 +25,9 @@ def recipe_as_record(recipe):
         SignatureSerializer,
     )  # avoid circular imports
 
-    recipe_fields = {
-        **MinimalRecipeSerializer(recipe).data,
-        # Allow to filter retro compatible recipes in Remote Settings.
-        "uses_only_baseline_capabilities": recipe.uses_only_baseline_capabilities(),
-    }
     record = {
         "id": str(recipe.id),
-        "recipe": recipe_fields,
+        "recipe": MinimalRecipeSerializer(recipe).data,
         "signature": SignatureSerializer(recipe.signature).data,
     }
     return record

normandy/recipes/tests/api/v1/test_serializers.py

@@ -67,6 +67,7 @@ def test_it_works(self, rf):
             "action": action.name,
             "arguments": {"foo": "bar"},
             "capabilities": sorted(recipe.capabilities),
+            'uses_only_baseline_capabilities': False,
         }
 
     def test_capabilities_are_sorted(self, rf):
@@ -123,6 +124,7 @@ def test_it_works_with_no_signature(self, rf):
                 "action": action.name,
                 "arguments": recipe.arguments,
                 "capabilities": sorted(recipe.capabilities),
+                'uses_only_baseline_capabilities': False,
             },
         }
 

normandy/recipes/tests/test_models.py

@@ -410,7 +410,8 @@ def test_canonical_json(self):
             '"filter_expression":"%(filter_expression)s",'
             '"id":%(id)s,'
             '"name":"canonical",'
-            '"revision_id":"%(revision_id)s"'
+            '"revision_id":"%(revision_id)s",'
+            '"uses_only_baseline_capabilities":false'
             "}"
         ) % {
             "id": recipe.id,