Skip to content

Commit 6bce3b9

Browse files
committed
make Normalize a public function for third-party usage
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent 5722260 commit 6bce3b9

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

loader/loader.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ func Load(configDetails types.ConfigDetails, options ...func(*Options)) (*types.
233233
}
234234

235235
if !opts.SkipNormalization {
236-
err = normalize(project, opts.ResolvePaths)
236+
err = Normalize(project, opts.ResolvePaths)
237237
if err != nil {
238238
return nil, err
239239
}

loader/normalize.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/sirupsen/logrus"
2929
)
3030

31-
// normalize compose project by moving deprecated attributes to their canonical position and injecting implicit defaults
32-
func normalize(project *types.Project, resolvePaths bool) error {
31+
// Normalize compose project by moving deprecated attributes to their canonical position and injecting implicit defaults
32+
func Normalize(project *types.Project, resolvePaths bool) error {
3333
absWorkingDir, err := filepath.Abs(project.WorkingDir)
3434
if err != nil {
3535
return err

loader/normalize_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ networks:
8282
mynet:
8383
name: myProject_mynet
8484
`
85-
err := normalize(&project, false)
85+
err := Normalize(&project, false)
8686
assert.NilError(t, err)
8787
marshal, err := yaml.Marshal(project)
8888
assert.NilError(t, err)
@@ -118,7 +118,7 @@ networks:
118118
default:
119119
name: myProject_default
120120
`, filepath.Join(wd, "testdata"))
121-
err := normalize(&project, true)
121+
err := Normalize(&project, true)
122122
assert.NilError(t, err)
123123
marshal, err := yaml.Marshal(project)
124124
assert.NilError(t, err)
@@ -142,7 +142,7 @@ func TestNormalizeAbsolutePaths(t *testing.T) {
142142
WorkingDir: absWorkingDir,
143143
ComposeFiles: []string{absComposeFile, absOverrideFile},
144144
}
145-
err := normalize(&project, false)
145+
err := Normalize(&project, false)
146146
assert.NilError(t, err)
147147
assert.DeepEqual(t, expected, project)
148148
}
@@ -180,7 +180,7 @@ func TestNormalizeVolumes(t *testing.T) {
180180
WorkingDir: absCwd,
181181
ComposeFiles: []string{},
182182
}
183-
err := normalize(&project, false)
183+
err := Normalize(&project, false)
184184
assert.NilError(t, err)
185185
assert.DeepEqual(t, expected, project)
186186
}
@@ -236,7 +236,7 @@ networks:
236236
default:
237237
name: myProject_default
238238
`
239-
err := normalize(&project, true)
239+
err := Normalize(&project, true)
240240
assert.NilError(t, err)
241241
marshal, err := yaml.Marshal(project)
242242
assert.NilError(t, err)

0 commit comments

Comments
 (0)