Merge ~twom/launchpad:oci-policy-set-the-official-with-the-official-permissions into launchpad:master

[Tom Wardill]

Set official status for an OCIRecipe via the UI

a53392c... by Tom Wardill on 2021-01-20

Tidy up old remnants

[Thiago F. Pappacena (pappacena)]

LGTM

review: Approve

[Thiago F. Pappacena (pappacena)]

review: Approve

3cb0b3f... by Tom Wardill on 2021-01-21

Remove official recipe options from OCI Project

[Thiago F. Pappacena (pappacena)]

LGTM. Added just a small comment on a test.

Now that we don't enforce a single official recipe per OCIProject, it seems a bit strange having OCIProject managing an attribute of OCIRecipe. But for me it's ok to keep it like this for now, and refactoring in the future.

[Ioana Lasc (ilasc)]

LGTM

review: Approve

a979206... by Tom Wardill on 2021-01-21

Check the other status hasn't changed

diff --git a/lib/lp/oci/browser/ocirecipe.py b/lib/lp/oci/browser/ocirecipe.py
index a2b8119..7cf1f94 100644
--- a/lib/lp/oci/browser/ocirecipe.py
+++ b/lib/lp/oci/browser/ocirecipe.py
@@ -742,6 +742,18 @@ class OCIRecipeFormMixin:
             build_args[k] = v
         data['build_args'] = build_args
 
+    def userIsRecipeAdmin(self):
+        if check_permission("launchpad.Admin", self.context):
+            return True
+        person = getattr(self.request.principal, 'person', None)
+        if not person:
+            return False
+        # Edit context = OCIRecipe, New context = OCIProject
+        project = getattr(self.context, "oci_project", self.context)
+        if project.pillar.canAdministerOCIProjects(person):
+            return True
+        return False
+
 
 class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
                        OCIRecipeFormMixin):
@@ -775,6 +787,16 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
             "The architectures that this OCI recipe builds for. Some "
             "architectures are restricted and may only be enabled or "
             "disabled by administrators.")
