Skip to content

Commit c4970e7

Browse files
committed
refactor(cli/compose/loader): extract ParseVolume() to its own package
Moves ParseVolume() to a new internal package to remove the dependency on cli/compose/loader in cli/command/container/opts.go Signed-off-by: Michael Tews <michael@tews.dev>
1 parent 80be02c commit c4970e7

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

cli/command/container/opts.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"strings"
1313
"time"
1414

15-
"github.com/docker/cli/cli/compose/loader"
1615
"github.com/docker/cli/internal/lazyregexp"
16+
"github.com/docker/cli/internal/parsevolume"
1717
"github.com/docker/cli/opts"
1818
"github.com/docker/go-connections/nat"
1919
"github.com/moby/moby/api/types/container"
@@ -364,7 +364,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con
364364
volumes := copts.volumes.GetMap()
365365
// add any bind targets to the list of container volumes
366366
for bind := range copts.volumes.GetMap() {
367-
parsed, err := loader.ParseVolume(bind)
367+
parsed, err := parsevolume.ParseVolume(bind)
368368
if err != nil {
369369
return nil, err
370370
}

cli/compose/loader/loader.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"github.com/docker/cli/cli/compose/schema"
1818
"github.com/docker/cli/cli/compose/template"
1919
"github.com/docker/cli/cli/compose/types"
20+
"github.com/docker/cli/internal/parsevolume"
2021
"github.com/docker/cli/opts"
2122
"github.com/docker/cli/opts/swarmopts"
2223
"github.com/docker/go-connections/nat"
@@ -756,7 +757,7 @@ var transformBuildConfig TransformerFunc = func(data any) (any, error) {
756757
var transformServiceVolumeConfig TransformerFunc = func(data any) (any, error) {
757758
switch value := data.(type) {
758759
case string:
759-
return ParseVolume(value)
760+
return parsevolume.ParseVolume(value)
760761
case map[string]any:
761762
return data, nil
762763
default:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package loader
1+
package parsevolume
22

33
import (
44
"strings"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package loader
1+
package parsevolume
22

33
import (
44
"fmt"

0 commit comments

Comments
 (0)