Skip to content

Commit 14808db

Browse files
committed
Fix cidata user-data ca_certs yaml content
This is failing the cloud-config jsonschema validation, later. $ sudo cloud-init schema --system Error: Cloud config schema errors: ca_certs.remove_defaults: '<nil>' is not of type 'boolean', ca_certs.trusted: None is not of type 'array' Signed-off-by: Anders F Björklund <[email protected]>
1 parent 9d31f2a commit 14808db

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

pkg/cidata/cidata.TEMPLATE.d/user-data

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,20 @@ resolv_conf:
6565

6666
{{ with .CACerts }}
6767
ca_certs:
68+
{{- if .RemoveDefaults}}
6869
remove_defaults: {{ .RemoveDefaults }}
70+
{{- else}}
71+
remove_defaults: false
72+
{{- end }}
73+
{{- if .Trusted}}
6974
trusted:
7075
{{- range $cert := .Trusted }}
7176
- |
7277
{{- range $line := $cert.Lines }}
7378
{{ $line }}
7479
{{- end }}
7580
{{- end }}
81+
{{- end }}
7682
{{- end }}
7783

7884
{{- if .BootCmds }}

pkg/cidata/template_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ func TestTemplate(t *testing.T) {
2323
},
2424
MountType: "reverse-sshfs",
2525
}
26+
assert.Assert(t, args.CACerts.RemoveDefaults == nil)
27+
assert.Assert(t, len(args.CACerts.Trusted) == 0)
2628
layout, err := ExecuteTemplate(args)
2729
assert.NilError(t, err)
2830
for _, f := range layout {
@@ -33,6 +35,9 @@ func TestTemplate(t *testing.T) {
3335
if f.Path == "user-data" {
3436
// mounted later
3537
assert.Assert(t, !strings.Contains(string(b), "mounts:"))
38+
// ca_certs:
39+
assert.Assert(t, !strings.Contains(string(b), "remove_defaults: <nil>"))
40+
assert.Assert(t, !strings.Contains(string(b), "trusted:"))
3641
}
3742
}
3843
}

0 commit comments

Comments
 (0)