+        self.form_fields += FormFields(Bool(
+            __name__="official_recipe",
+            title="Official recipe",
+            description=(
+                "Mark this recipe as official for this OCI Project. "
+                "Allows use of distribution registry credentials "
+                "and the default git repository routing. "
+                "May only be enabled by the owner of the OCI Project."),
+            default=False,
+            required=False, readonly=False))
 
     def setUpGitRefWidget(self):
         """Setup GitRef widget indicating the user to use the default
@@ -798,6 +820,11 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
         super(OCIRecipeAddView, self).setUpWidgets()
         self.widgets["processors"].widget_class = "processors"
         self.setUpGitRefWidget()
+        # disable the official recipe button if the user doesn't have
+        # permissions to change it
+        widget = self.widgets['official_recipe']
+        if not self.userIsRecipeAdmin():
+            widget.extra = "disabled='disabled'"
 
     @property
     def cancel_url(self):
@@ -829,6 +856,12 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
                     "this name." % (
                         owner.display_name, self.context.display_name))
         self.validateBuildArgs(data)
+        official = data.get("official_recipe", None)
+        if official and not self.userIsRecipeAdmin():
+            self.setFieldError(
+                "official_recipe",
+                "You do not have permission to set the official status "
+                "of this recipe.")
 
     @action("Create OCI recipe", name="create")
     def create_action(self, action, data):
@@ -837,7 +870,8 @@ class OCIRecipeAddView(LaunchpadFormView, EnableProcessorsMixin,
             oci_project=self.context, git_ref=data["git_ref"],
             build_file=data["build_file"], description=data["description"],
             build_daily=data["build_daily"], build_args=data["build_args"],
-            build_path=data["build_path"], processors=data["processors"])
+            build_path=data["build_path"], processors=data["processors"],
+            official=data.get('official_recipe', False))
         self.next_url = canonical_url(recipe)
 
 
@@ -858,6 +892,11 @@ class BaseOCIRecipeEditView(LaunchpadEditFormView):
                 self.context.setProcessors(
                     new_processors, check_permissions=True, user=self.user)
             del data["processors"]
+        official = data.pop('official_recipe', None)
+        if official is not None and self.userIsRecipeAdmin():
+            self.context.oci_project.setOfficialRecipeStatus(
+                self.context, official)
+
         self.updateContextFromData(data)
         self.next_url = canonical_url(self.context)
 
@@ -931,6 +970,11 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
         """See `LaunchpadFormView`."""
         super(OCIRecipeEditView, self).setUpWidgets()
         self.setUpGitRefWidget()
+        # disable the official recipe button if the user doesn't have
+        # permissions to change it
+        widget = self.widgets['official_recipe']
+        if not self.userIsRecipeAdmin():
+            widget.extra = "disabled='disabled'"
 
     def setUpFields(self):
         """See `LaunchpadFormView`."""
@@ -941,6 +985,16 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
             "The architectures that this OCI recipe builds for. Some "
             "architectures are restricted and may only be enabled or "
             "disabled by administrators.")
+        self.form_fields += FormFields(Bool(
+            __name__="official_recipe",
+            title="Official recipe",
+            description=(
+                "Mark this recipe as official for this OCI Project. "
+                "Allows use of distribution registry credentials "
+                "and the default git repository routing. "
+                "May only be enabled by the owner of the OCI Project."),
+            default=False,
+            required=False, readonly=False))
 
     def validate(self, data):
         """See `LaunchpadFormView`."""
@@ -976,6 +1030,14 @@ class OCIRecipeEditView(BaseOCIRecipeEditView, EnableProcessorsMixin,
                         # enabled. Leave it untouched.
                         data["processors"].append(processor)
         self.validateBuildArgs(data)
+        official = data.get('official_recipe')
+        official_change = self.context.official != official
+        is_admin = self.userIsRecipeAdmin()
+        if official is not None and official_change and not is_admin:
+            self.setFieldError(
+                "official_recipe",
+                "You do not have permission to change the official status "
+                "of this recipe.")
 
 
 class OCIRecipeDeleteView(BaseOCIRecipeEditView):
diff --git a/lib/lp/oci/browser/tests/test_ocirecipe.py b/lib/lp/oci/browser/tests/test_ocirecipe.py
index 3505fd3..35b9dd8 100644
--- a/lib/lp/oci/browser/tests/test_ocirecipe.py
+++ b/lib/lp/oci/browser/tests/test_ocirecipe.py
@@ -223,6 +223,9 @@ class TestOCIRecipeAddView(BaseTestOCIRecipeView):
         self.assertThat(
             "Build schedule:\nBuilt on request\nEdit OCI recipe\n",
             MatchesTagText(content, "build-schedule"))
+        self.assertThat(
+            "Official recipe:\nNo",
+            MatchesTagText(content, "official-recipe"))
 
     def test_create_new_recipe_with_build_args(self):
         oci_project = self.factory.makeOCIProject()
@@ -335,6 +338,114 @@ class TestOCIRecipeAddView(BaseTestOCIRecipeView):
                     "id": "field.git_ref.repository",
                     "value": default_repo_path})))
 
+    def test_official_is_disabled(self):
+        oci_project = self.factory.makeOCIProject()
+        browser = self.getViewBrowser(
+            oci_project, view_name="+new-recipe", user=self.person)
+        official_control = browser.getControl("Official recipe")
+        self.assertTrue(official_control.disabled)
+
+    def test_official_is_enabled(self):
+        distribution = self.factory.makeDistribution(
+            oci_project_admin=self.person)
+        oci_project = self.factory.makeOCIProject(pillar=distribution)
+        browser = self.getViewBrowser(
+            oci_project, view_name="+new-recipe", user=self.person)
+        official_control = browser.getControl("Official recipe")
+        self.assertFalse(official_control.disabled)
+
+    def test_set_official(self):
+        distribution = self.factory.makeDistribution(
+            oci_project_admin=self.person)
+        oci_project = self.factory.makeOCIProject(pillar=distribution)
+        [git_ref] = self.factory.makeGitRefs()
+        browser = self.getViewBrowser(
+            oci_project, view_name="+new-recipe", user=self.person)
+        browser.getControl(name="field.name").value = "recipe-name"
+        browser.getControl("Description").value = "Recipe description"
+        browser.getControl(name="field.git_ref.repository").value = (
+            git_ref.repository.identity)
+        browser.getControl(name="field.git_ref.path").value = git_ref.path
+        official_control = browser.getControl("Official recipe")
+        official_control.selected = True
+        browser.getControl("Create OCI recipe").click()
+
+        content = find_main_content(browser.contents)
+        self.assertThat(
+            "Official recipe:\nYes",
+            MatchesTagText(content, "official-recipe"))
+
+    def test_set_official_multiple(self):
+        distribution = self.factory.makeDistribution(
+            oci_project_admin=self.person)
+
+        # do it once
+        oci_project = self.factory.makeOCIProject(pillar=distribution)
+        [git_ref] = self.factory.makeGitRefs()
+
+        # and then do it again
+        oci_project2 = self.factory.makeOCIProject(pillar=distribution)
+        [git_ref2] = self.factory.makeGitRefs()
+        browser = self.getViewBrowser(
+            oci_project, view_name="+new-recipe", user=self.person)
+        browser.getControl(name="field.name").value = "recipe-name"
+        browser.getControl("Description").value = "Recipe description"
+        browser.getControl(name="field.git_ref.repository").value = (
+            git_ref.repository.identity)
+        browser.getControl(name="field.git_ref.path").value = git_ref.path
+        official_control = browser.getControl("Official recipe")
+        official_control.selected = True
+        browser.getControl("Create OCI recipe").click()
+
+        content = find_main_content(browser.contents)
+        self.assertThat(
+            "Official recipe:\nYes",
+            MatchesTagText(content, "official-recipe"))
+
+        browser2 = self.getViewBrowser(
+            oci_project2, view_name="+new-recipe", user=self.person)
+        browser2.getControl(name="field.name").value = "recipe-name"
+        browser2.getControl("Description").value = "Recipe description"
+        browser2.getControl(name="field.git_ref.repository").value = (
+            git_ref2.repository.identity)
+        browser2.getControl(name="field.git_ref.path").value = git_ref2.path
+        official_control = browser2.getControl("Official recipe")
+        official_control.selected = True
+        browser2.getControl("Create OCI recipe").click()
+
+        content = find_main_content(browser2.contents)
+        self.assertThat(
+            "Official recipe:\nYes",
+            MatchesTagText(content, "official-recipe"))
+
+        browser.reload()
+        content = find_main_content(browser.contents)
+        self.assertThat(
+            "Official recipe:\nYes",
+            MatchesTagText(content, "official-recipe"))
+
+    def test_set_official_no_permissions(self):
+        distro_owner = self.factory.makePerson()
+        distribution = self.factory.makeDistribution(
+            oci_project_admin=distro_owner)
+        oci_project = self.factory.makeOCIProject(pillar=distribution)
+        [git_ref] = self.factory.makeGitRefs()
+        browser = self.getViewBrowser(
+            oci_project, view_name="+new-recipe", user=self.person)
+        browser.getControl(name="field.name").value = "recipe-name"
+        browser.getControl("Description").value = "Recipe description"
+        browser.getControl(name="field.git_ref.repository").value = (
+            git_ref.repository.identity)
+        browser.getControl(name="field.git_ref.path").value = git_ref.path
+        official_control = browser.getControl("Official recipe")
+        official_control.selected = True
+        browser.getControl("Create OCI recipe").click()
+
+        error_message = (
+            "You do not have permission to set the official status "
+            "of this recipe.")
+        self.assertIn(error_message, browser.contents)
+
 
 class TestOCIRecipeAdminView(BaseTestOCIRecipeView):
 
@@ -751,6 +862,69 @@ class TestOCIRecipeEditView(OCIConfigHelperMixin, BaseTestOCIRecipeView):
             self.assertNotIn(wrong_namespace_msg, browser.contents)
             self.assertIn(wrong_ref_path_msg, browser.contents)
 
+    def test_official_is_disabled(self):
+        oci_project = self.factory.makeOCIProject()
+        recipe = self.factory.makeOCIRecipe(
+            registrant=self.person, owner=self.person,
+            oci_project=oci_project)
+
+        browser = self.getViewBrowser(recipe, user=self.person)
+        browser.getLink("Edit OCI recipe").click()
+        official_control = browser.getControl("Official recipe")
+        self.assertTrue(official_control.disabled)
+
+    def test_official_is_enabled(self):
+        distribution = self.factory.makeDistribution(
+            oci_project_admin=self.person)
+        oci_project = self.factory.makeOCIProject(pillar=distribution)
+        recipe = self.factory.makeOCIRecipe(
+            registrant=self.person, owner=self.person,
+            oci_project=oci_project)
+
+        browser = self.getViewBrowser(recipe, user=self.person)
+        browser.getLink("Edit OCI recipe").click()
+        official_control = browser.getControl("Official recipe")
+        self.assertFalse(official_control.disabled)
+
+    def test_set_official(self):
+        distribution = self.factory.makeDistribution(
+            oci_project_admin=self.person)
+        oci_project = self.factory.makeOCIProject(pillar=distribution)
+        recipe = self.factory.makeOCIRecipe(
+            registrant=self.person, owner=self.person,
+            oci_project=oci_project)
+
+        browser = self.getViewBrowser(recipe, user=self.person)
+        browser.getLink("Edit OCI recipe").click()
+        official_control = browser.getControl("Official recipe")
+        official_control.selected = True
+        browser.getControl("Update OCI recipe").click()
+
+        content = find_main_content(browser.contents)
+        self.assertThat(
+            "Official recipe:\nYes",
+            MatchesTagText(content, "official-recipe"))
+
+    def test_set_official_no_permissions(self):
+        distro_owner = self.factory.makePerson()
+        distribution = self.factory.makeDistribution(
+            oci_project_admin=distro_owner)
+        oci_project = self.factory.makeOCIProject(pillar=distribution)
+        recipe = self.factory.makeOCIRecipe(
+            registrant=self.person, owner=self.person,
+            oci_project=oci_project)
+
+        browser = self.getViewBrowser(recipe, user=self.person)
+        browser.getLink("Edit OCI recipe").click()
+        official_control = browser.getControl("Official recipe")
+        official_control.selected = True
+        browser.getControl("Update OCI recipe").click()
+
+        error_message = (
+            "You do not have permission to change the official status "
+            "of this recipe.")
+        self.assertIn(error_message, browser.contents)
+
 
 class TestOCIRecipeDeleteView(BaseTestOCIRecipeView):
 
@@ -901,6 +1075,8 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             Build file path: Dockerfile
             Build context directory: %s
             Build schedule: Built on request
+            Official recipe:
+            No
             Latest builds
             Status When complete Architecture
             Successfully built 30 minutes ago 386
@@ -934,6 +1110,8 @@ class TestOCIRecipeView(BaseTestOCIRecipeView):
             Build context directory: %s
             Build schedule: Built on request
             Build-time\nARG variables: VAR1=123 VAR2=XXX
+            Official recipe:
+            No
             Latest builds
             Status When complete Architecture
             Successfully built 30 minutes ago 386
diff --git a/lib/lp/oci/templates/ocirecipe-index.pt b/lib/lp/oci/templates/ocirecipe-index.pt
index 9a9aefc..a3e67bb 100644
--- a/lib/lp/oci/templates/ocirecipe-index.pt
+++ b/lib/lp/oci/templates/ocirecipe-index.pt
@@ -81,6 +81,13 @@
           <pre tal:content="build_args" />
         </dd>
       </dl>
+      <dl id="official-recipe">
+        <dt>Official recipe:</dt>
+        <dd>
+          <span tal:condition="context/official">Yes</span>
+          <span tal:condition="not: context/official">No</span>
+        </dd>
+      </dl>
     </div>
 
     <h2>Latest builds</h2>
diff --git a/lib/lp/oci/templates/ocirecipe-new.pt b/lib/lp/oci/templates/ocirecipe-new.pt
index 1cae71e..00ed4e2 100644
--- a/lib/lp/oci/templates/ocirecipe-new.pt
+++ b/lib/lp/oci/templates/ocirecipe-new.pt
@@ -41,6 +41,9 @@
         <tal:widget define="widget nocall:view/widgets/processors">
           <metal:block use-macro="context/@@launchpad_form/widget_row" />
         </tal:widget>
+        <tal:widget define="widget nocall:view/widgets/official_recipe">
+          <metal:block use-macro="context/@@launchpad_form/widget_row" />
+        </tal:widget>
       </table>
     </metal:formbody>
   </div>
diff --git a/lib/lp/oci/tests/test_ocirecipe.py b/lib/lp/oci/tests/test_ocirecipe.py
index 59bd465..1cb69af 100644
--- a/lib/lp/oci/tests/test_ocirecipe.py
+++ b/lib/lp/oci/tests/test_ocirecipe.py
@@ -592,27 +592,27 @@ class TestOCIRecipe(OCIConfigHelperMixin, TestCaseWithFactory):
                 oci_project=oci_project2, registrant=owner, owner=owner)
             for _ in range(2)]
 
-        self.assertIsNone(oci_project1.getOfficialRecipe())
-        self.assertIsNone(oci_project2.getOfficialRecipe())
+        self.assertTrue(oci_project1.getOfficialRecipes().is_empty())
+        self.assertTrue(oci_project2.getOfficialRecipes().is_empty())
         for recipe in oci_proj1_recipes + oci_proj2_recipes:
             self.assertFalse(recipe.official)
 
         # Set official for project1 and make sure nothing else got changed.
         with StormStatementRecorder() as recorder:
-            oci_project1.setOfficialRecipe(oci_proj1_recipes[0])
-            self.assertEqual(2, recorder.count)
+            oci_project1.setOfficialRecipeStatus(oci_proj1_recipes[0], True)
+            self.assertEqual(1, recorder.count)
 
-        self.assertIsNone(oci_project2.getOfficialRecipe())
+        self.assertTrue(oci_project2.getOfficialRecipes().is_empty())
         self.assertEqual(
-            oci_proj1_recipes[0], oci_project1.getOfficialRecipe())
+            oci_proj1_recipes[0], oci_project1.getOfficialRecipes()[0])
         self.assertTrue(oci_proj1_recipes[0].official)
         for recipe in oci_proj1_recipes[1:] + oci_proj2_recipes:
             self.assertFalse(recipe.official)
 
         # Set back no recipe as official.
         with StormStatementRecorder() as recorder:
-            oci_project1.setOfficialRecipe(None)
-            self.assertEqual(1, recorder.count)
+            oci_project1.setOfficialRecipeStatus(oci_proj1_recipes[0], False)
+            self.assertEqual(0, recorder.count)
 
         for recipe in oci_proj1_recipes + oci_proj2_recipes:
             self.assertFalse(recipe.official)
@@ -630,7 +630,8 @@ class TestOCIRecipe(OCIConfigHelperMixin, TestCaseWithFactory):
             oci_project=oci_project, registrant=owner)
 
         self.assertRaises(
-            ValueError, another_oci_project.setOfficialRecipe, recipe)
+            ValueError, another_oci_project.setOfficialRecipeStatus,
+            recipe, True)
 
     def test_permission_check_on_setOfficialRecipe(self):
         distro = self.factory.makeDistribution()
@@ -642,7 +643,7 @@ class TestOCIRecipe(OCIConfigHelperMixin, TestCaseWithFactory):
         another_user = self.factory.makePerson()
         with person_logged_in(another_user):
             self.assertRaises(
-                Unauthorized, getattr, oci_project, 'setOfficialRecipe')
+                Unauthorized, getattr, oci_project, 'setOfficialRecipeStatus')
 
     def test_oci_project_get_recipe_by_name_and_owner(self):
         owner = self.factory.makePerson()
diff --git a/lib/lp/registry/browser/ociproject.py b/lib/lp/registry/browser/ociproject.py
index a10d9a2..380b94a 100644
--- a/lib/lp/registry/browser/ociproject.py
+++ b/lib/lp/registry/browser/ociproject.py
@@ -234,7 +234,6 @@ class OCIProjectEditView(LaunchpadEditFormView):
     schema = IOCIProject
     field_names = [
         'name',
-        'official_recipe',
         ]
 
     def setUpFields(self):
@@ -247,14 +246,6 @@ class OCIProjectEditView(LaunchpadEditFormView):
         pillar_field = self.form_fields.get(pillar_key).field
         pillar_field.required = True
 
-    def extendFields(self):
-        official_recipe = self.context.getOfficialRecipe()
-        self.form_fields += form.Fields(
-            Choice(
-                __name__="official_recipe", title=u"Official recipe",
-                required=False, vocabulary="OCIRecipe",
-                default=official_recipe))
-
     @property
     def label(self):
         return 'Edit %s OCI project' % self.context.name
@@ -277,9 +268,7 @@ class OCIProjectEditView(LaunchpadEditFormView):
 
     @action('Update OCI project', name='update')
     def update_action(self, action, data):
-        official_recipe = data.pop("official_recipe")
         self.updateContextFromData(data)
-        self.context.setOfficialRecipe(official_recipe)
 
     @property
     def next_url(self):
diff --git a/lib/lp/registry/browser/tests/test_ociproject.py b/lib/lp/registry/browser/tests/test_ociproject.py
index 3743465..a8b4113 100644
--- a/lib/lp/registry/browser/tests/test_ociproject.py
+++ b/lib/lp/registry/browser/tests/test_ociproject.py
@@ -154,11 +154,9 @@ class TestOCIProjectEditView(BrowserTestCase):
 
     layer = DatabaseFunctionalLayer
 
-    def submitEditForm(self, browser, name, official_recipe=''):
+    def submitEditForm(self, browser, name):
         browser.getLink("Edit OCI project").click()
         browser.getControl(name="field.name").value = name
-        browser.getControl(name="field.official_recipe").value = (
-            official_recipe)
         browser.getControl("Update OCI project").click()
 
     def test_edit_oci_project(self):
@@ -253,7 +251,7 @@ class TestOCIProjectEditView(BrowserTestCase):
             view = create_initialized_view(
                 oci_project, name="+edit", principal=oci_project.pillar.owner)
             view.update_action.success(
-                {"name": "changed", "official_recipe": None})
+                {"name": "changed"})
         self.assertSqlAttributeEqualsDate(
             oci_project, "date_last_modified", UTC_NOW)
 
@@ -280,70 +278,6 @@ class TestOCIProjectEditView(BrowserTestCase):
             extract_text(find_tags_by_class(browser.contents, "message")[1]),
             "Invalid name 'invalid name'.")
 
-    def test_edit_oci_project_setting_official_recipe(self):
-        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
-
-        with admin_logged_in():
-            oci_project = self.factory.makeOCIProject()
-            user = oci_project.pillar.owner
-            recipe1 = self.factory.makeOCIRecipe(
-                registrant=user, owner=user, oci_project=oci_project)
-            recipe2 = self.factory.makeOCIRecipe(
-                registrant=user, owner=user, oci_project=oci_project)
-
-            name_value = oci_project.name
-            recipe_value = "%s/%s" % (user.name, recipe1.name)
-
-        browser = self.getViewBrowser(oci_project, user=user)
-        self.submitEditForm(browser, name_value, recipe_value)
-
-        with admin_logged_in():
-            self.assertEqual(recipe1, oci_project.getOfficialRecipe())
-            self.assertTrue(recipe1.official)
-            self.assertFalse(recipe2.official)
-
-    def test_edit_oci_project_overriding_official_recipe(self):
-        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
-        with admin_logged_in():
-            oci_project = self.factory.makeOCIProject()
-            user = oci_project.pillar.owner
-            recipe1 = self.factory.makeOCIRecipe(
-                registrant=user, owner=user, oci_project=oci_project)
-            recipe2 = self.factory.makeOCIRecipe(
-                registrant=user, owner=user, oci_project=oci_project)
-
-            # Sets recipe1 as the current official one
-            oci_project.setOfficialRecipe(recipe1)
-
-            # And we will try to set recipe2 as the new official.
-            name_value = oci_project.name
-            recipe_value = "%s/%s" % (user.name, recipe2.name)
-
-        browser = self.getViewBrowser(oci_project, user=user)
-        self.submitEditForm(browser, name_value, recipe_value)
-
-        with admin_logged_in():
-            self.assertEqual(recipe2, oci_project.getOfficialRecipe())
-            self.assertFalse(recipe1.official)
-            self.assertTrue(recipe2.official)
-
-    def test_edit_oci_project_unsetting_official_recipe(self):
-        self.useFixture(FeatureFixture({OCI_RECIPE_ALLOW_CREATE: 'on'}))
-        with admin_logged_in():
-            oci_project = self.factory.makeOCIProject()
-            user = oci_project.pillar.owner
-            recipe = self.factory.makeOCIRecipe(
-                registrant=user, owner=user, oci_project=oci_project)
-            oci_project.setOfficialRecipe(recipe)
-            name_value = oci_project.name
-
-        browser = self.getViewBrowser(oci_project, user=user)
-        self.submitEditForm(browser, name_value, '')
-
-        with admin_logged_in():
-            self.assertEqual(None, oci_project.getOfficialRecipe())
-            self.assertFalse(recipe.official)
-
 
 class TestOCIProjectAddView(BrowserTestCase):
 
diff --git a/lib/lp/registry/interfaces/ociproject.py b/lib/lp/registry/interfaces/ociproject.py
index cf4abef..718b9d7 100644
--- a/lib/lp/registry/interfaces/ociproject.py
+++ b/lib/lp/registry/interfaces/ociproject.py
@@ -95,8 +95,8 @@ class IOCIProjectView(IHasGitRepositories, Interface):
     def searchRecipes(query):
         """Searches for recipes in this OCI project."""
 
-    def getOfficialRecipe():
-        """Gets the official recipe for this OCI project."""
+    def getOfficialRecipes():
+        """Gets the official recipes for this OCI project."""
 
     def getDefaultGitRepository(person):
         """Returns the default git repository for the given user under the
