Skip to content

Commit d37c2da

Browse files
author
Kate Osborn
committed
Panic if addition is nil
1 parent a287332 commit d37c2da

File tree

2 files changed

+8
-23
lines changed

2 files changed

+8
-23
lines changed

internal/mode/static/nginx/config/servers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ func createAdditionFileResults(conf dataplane.Configuration) []executeResult {
125125

126126
func createAdditionFileName(addition *dataplane.Addition) string {
127127
if addition == nil {
128-
return ""
128+
panic("addition is nil")
129129
}
130130

131131
return fmt.Sprintf("%s/%s.conf", includesFolder, addition.Identifier)

internal/mode/static/nginx/config/servers_test.go

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2510,29 +2510,14 @@ func TestCreateAdditionFileResults(t *testing.T) {
25102510
}
25112511

25122512
func TestAdditionFilename(t *testing.T) {
2513-
tests := []struct {
2514-
name string
2515-
addition *dataplane.Addition
2516-
expName string
2517-
}{
2518-
{
2519-
name: "nil addition",
2520-
addition: nil,
2521-
expName: "",
2522-
},
2523-
{
2524-
name: "normal addition",
2525-
addition: &dataplane.Addition{Identifier: "my-addition"},
2526-
expName: includesFolder + "/" + "my-addition.conf",
2527-
},
2528-
}
2513+
g := NewWithT(t)
25292514

2530-
for _, test := range tests {
2531-
t.Run(test.name, func(t *testing.T) {
2532-
g := NewWithT(t)
2515+
name := createAdditionFileName(&dataplane.Addition{Identifier: "my-addition"})
2516+
g.Expect(name).To(Equal(includesFolder + "/" + "my-addition.conf"))
25332517

2534-
name := createAdditionFileName(test.addition)
2535-
g.Expect(name).To(Equal(test.expName))
2536-
})
2518+
create := func() {
2519+
_ = createAdditionFileName(nil)
25372520
}
2521+
2522+
g.Expect(create).To(Panic())
25382523
}

0 commit comments

Comments
 (0)