Merge pull request #554 from radiofrance/revert-548-fix/GenerateDAG-skipbuild-Dockerfiles-should-be-ignored

Revert "fix(GenerateDAG): Dockerfiles with skipbuild label should be ignored"

Author: antoinegelloz

pkg/dag/dag.go

@@ -1,12 +1,8 @@
 package dag
 
 import (
-	"cmp"
-	"slices"
-	"strings"
 	"sync"
 
-	"github.com/radiofrance/dib/internal/logger"
 	"golang.org/x/sync/errgroup"
 	"gopkg.in/yaml.v3"
 )
@@ -207,23 +203,3 @@ func createUniqueVisitorErr(visitor NodeVisitorFuncErr) NodeVisitorFuncErr {
 
 	return uniqueVisitor
 }
-
-func sort(a, b *Node) int {
-	return cmp.Compare(strings.ToLower(a.Image.ShortName), strings.ToLower(b.Image.ShortName))
-}
-
-func (d *DAG) Sprint(name string) string {
-	d.WalkInDepth(func(node *Node) {
-		slices.SortFunc(node.Children(), sort)
-	})
-	slices.SortFunc(d.nodes, sort)
-	rootNode := &Node{
-		Image:    &Image{Name: name},
-		children: d.nodes,
-	}
-	res, err := defaultPrinter.WithRoot(rootNode).Srender()
-	if err != nil {
-		logger.Fatalf(err.Error())
-	}
-	return res
-}

pkg/dag/node.go

@@ -15,7 +15,6 @@ type NodeVisitorFuncErr func(*Node) error
 // Node represents a node of a graph.
 type Node struct {
 	Image *Image
-	Files []string
 
 	waitCond *sync.Cond
 	done     bool

pkg/dag/printer.go

@@ -47,7 +47,6 @@ func GenerateDAG(buildPath, registryPrefix, customHashListPath string, buildArgs
 
 			skipBuild, hasSkipLabel := dckfile.Labels["skipbuild"]
 			if hasSkipLabel && skipBuild == "true" {
-				allFiles = allFiles[:len(allFiles)-1] // remove the last Dockerfile with skipbuild label
 				return nil
 			}
 			imageShortName, hasNameLabel := dckfile.Labels["name"]
@@ -219,8 +218,7 @@ func generateHashes(graph *dag.DAG, allFiles []string, customHashListPath string
 				}
 			}()
 
-			node.Files = nodeFiles[node]
-			hash, err := HashFiles(node.Image.Dockerfile.ContextPath, node.Files, parentHashes, humanizedKeywords)
+			hash, err := hashFiles(node.Image.Dockerfile.ContextPath, nodeFiles[node], parentHashes, humanizedKeywords)
 			if err != nil {
 				return fmt.Errorf("could not hash files for node %s: %w", node.Image.Name, err)
 			}
@@ -254,10 +252,10 @@ func matchPattern(node *dag.Node, file string) bool {
 	return match
 }
 
-// HashFiles computes the sha256 from the contents of the files passed as argument.
+// hashFiles computes the sha256 from the contents of the files passed as argument.
 // The files are alphabetically sorted so the returned hash is always the same.
 // This also means the hash will change if the file names change but the contents don't.
-func HashFiles(
+func hashFiles(
 	baseDir string,
 	files []string,
 	parentHashes []string,