Skip to content

Commit eea8427

Browse files
committed
Avoid using nil bool pointer in cidata tests
Signed-off-by: Anders F Björklund <[email protected]>
1 parent 9429164 commit eea8427

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pkg/cidata/template.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ func ValidateTemplateArgs(args TemplateArgs) error {
112112
return fmt.Errorf("field mounts[%d] must be absolute, got %q", i, f)
113113
}
114114
}
115+
if args.CACerts.RemoveDefaults == nil {
116+
return errors.New("field CACerts.RemoveDefaults must be set")
117+
}
115118
return nil
116119
}
117120

pkg/cidata/template_test.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import (
88
"gotest.tools/v3/assert"
99
)
1010

11+
var defaultRemoveDefaults = false
12+
1113
func TestTemplate(t *testing.T) {
1214
args := TemplateArgs{
1315
Name: "default",
@@ -23,7 +25,8 @@ func TestTemplate(t *testing.T) {
2325
},
2426
MountType: "reverse-sshfs",
2527
CACerts: CACerts{
26-
Trusted: []Cert{},
28+
RemoveDefaults: &defaultRemoveDefaults,
29+
Trusted: []Cert{},
2730
},
2831
}
2932
layout, err := ExecuteTemplate(args)
@@ -56,6 +59,9 @@ func TestTemplate9p(t *testing.T) {
5659
{Tag: "mount1", MountPoint: "/Users/dummy/lima", Type: "9p", Options: "rw,trans=virtio"},
5760
},
5861
MountType: "9p",
62+
CACerts: CACerts{
63+
RemoveDefaults: &defaultRemoveDefaults,
64+
},
5965
}
6066
layout, err := ExecuteTemplate(args)
6167
assert.NilError(t, err)

0 commit comments

Comments
 (0)