cli/compose/types: ServiceVolumeConfig: use strong type for Consistency field

Using a strong type for this field, to make it clearer what's supported,
and to allow assigning values without having to cast them.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Author: thaJeztah

cli/compose/convert/volume.go

@@ -30,7 +30,7 @@ func createMountFromVolume(volume composetypes.ServiceVolumeConfig) mount.Mount
 		Target:      volume.Target,
 		ReadOnly:    volume.ReadOnly,
 		Source:      volume.Source,
-		Consistency: mount.Consistency(volume.Consistency),
+		Consistency: volume.Consistency,
 	}
 }
 
@@ -196,21 +196,17 @@ func handleClusterToMount(
 	return result, nil
 }
 
-func convertVolumeToMount(
-	volume composetypes.ServiceVolumeConfig,
-	stackVolumes volumes,
-	namespace Namespace,
-) (mount.Mount, error) {
+func convertVolumeToMount(volume composetypes.ServiceVolumeConfig, stackVolumes volumes, namespace Namespace) (mount.Mount, error) {
 	switch volume.Type {
-	case "volume", "":
+	case mount.TypeVolume, "":
 		return handleVolumeToMount(volume, stackVolumes, namespace)
-	case "bind":
+	case mount.TypeBind:
 		return handleBindToMount(volume)
-	case "tmpfs":
+	case mount.TypeTmpfs:
 		return handleTmpfsToMount(volume)
-	case "npipe":
+	case mount.TypeNamedPipe:
 		return handleNpipeToMount(volume)
-	case "cluster":
+	case mount.TypeCluster:
 		return handleClusterToMount(volume, stackVolumes, namespace)
 	}
 	return mount.Mount{}, errors.New("volume type must be volume, bind, tmpfs, npipe, or cluster")

cli/compose/types/types.go

@@ -390,7 +390,7 @@ type ServiceVolumeConfig struct {
 	Source      string                `yaml:",omitempty" json:"source,omitempty"`
 	Target      string                `yaml:",omitempty" json:"target,omitempty"`
 	ReadOnly    bool                  `mapstructure:"read_only" yaml:"read_only,omitempty" json:"read_only,omitempty"`
-	Consistency string                `yaml:",omitempty" json:"consistency,omitempty"`
+	Consistency mount.Consistency     `yaml:",omitempty" json:"consistency,omitempty"`
 	Bind        *ServiceVolumeBind    `yaml:",omitempty" json:"bind,omitempty"`
 	Volume      *ServiceVolumeVolume  `yaml:",omitempty" json:"volume,omitempty"`
 	Tmpfs       *ServiceVolumeTmpfs   `yaml:",omitempty" json:"tmpfs,omitempty"`