Forráskód Böngészése

dependency resolver fix and stderr

Mohammed Nafees 3 éve
szülő
commit
2ff83066f5
2 módosított fájl, 7 hozzáadás és 5 törlés
  1. 1 1
      cli/cmd/apply.go
  2. 6 4
      internal/integrations/preview/dep_resolver.go

+ 1 - 1
cli/cmd/apply.go

@@ -81,7 +81,7 @@ var applyValidateCmd = &cobra.Command{
 		err := applyValidate()
 
 		if err != nil {
-			color.New(color.FgRed).Printf("Error: %s\n", err.Error())
+			color.New(color.FgRed).Fprintf(os.Stderr, "Error: %s\n", err.Error())
 			os.Exit(1)
 		} else {
 			color.New(color.FgGreen).Printf("The porter.yaml file is valid!\n")

+ 6 - 4
internal/integrations/preview/dep_resolver.go

@@ -34,10 +34,12 @@ func (r *dependencyResolver) Resolve() error {
 			r.graph[resource.Name] = append(r.graph[resource.Name], resource.DependsOn...)
 		}
 
-		err := r.depResolve(r.resources[0].Name)
+		for _, resource := range r.resources {
+			err := r.depResolve(resource.Name)
 
-		if err != nil {
-			return err
+			if err != nil {
+				return err
+			}
 		}
 	}
 
@@ -49,7 +51,7 @@ func (r *dependencyResolver) depResolve(name string) error {
 
 	for _, dep := range r.graph[name] {
 		if _, ok := r.graph[dep]; !ok {
-			return fmt.Errorf("no such resource as: '%s'", dep)
+			return fmt.Errorf("for resource '%s': invalid dependency '%s'", name, dep)
 		}
 
 		if _, ok := r.resolved[dep]; !ok {