removed required from LabelFile

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

Author: idsulik

loader/example1.label

@@ -0,0 +1,10 @@
+# passed through
+FOO=foo_from_label_file
+LABEL.WITH.DOT=ok
+LABEL_WITH_UNDERSCORE=ok
+
+# overridden in example2.label
+BAR=bar_from_label_file
+
+# overridden in full-example.yml
+BAZ=baz_from_label_file

loader/example2.label

@@ -0,0 +1,4 @@
+BAR=bar_from_label_file_2
+
+# overridden in configDetails.Labels
+QUX=quz_from_label_file_2

loader/full-example.yml

@@ -210,6 +210,10 @@ services:
     #   - "com.example.number=42"
     #   - "com.example.empty-label"
 
+    label_file:
+      - ./example1.label
+      - ./example2.label
+
     links:
      - db
      - db:database

loader/full-struct_test.go

@@ -217,10 +217,24 @@ func services(workingDir, homeDir string) types.Services {
 			Ipc:      "host",
 			Uts:      "host",
 			Labels: map[string]string{
+				"FOO":                     "foo_from_label_file",
+				"BAR":                     "bar_from_label_file_2",
+				"BAZ":                     "baz_from_label_file",
+				"QUX":                     "quz_from_label_file_2",
+				"LABEL.WITH.DOT":          "ok",
+				"LABEL_WITH_UNDERSCORE":   "ok",
 				"com.example.description": "Accounting webapp",
 				"com.example.number":      "42",
 				"com.example.empty-label": "",
 			},
+			LabelFiles: []types.LabelFile{
+				{
+					Path: filepath.Join(workingDir, "example1.label"),
+				},
+				{
+					Path: filepath.Join(workingDir, "example2.label"),
+				},
+			},
 			Links: []string{
 				"db",
 				"db:database",
@@ -770,9 +784,18 @@ services:
     image: redis
     ipc: host
     labels:
+      BAR: bar_from_label_file_2
+      BAZ: baz_from_label_file
+      FOO: foo_from_label_file
+      LABEL.WITH.DOT: ok
+      LABEL_WITH_UNDERSCORE: ok
+      QUX: quz_from_label_file_2
       com.example.description: Accounting webapp
       com.example.empty-label: ""
       com.example.number: "42"
+    label_file:
+      - %s
+      - %s
     links:
       - db
       - db:database
@@ -1058,6 +1081,8 @@ x-nested:
 		filepath.Join(workingDir, "bar"),
 		filepath.Join(workingDir, "example1.env"),
 		filepath.Join(workingDir, "example2.env"),
+		filepath.Join(workingDir, "example1.label"),
+		filepath.Join(workingDir, "example2.label"),
 		workingDir,
 		filepath.Join(workingDir, "static"),
 		filepath.Join(homeDir, "configs"),
@@ -1382,10 +1407,20 @@ func fullExampleJSON(workingDir, homeDir string) string {
       "image": "redis",
       "ipc": "host",
       "labels": {
+        "BAR": "bar_from_label_file_2",
+        "BAZ": "baz_from_label_file",
+        "FOO": "foo_from_label_file",
+        "LABEL.WITH.DOT": "ok",
+        "LABEL_WITH_UNDERSCORE": "ok",
+        "QUX": "quz_from_label_file_2",
         "com.example.description": "Accounting webapp",
         "com.example.empty-label": "",
         "com.example.number": "42"
       },
+      "label_file": [
+        "%s",
+        "%s"
+      ],
       "links": [
         "db",
         "db:database",
@@ -1707,6 +1742,8 @@ func fullExampleJSON(workingDir, homeDir string) string {
 		toPath(workingDir, "bar"),
 		toPath(workingDir, "example1.env"),
 		toPath(workingDir, "example2.env"),
+		toPath(workingDir, "example1.label"),
+		toPath(workingDir, "example2.label"),
 		toPath(workingDir),
 		toPath(workingDir, "static"),
 		toPath(homeDir, "configs"),

loader/loader_test.go

@@ -2332,7 +2332,7 @@ func TestLoadServiceWithLabelFile(t *testing.T) {
 			"test": {
 				Name: "test",
 				LabelFiles: []types.LabelFile{
-					{Path: file.Name(), Required: true},
+					{Path: file.Name()},
 				},
 			},
 		},
@@ -2344,6 +2344,21 @@ func TestLoadServiceWithLabelFile(t *testing.T) {
 	assert.Equal(t, "MY_VALUE", service.Labels["MY_LABEL"])
 }
 
+func TestLoadServiceWithLabelFile_NotExists(t *testing.T) {
+	p := &types.Project{
+		Services: types.Services{
+			"test": {
+				Name: "test",
+				LabelFiles: []types.LabelFile{
+					{Path: "test"},
+				},
+			},
+		},
+	}
+	p, err := p.WithServicesLabelsResolved(false)
+	assert.Error(t, err, "label file test not found: stat test: no such file or directory")
+}
+
 func TestLoadNoSSHInBuildConfig(t *testing.T) {
 	actual, err := loadYAML(`
 name: load-no-ssh-in-build-config

types/labelfile.go

@@ -21,27 +21,16 @@ import (
 )
 
 type LabelFile struct {
-	Path     string `yaml:"path,omitempty" json:"path,omitempty"`
-	Required bool   `yaml:"required" json:"required"`
-	Format   string `yaml:"format,omitempty" json:"format,omitempty"`
+	Path   string `yaml:"path,omitempty" json:"path,omitempty"`
+	Format string `yaml:"format,omitempty" json:"format,omitempty"`
 }
 
 // MarshalYAML makes LabelFile implement yaml.Marshaler
 func (e LabelFile) MarshalYAML() (interface{}, error) {
-	if e.Required {
-		return e.Path, nil
-	}
-	return map[string]any{
-		"path":     e.Path,
-		"required": e.Required,
-	}, nil
+	return e.Path, nil
 }
 
 // MarshalJSON makes LabelFile implement json.Marshaler
 func (e *LabelFile) MarshalJSON() ([]byte, error) {
-	if e.Required {
-		return json.Marshal(e.Path)
-	}
-	// Pass as a value to avoid re-entering this method and use the default implementation
-	return json.Marshal(*e)
+	return json.Marshal(e.Path)
 }

types/project.go

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