@@ -147,9 +147,8 @@ class IOCIProjectEdit(Interface):
                   status=SeriesStatus.DEVELOPMENT, date_created=DEFAULT):
         """Creates a new `IOCIProjectSeries`."""
 
-    def setOfficialRecipe(recipe):
-        """Sets the given recipe as the official one. If recipe is None,
-        the current official recipe will be unset."""
+    def setOfficialRecipeStatus(recipe, status):
+        """Change whether an OCI Recipe is official or not for this project."""
 
 
 class IOCIProjectLegitimate(Interface):
diff --git a/lib/lp/registry/model/ociproject.py b/lib/lp/registry/model/ociproject.py
index 4526724..46ea7da 100644
--- a/lib/lp/registry/model/ociproject.py
+++ b/lib/lp/registry/model/ociproject.py
@@ -200,12 +200,12 @@ class OCIProject(BugTargetBase, StormBase):
             Person.name.contains_string(query))
         return q.order_by(Person.name, OCIRecipe.name)
 
-    def getOfficialRecipe(self):
+    def getOfficialRecipes(self):
         """See `IOCIProject`."""
         from lp.oci.model.ocirecipe import OCIRecipe
-        return self.getRecipes().find(OCIRecipe._official == True).one()
+        return self.getRecipes().find(OCIRecipe._official == True)
 
-    def setOfficialRecipe(self, recipe):
+    def setOfficialRecipeStatus(self, recipe, status):
         """See `IOCIProject`."""
         if recipe is not None and recipe.oci_project != self:
             raise ValueError(
@@ -215,12 +215,7 @@ class OCIProject(BugTargetBase, StormBase):
         # attribute not declared on the Interface, and we need to set it
         # regardless of security checks on OCIRecipe objects.
         recipe = removeSecurityProxy(recipe)
-        previous = removeSecurityProxy(self.getOfficialRecipe())
-        if previous != recipe:
-            if previous is not None:
-                previous._official = False
-            if recipe is not None:
-                recipe._official = True
+        recipe._official = status
 
     def getDefaultGitRepository(self, person):
         namespace = getUtility(IGitNamespaceSet).get(person, oci_project=self)