Skip to content

Commit 833ed8c

Browse files
committed
trivial: rename functions for documentation
Signed-off-by: Anders F Björklund <[email protected]>
1 parent be1eafe commit 833ed8c

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

pkg/cidata/cidata.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,7 +332,7 @@ func GenerateCloudConfig(instDir, name string, instConfig *limayaml.LimaYAML) er
332332
return err
333333
}
334334

335-
config, err := ExpandTemplate(args)
335+
config, err := ExecuteTemplateCloudConfig(args)
336336
if err != nil {
337337
return err
338338
}
@@ -350,7 +350,7 @@ func GenerateISO9660(instDir, name string, instConfig *limayaml.LimaYAML, udpDNS
350350
return err
351351
}
352352

353-
layout, err := ExecuteTemplate(args)
353+
layout, err := ExecuteTemplateCIDataISO(args)
354354
if err != nil {
355355
return err
356356
}

pkg/cidata/template.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ func ValidateTemplateArgs(args *TemplateArgs) error {
123123
return nil
124124
}
125125

126-
func ExpandTemplate(args *TemplateArgs) ([]byte, error) {
126+
func ExecuteTemplateCloudConfig(args *TemplateArgs) ([]byte, error) {
127127
if err := ValidateTemplateArgs(args); err != nil {
128128
return nil, err
129129
}
130130
return textutil.ExecuteTemplate(cloudConfigYaml, args)
131131
}
132132

133-
func ExecuteTemplate(args *TemplateArgs) ([]iso9660util.Entry, error) {
133+
func ExecuteTemplateCIDataISO(args *TemplateArgs) ([]iso9660util.Entry, error) {
134134
if err := ValidateTemplateArgs(args); err != nil {
135135
return nil, err
136136
}

pkg/cidata/template_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestConfig(t *testing.T) {
2424
RemoveDefaults: &defaultRemoveDefaults,
2525
},
2626
}
27-
config, err := ExpandTemplate(args)
27+
config, err := ExecuteTemplateCloudConfig(args)
2828
assert.NilError(t, err)
2929
t.Log(string(config))
3030
}
@@ -48,7 +48,7 @@ func TestTemplate(t *testing.T) {
4848
Trusted: []Cert{},
4949
},
5050
}
51-
layout, err := ExecuteTemplate(args)
51+
layout, err := ExecuteTemplateCIDataISO(args)
5252
assert.NilError(t, err)
5353
for _, f := range layout {
5454
t.Logf("=== %q ===", f.Path)
@@ -82,7 +82,7 @@ func TestTemplate9p(t *testing.T) {
8282
RemoveDefaults: &defaultRemoveDefaults,
8383
},
8484
}
85-
layout, err := ExecuteTemplate(args)
85+
layout, err := ExecuteTemplateCIDataISO(args)
8686
assert.NilError(t, err)
8787
for _, f := range layout {
8888
t.Logf("=== %q ===", f.Path)

0 commit comments

Comments
 (0)