include: import disabled services for proper profile activation (#448)

ndeloof · web-flow · commit cda4df5894be · 2023-08-25T08:53:55.000-04:00
Signed-off-by: Nicolas De Loof &lt;nicolas.deloof@gmail.com&gt;
diff --git a/loader/include.go b/loader/include.go
@@ -114,6 +114,12 @@ func importResources(model *types.Config, imported *types.Project, path []string
 		}
 		model.Services = append(model.Services, service)
 	}
+	for _, service := range imported.DisabledServices {
+		if _, ok := services[service.Name]; ok {
+			return fmt.Errorf("imported compose file %s defines conflicting service %s", path, service.Name)
+		}
+		model.Services = append(model.Services, service)
+	}
 	for n, network := range imported.Networks {
 		if _, ok := model.Networks[n]; ok {
 			return fmt.Errorf("imported compose file %s defines conflicting network %s", path, n)

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,12 @@ func importResources(model types.Config, imported types.Project, path []string`
`114`	`114`	`}`
`115`	`115`	`model.Services = append(model.Services, service)`
`116`	`116`	`}`
	`117`	`+ for _, service := range imported.DisabledServices {`
	`118`	`+ if _, ok := services[service.Name]; ok {`
	`119`	`+ return fmt.Errorf("imported compose file %s defines conflicting service %s", path, service.Name)`
	`120`	`+ }`
	`121`	`+ model.Services = append(model.Services, service)`
	`122`	`+ }`
`117`	`123`	`for n, network := range imported.Networks {`
`118`	`124`	`if _, ok := model.Networks[n]; ok {`
`119`	`125`	`return fmt.Errorf("imported compose file %s defines conflicting network %s", path, n)`