Skip to content

Commit 8ed2754

Browse files
committed
trivial: rename functions for documentation
Signed-off-by: Anders F Björklund <[email protected]>
1 parent 287b070 commit 8ed2754

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
@@ -329,7 +329,7 @@ func GenerateCloudConfig(instDir, name string, y *limayaml.LimaYAML) error {
329329
return err
330330
}
331331

332-
config, err := ExpandTemplate(args)
332+
config, err := ExecuteTemplateCloudConfig(args)
333333
if err != nil {
334334
return err
335335
}
@@ -347,7 +347,7 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
347347
return err
348348
}
349349

350-
layout, err := ExecuteTemplate(args)
350+
layout, err := ExecuteTemplateCIDataISO(args)
351351
if err != nil {
352352
return err
353353
}

pkg/cidata/template.go

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

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

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

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)