convert LabelFile into slice of strings

Signed-off-by: Suleiman Dibirov <[email protected]>

Author: idsulik

loader/full-struct_test.go

@@ -227,13 +227,9 @@ func services(workingDir, homeDir string) types.Services {
 				"com.example.number":      "42",
 				"com.example.empty-label": "",
 			},
-			LabelFiles: []types.LabelFile{
-				{
-					Path: filepath.Join(workingDir, "example1.label"),
-				},
-				{
-					Path: filepath.Join(workingDir, "example2.label"),
-				},
+			LabelFiles: []string{
+				filepath.Join(workingDir, "example1.label"),
+				filepath.Join(workingDir, "example2.label"),
 			},
 			Links: []string{
 				"db",

loader/loader_test.go

@@ -2331,8 +2331,8 @@ func TestLoadServiceWithLabelFile(t *testing.T) {
 		Services: types.Services{
 			"test": {
 				Name: "test",
-				LabelFiles: []types.LabelFile{
-					{Path: file.Name()},
+				LabelFiles: []string{
+					file.Name(),
 				},
 			},
 		},
@@ -2349,8 +2349,8 @@ func TestLoadServiceWithLabelFile_NotExists(t *testing.T) {
 		Services: types.Services{
 			"test": {
 				Name: "test",
-				LabelFiles: []types.LabelFile{
-					{Path: "test"},
+				LabelFiles: []string{
+					"test",
 				},
 			},
 		},

override/uncity.go

@@ -51,7 +51,6 @@ func init() {
 	unique["services.*.env_file"] = envFileIndexer
 	unique["services.*.expose"] = exposeIndexer
 	unique["services.*.labels"] = keyValueIndexer
-	unique["services.*.label_file"] = labelFileIndexer
 	unique["services.*.links"] = keyValueIndexer
 	unique["services.*.networks.*.aliases"] = keyValueIndexer
 	unique["services.*.networks.*.link_local_ips"] = keyValueIndexer
@@ -228,16 +227,3 @@ func envFileIndexer(y any, p tree.Path) (string, error) {
 	}
 	return "", nil
 }
-
-func labelFileIndexer(y any, p tree.Path) (string, error) {
-	switch value := y.(type) {
-	case string:
-		return value, nil
-	case map[string]any:
-		if pathValue, ok := value["path"]; ok {
-			return pathValue.(string), nil
-		}
-		return "", fmt.Errorf("label path attribute %s is missing", p)
-	}
-	return "", nil
-}

paths/resolve.go

@@ -37,7 +37,7 @@ func ResolveRelativePaths(project map[string]any, base string, remotes []RemoteR
 		"services.*.build.context":               r.absContextPath,
 		"services.*.build.additional_contexts.*": r.absContextPath,
 		"services.*.env_file.*.path":             r.absPath,
-		"services.*.label_file.*.path":           r.absPath,
+		"services.*.label_file.*":                r.absPath,
 		"services.*.extends.file":                r.absExtendsPath,
 		"services.*.develop.watch.*.path":        r.absSymbolicLink,
 		"services.*.volumes.*":                   r.absVolumeMount,

transform/canonical.go

@@ -30,7 +30,6 @@ func init() {
 	transformers["services.*.build.additional_contexts"] = transformKeyValue
 	transformers["services.*.depends_on"] = transformDependsOn
 	transformers["services.*.env_file"] = transformEnvFile
-	transformers["services.*.label_file"] = transformLabelFile
 	transformers["services.*.extends"] = transformExtends
 	transformers["services.*.networks"] = transformServiceNetworks
 	transformers["services.*.volumes.*"] = transformVolumeMount

transform/labelfile.go

@@ -712,12 +712,12 @@ func loadEnvFile(envFile EnvFile, resolve dotenv.LookupFn) (Mapping, error) {
 	return loadMappingFile(envFile.Path, envFile.Format, resolve)
 }
 
-func loadLabelFile(labelFile LabelFile, resolve dotenv.LookupFn) (Mapping, error) {
-	if _, err := os.Stat(labelFile.Path); os.IsNotExist(err) {
-		return nil, fmt.Errorf("label file %s not found: %w", labelFile.Path, err)
+func loadLabelFile(labelFile string, resolve dotenv.LookupFn) (Mapping, error) {
+	if _, err := os.Stat(labelFile); os.IsNotExist(err) {
+		return nil, fmt.Errorf("label file %s not found: %w", labelFile, err)
 	}
 
-	return loadMappingFile(labelFile.Path, labelFile.Format, resolve)
+	return loadMappingFile(labelFile, "", resolve)
 }
 
 func loadMappingFile(path string, format string, resolve dotenv.LookupFn) (Mapping, error) {

types/derived.gen.go

@@ -89,7 +89,7 @@ type ServiceConfig struct {
 	Ipc             string                           `yaml:"ipc,omitempty" json:"ipc,omitempty"`
 	Isolation       string                           `yaml:"isolation,omitempty" json:"isolation,omitempty"`
 	Labels          Labels                           `yaml:"labels,omitempty" json:"labels,omitempty"`
-	LabelFiles      []LabelFile                      `yaml:"label_file,omitempty" json:"label_file,omitempty"`
+	LabelFiles      []string                         `yaml:"label_file,omitempty" json:"label_file,omitempty"`
 	CustomLabels    Labels                           `yaml:"-" json:"-"`
 	Links           []string                         `yaml:"links,omitempty" json:"links,omitempty"`
 	Logging         *LoggingConfig                   `yaml:"logging,omitempty" json:"logging,omitempty"`