Merge pull request #194 from ndeloof/extends_not_found

ndeloof · web-flow · commit 280b0dce36a9 · 2021-10-11T13:26:07.000+02:00
diff --git a/loader/loader.go b/loader/loader.go
@@ -450,7 +450,12 @@ func loadServiceWithExtends(filename, name string, servicesDict map[string]inter
 		return nil, err
 	}
 
-	serviceConfig, err := LoadService(name, servicesDict[name].(map[string]interface{}), workingDir, lookupEnv, opts.ResolvePaths)
+	target, ok := servicesDict[name]
+	if !ok {
+		return nil, fmt.Errorf("cannot extend service %q in %s: service not found", name, filename)
+	}
+
+	serviceConfig, err := LoadService(name, target.(map[string]interface{}), workingDir, lookupEnv, opts.ResolvePaths)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -450,7 +450,12 @@ func loadServiceWithExtends(filename, name string, servicesDict map[string]inter`
`450`	`450`	`return nil, err`
`451`	`451`	`}`
`452`	`452`
`453`		`- serviceConfig, err := LoadService(name, servicesDict[name].(map[string]interface{}), workingDir, lookupEnv, opts.ResolvePaths)`
	`453`	`+ target, ok := servicesDict[name]`
	`454`	`+ if !ok {`
	`455`	`+ return nil, fmt.Errorf("cannot extend service %q in %s: service not found", name, filename)`
	`456`	`+ }`
	`457`	`+`
	`458`	`+ serviceConfig, err := LoadService(name, target.(map[string]interface{}), workingDir, lookupEnv, opts.ResolvePaths)`
`454`	`459`	`if err != nil {`
`455`	`460`	`return nil, err`
`456`	`461`	`}`