Remove empty ca_certs from cloud-config.yaml

Since it is a pointer, it is always true (non-nil).

And structs are always true, so they can't be tested.

Signed-off-by: Anders F Björklund <[email protected]>

Author: afbjorklund

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

@@ -66,6 +66,7 @@ resolv_conf:
   {{- end }}
 {{- end }}
 
+{{- if .CACerts.RemoveDefaults }}
 {{ with .CACerts }}
 ca_certs:
   remove_defaults: {{ .RemoveDefaults }}
@@ -76,6 +77,7 @@ ca_certs:
     {{- range $line := $cert.Lines }}
     {{ $line }}
     {{- end }}
+    {{- end }}
   {{- end }}
   {{- end }}
 {{- end }}

pkg/cidata/cidata.go

@@ -311,6 +311,11 @@ func templateArgs(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort, t
 		args.CACerts.Trusted = append(args.CACerts.Trusted, cert)
 	}
 
+	if !*args.CACerts.RemoveDefaults && len(args.CACerts.Trusted) == 0 {
+		args.CACerts.RemoveDefaults = nil
+		args.CACerts.Trusted = nil
+	}
+
 	args.BootCmds = getBootCmds(y.Provision)
 
 	for _, f := range y.Provision {

pkg/cidata/cloud-config.yaml

@@ -37,6 +37,7 @@ users:
 # resolv_conf is not included here
 {{- end }}
 
+{{- if .CACerts.RemoveDefaults }}
 {{ with .CACerts }}
 ca_certs:
   remove_defaults: {{ .RemoveDefaults }}
@@ -50,6 +51,7 @@ ca_certs:
   {{- end }}
   {{- end }}
 {{- end }}
+{{- end }}
 
 {{- if .BootCmds }}
 bootcmd:

pkg/cidata/template.go

@@ -116,16 +116,14 @@ func ValidateTemplateArgs(args *TemplateArgs) error {
 			return fmt.Errorf("field mounts[%d] must be absolute, got %q", i, f)
 		}
 	}
-	if args.CACerts.RemoveDefaults == nil {
-		return errors.New("field CACerts.RemoveDefaults must be set")
-	}
 	return nil
 }
 
 func ExecuteTemplateCloudConfig(args *TemplateArgs) ([]byte, error) {
 	if err := ValidateTemplateArgs(args); err != nil {
 		return nil, err
 	}
+	}
 	return textutil.ExecuteTemplate(cloudConfigYaml, args)
 }
 

pkg/cidata/template_test.go

@@ -20,9 +20,6 @@ func TestConfig(t *testing.T) {
 			"ssh-rsa dummy [email protected]",
 		},
 		MountType: "reverse-sshfs",
-		CACerts: CACerts{
-			RemoveDefaults: &defaultRemoveDefaults,
-		},
 	}
 	config, err := ExecuteTemplateCloudConfig(args)
 	assert.NilError(t, err)