Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(planstate): add plan section support #489

Merged
merged 5 commits into from
Aug 30, 2024
Merged

feat(planstate): add plan section support #489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d64576
feat(planstate): add extension support
flotter Aug 1, 2024
4dd751c
Review feedback group 1
flotter Aug 23, 2024
d85f57a
simplify extension registration in tests
flotter Aug 28, 2024
38856a9
simplify test code
flotter Aug 29, 2024
5966f30
naming tweak
flotter Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions internals/overlord/planstate/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,7 @@ func (m *PlanManager) updatePlanLayers(layers []*plan.Layer) (*plan.Plan, error)
Services: combined.Services,
Checks: combined.Checks,
LogTargets: combined.LogTargets,
Sections: combined.Sections,
benhoyt marked this conversation as resolved.
Show resolved Hide resolved
}
err = p.Validate()
if err != nil {
Expand Down
118 changes: 118 additions & 0 deletions internals/overlord/planstate/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ var loadLayers = []string{`
summary: Svc1
override: replace
command: echo svc1
test-field:
test1:
override: merge
a: something
`, `
summary: Layer 2
description: Layer 2 desc.
Expand All @@ -53,9 +57,15 @@ var loadLayers = []string{`
summary: Svc2
override: replace
command: echo svc2
test-field:
test1:
override: merge
b: something else
`}

func (ps *planSuite) TestLoadLayers(c *C) {
plan.RegisterSectionExtension(testField, testExtension{})
defer plan.UnregisterSectionExtension(testField)
var err error
ps.planMgr, err = planstate.NewManager(ps.layersDir)
c.Assert(err, IsNil)
Expand All @@ -80,10 +90,17 @@ services:
summary: Svc2
override: replace
command: echo svc2
test-field:
test1:
override: merge
a: something
b: something else
`[1:])
}

func (ps *planSuite) TestAppendLayers(c *C) {
plan.RegisterSectionExtension(testField, testExtension{})
defer plan.UnregisterSectionExtension(testField)
var err error
ps.planMgr, err = planstate.NewManager(ps.layersDir)
c.Assert(err, IsNil)
Expand All @@ -94,6 +111,10 @@ services:
svc1:
override: replace
command: /bin/sh
test-field:
test1:
override: replace
a: something
`)
err = ps.planMgr.AppendLayer(layer)
c.Assert(err, IsNil)
Expand All @@ -103,6 +124,10 @@ services:
svc1:
override: replace
command: /bin/sh
test-field:
test1:
override: replace
a: something
`[1:])
ps.planLayersHasLen(c, 1)

Expand All @@ -112,6 +137,10 @@ services:
svc1:
override: foobar
command: /bin/bar
test-field:
test1:
override: foobar
a: something else
`)
err = ps.planMgr.AppendLayer(layer)
c.Assert(err.(*planstate.LabelExists).Label, Equals, "label1")
Expand All @@ -120,6 +149,10 @@ services:
svc1:
override: replace
command: /bin/sh
test-field:
test1:
override: replace
a: something
`[1:])
ps.planLayersHasLen(c, 1)

Expand All @@ -129,6 +162,10 @@ services:
svc1:
override: replace
command: /bin/bash
test-field:
test1:
override: replace
a: else
`)
err = ps.planMgr.AppendLayer(layer)
c.Assert(err, IsNil)
Expand All @@ -138,6 +175,10 @@ services:
svc1:
override: replace
command: /bin/bash
test-field:
test1:
override: replace
a: else
`[1:])
ps.planLayersHasLen(c, 2)

Expand All @@ -147,6 +188,10 @@ services:
svc2:
override: replace
command: /bin/foo
test-field:
test2:
override: replace
a: something
`)
err = ps.planMgr.AppendLayer(layer)
c.Assert(err, IsNil)
Expand All @@ -159,11 +204,20 @@ services:
svc2:
override: replace
command: /bin/foo
test-field:
test1:
override: replace
a: else
test2:
override: replace
a: something
`[1:])
ps.planLayersHasLen(c, 3)
}

func (ps *planSuite) TestCombineLayers(c *C) {
plan.RegisterSectionExtension(testField, testExtension{})
defer plan.UnregisterSectionExtension(testField)
var err error
ps.planMgr, err = planstate.NewManager(ps.layersDir)
c.Assert(err, IsNil)
Expand All @@ -174,6 +228,10 @@ services:
svc1:
override: replace
command: /bin/sh
test-field:
test1:
override: replace
a: something
`)
err = ps.planMgr.CombineLayer(layer)
c.Assert(err, IsNil)
Expand All @@ -183,6 +241,10 @@ services:
svc1:
override: replace
command: /bin/sh
test-field:
test1:
override: replace
a: something
`[1:])
ps.planLayersHasLen(c, 1)

Expand All @@ -192,6 +254,10 @@ services:
svc2:
override: replace
command: /bin/foo
test-field:
test2:
override: replace
a: else
`)
err = ps.planMgr.CombineLayer(layer)
c.Assert(err, IsNil)
Expand All @@ -204,6 +270,13 @@ services:
svc2:
override: replace
command: /bin/foo
test-field:
test1:
override: replace
a: something
test2:
override: replace
a: else
`[1:])
ps.planLayersHasLen(c, 2)

Expand All @@ -213,6 +286,10 @@ services:
svc1:
override: replace
command: /bin/bash
test-field:
test1:
override: replace
a: else
`)
err = ps.planMgr.CombineLayer(layer)
c.Assert(err, IsNil)
Expand All @@ -225,6 +302,13 @@ services:
svc2:
override: replace
command: /bin/foo
test-field:
test1:
override: replace
a: else
test2:
override: replace
a: else
`[1:])
ps.planLayersHasLen(c, 2)

Expand All @@ -234,6 +318,10 @@ services:
svc2:
override: replace
command: /bin/bar
test-field:
test2:
override: replace
a: something
`)
err = ps.planMgr.CombineLayer(layer)
c.Assert(err, IsNil)
Expand All @@ -246,6 +334,13 @@ services:
svc2:
override: replace
command: /bin/bar
test-field:
test1:
override: replace
a: else
test2:
override: replace
a: something
`[1:])
ps.planLayersHasLen(c, 2)

Expand All @@ -258,6 +353,13 @@ services:
svc2:
override: replace
command: /bin/b
test-field:
test1:
override: replace
a: nothing
test2:
override: replace
a: nothing
`)
err = ps.planMgr.CombineLayer(layer)
c.Assert(err, IsNil)
Expand All @@ -270,6 +372,13 @@ services:
svc2:
override: replace
command: /bin/b
test-field:
test1:
override: replace
a: nothing
test2:
override: replace
a: nothing
`[1:])
ps.planLayersHasLen(c, 3)

Expand All @@ -283,6 +392,15 @@ checks:
port: 8080
`))
c.Check(err, ErrorMatches, `(?s).*plan check.*must be "alive" or "ready".*`)

// Make sure that layer validation is happening for extensions.
layer, err = plan.ParseLayer(0, "label4", []byte(`
test-field:
my1:
override: replace
a: nothing
`))
c.Check(err, ErrorMatches, `.*entry names must start with.*`)
}

func (ps *planSuite) TestSetServiceArgs(c *C) {
Expand Down
Loading
Loading