From 843bca0784fba4ada8ed5f015630e68b23aea493 Mon Sep 17 00:00:00 2001 From: Fred Lotter Date: Fri, 23 Aug 2024 12:30:14 +0200 Subject: [PATCH] Review feedback group 1 --- internals/overlord/planstate/manager.go | 6 ------ internals/overlord/planstate/manager_test.go | 6 +++--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/internals/overlord/planstate/manager.go b/internals/overlord/planstate/manager.go index bb5e3de0..a4fb4414 100644 --- a/internals/overlord/planstate/manager.go +++ b/internals/overlord/planstate/manager.go @@ -48,12 +48,6 @@ func NewManager(layersDir string) (*PlanManager, error) { return manager, nil } -// RegisterExtension adds a plan extension which extends the plan schema. All -// extensions must be registered before Load() is called. -func (m *PlanManager) RegisterExtension(field string, ext plan.LayerSectionExtension) { - plan.RegisterExtension(field, ext) -} - // Load reads plan layers from the pebble directory, combines and validates the // final plan, and finally notifies registered managers of the plan update. In // the case of a non-existent layers directory, or no layers in the layers diff --git a/internals/overlord/planstate/manager_test.go b/internals/overlord/planstate/manager_test.go index fb441f1e..567d4831 100644 --- a/internals/overlord/planstate/manager_test.go +++ b/internals/overlord/planstate/manager_test.go @@ -113,7 +113,7 @@ func (ps *planSuite) TestExtLoadLayers(c *C) { var err error ps.planMgr, err = planstate.NewManager(ps.layersDir) c.Assert(err, IsNil) - ps.planMgr.RegisterExtension(testField, testExtension{}) + plan.RegisterExtension(testField, testExtension{}) // Write layers for _, l := range extLoadLayers { ps.writeLayer(c, string(reindent(l))) @@ -227,7 +227,7 @@ func (ps *planSuite) TestExtAppendLayers(c *C) { var err error ps.planMgr, err = planstate.NewManager(ps.layersDir) c.Assert(err, IsNil) - ps.planMgr.RegisterExtension(testField, testExtension{}) + plan.RegisterExtension(testField, testExtension{}) // Append a layer when there are no layers. layer := ps.parseLayer(c, 0, "label1", ` @@ -465,7 +465,7 @@ func (ps *planSuite) TestExtCombineLayers(c *C) { var err error ps.planMgr, err = planstate.NewManager(ps.layersDir) c.Assert(err, IsNil) - ps.planMgr.RegisterExtension(testField, testExtension{}) + plan.RegisterExtension(testField, testExtension{}) // "Combine" layer with no layers should just append. layer := ps.parseLayer(c, 0, "label1", `