New input type: Component (#5)

- Triggers change when that component changed
- Delays action execution until after input component has completed

Makefile

@@ -8,7 +8,7 @@ install: build
 test: build
 	docker-compose down
 	docker-compose up -d
-	KNEGA=../knega KNEGA_TRACE=true KNEGA_ALLOW_INSECURE_REGISTRY=true bats --print-output-on-failure --show-output-of-passing-tests test
+	KNEGA=../knega KNEGA_TRACE=true KNEGA_ALLOW_INSECURE_REGISTRY=true bats --print-output-on-failure test
 	docker-compose down
 
 test-release:

examples/.knega.root.yml

@@ -1,6 +1,6 @@
 componentPaths: ["components"]
-componentSearchDepth: 2
-concurrency: 4
+componentSearchDepth: 1
+concurrency: 8
 
 defaultConfiguration:
   inputs:

examples/components/base-image/.component.yml

@@ -0,0 +1,8 @@
+name: "base-image"
+
+actions:
+  build:
+    commands:
+    - $ROOT/scripts/build.sh
+    - docker tag localhost:5000/$COMPONENT_NAME:$INPUTS_HASH localhost:5000/$COMPONENT_NAME:0.1.0
+    - docker push localhost:5000/$COMPONENT_NAME:0.1.0

examples/components/base-image/Dockerfile

@@ -0,0 +1 @@
+FROM alpine

examples/components/with-dependency-on-example-1/.component.yml

@@ -0,0 +1,11 @@
+name: "with-dependency-on-example-1"
+
+inputs:
+- type: "Files"
+  paths: ["$ROOT/.knega.root.yml"]
+- type: "GitFiles"
+  paths: ["*"]
+- type: "Component"
+  name: "example-1"
+- type: "Component"
+  name: "base-image"

examples/components/with-dependency-on-example-1/Dockerfile

@@ -0,0 +1 @@
+FROM localhost:5000/base-image:0.1.0

examples/components/with-nested-dependency-1/.component.yml

@@ -0,0 +1,11 @@
+name: "with-nested-dependency-1"
+
+inputs:
+- type: "Files"
+  paths: ["$ROOT/.knega.root.yml"]
+- type: "GitFiles"
+  paths: ["*"]
+- type: "Component"
+  name: "with-dependency-on-example-1"
+- type: "Component"
+  name: "base-image"

examples/components/with-nested-dependency-1/Dockerfile

@@ -0,0 +1 @@
+FROM localhost:5000/base-image:0.1.0

internal/configuration/component.go

@@ -25,6 +25,7 @@ type Component struct {
 	Actions      map[string]action
 	InputsHash   string
 	ChangeStatus ChangeStatus
+	Dependencies []string
 }
 
 func initializeComponent(componentPath string, rootConfiguration rootConfiguration, rootPath string) Component {
@@ -38,8 +39,8 @@ func initializeComponent(componentPath string, rootConfiguration rootConfigurati
 	component.Inputs = initializeInputs(configuration.Inputs, componentPath, rootPath)
 	component.Outputs = initializeOutputs(configuration.Outputs)
 	component.Actions = initializeActions(rootConfiguration.DefaultConfiguration.Actions, configuration.Actions)
-	component.InputsHash = calculateHash(component.Inputs)
 	component.ChangeStatus = Unknown
+	component.Dependencies = getComponentDependencies(configuration.Inputs)
 
 	return component
 }
@@ -57,7 +58,20 @@ func initializeComponentConfiguration(componentConfigurationPath string, rootCon
 	return componentConfiguration
 }
 
+func getComponentDependencies(configurationInputs []configurationInput) []string {
+	var dependencies []string
+
+	for _, input := range configurationInputs {
+		if input.Type == "Component" {
+			dependencies = append(dependencies, input.Name)
+		}
+	}
+
+	return dependencies
+}
+
 func (component *Component) HasChanges() bool {
+	component.InputsHash = calculateHash(component.Inputs)
 	hasChanges := false
 	component.ChangeStatus = Pristine
 	variables := map[string]string{
@@ -85,3 +99,8 @@ func calculateHash(inputs []input) string {
 
 	return hex.EncodeToString(checksum)
 }
+
+func (component *Component) calculateHash() {
+	inputsHash := calculateHash(component.Inputs)
+	component.InputsHash = inputsHash
+}

internal/configuration/componentInput.go

@@ -0,0 +1,28 @@
+package configuration
+
+import "log"
+
+type componentInput struct {
+	name string
+}
+
+func (input componentInput) Hash() []byte {
+	repository := GetRepository()
+	var component Component
+	found := false
+	for _, repoComponent := range repository.components {
+		if repoComponent.Name == input.name {
+			component = repoComponent
+			found = true
+		}
+	}
+
+	if !found {
+		log.Fatalf("Input component with name %s could not be found", input.name)
+	}
+
+	// just returning inputshash of that component should be enough if resolved in correct order
+	// return []byte(component.InputsHash)
+	// for now we'll need to rerun the calculation
+	return []byte(calculateHash(component.Inputs))
+}

internal/configuration/configuration.go

@@ -17,6 +17,7 @@ type rootConfiguration struct {
 type configurationInput struct {
 	Type  string   `yaml:"type"`
 	Paths []string `yaml:"paths"`
+	Name  string   `yaml:"name"`
 }
 
 type configurationOutput struct {

internal/configuration/fileInput.go

@@ -0,0 +1,76 @@
+package configuration
+
+import (
+	"crypto/sha512"
+	"io"
+	"log"
+	"os"
+	"path/filepath"
+	"strings"
+)
+
+type fileInput struct {
+	path string
+}
+
+func fileInputPatternsToPaths(patterns []string, rootPath string) []string {
+	var results []string
+
+	for _, pattern := range patterns {
+		pattern = strings.ReplaceAll(pattern, "$ROOT", rootPath)
+		matches, err := filepath.Glob(pattern)
+		if err != nil {
+			log.Fatal(err)
+		}
+		results = append(results, matches...)
+	}
+	return results
+}
+
+func gitFileInputPatternsToPaths(patterns []string, applicationPath string) []string {
+	var results []string
+
+	for _, pattern := range patterns {
+		matches := gitLsFiles(applicationPath, pattern)
+		for _, relativePath := range matches {
+			path := filepath.Join(applicationPath, relativePath)
+			if isFile(path) {
+				results = append(results, path)
+			}
+		}
+	}
+
+	return results
+}
+
+func deDuplicateStringSlice(paths []string) []string {
+	pathMap := make(map[string]string)
+	var results []string
+	for _, path := range paths {
+		exists := pathMap[path]
+		if exists == "" {
+			pathMap[path] = path
+			results = append(results, path)
+		}
+	}
+
+	return results
+}
+
+func (input fileInput) Hash() []byte {
+	file, err := os.Open(input.path)
+	if err != nil {
+		log.Fatal(err)
+	}
+
+	defer file.Close()
+
+	hash := sha512.New384()
+
+	_, copyErr := io.Copy(hash, file)
+	if copyErr != nil {
+		log.Fatal(copyErr)
+	}
+
+	return hash.Sum(nil)
+}

internal/configuration/input.go

@@ -1,65 +1,18 @@
 package configuration
 
 import (
-	"crypto/sha512"
-	"io"
 	"log"
-	"os"
-	"path/filepath"
-	"strings"
 )
 
-type input struct {
-	path string
-}
-
-func fileInputPatternsToPaths(patterns []string, rootPath string) []string {
-	var results []string
-
-	for _, pattern := range patterns {
-		pattern = strings.ReplaceAll(pattern, "$ROOT", rootPath)
-		matches, err := filepath.Glob(pattern)
-		if err != nil {
-			log.Fatal(err)
-		}
-		results = append(results, matches...)
-	}
-	return results
-}
-
-func gitFileInputPatternsToPaths(patterns []string, applicationPath string) []string {
-	var results []string
-
-	for _, pattern := range patterns {
-		matches := gitLsFiles(applicationPath, pattern)
-		for _, relativePath := range matches {
-			path := filepath.Join(applicationPath, relativePath)
-			if isFile(path) {
-				results = append(results, path)
-			}
-		}
-	}
-
-	return results
-}
-
-func deDuplicateStringSlice(paths []string) []string {
-	pathMap := make(map[string]string)
-	var results []string
-	for _, path := range paths {
-		exists := pathMap[path]
-		if exists == "" {
-			pathMap[path] = path
-			results = append(results, path)
-		}
-	}
-
-	return results
+type input interface {
+	Hash() []byte
 }
 
 func initializeInputs(configurationInputs []configurationInput, componentPath string, rootPath string) []input {
 	var paths []string
 
+	var inputs []input
+
 	for _, configurationInput := range configurationInputs {
 		switch configurationInput.Type {
 		case "Files":
@@ -68,39 +21,24 @@ func initializeInputs(configurationInputs []configurationInput, componentPath st
 		case "GitFiles":
 			filePaths := gitFileInputPatternsToPaths(configurationInput.Paths, componentPath)
 			paths = append(paths, filePaths...)
+		case "Component":
+			componentInput := componentInput{
+				name: configurationInput.Name,
+			}
+			inputs = append(inputs, componentInput)
 		default:
-			log.Fatal("One of the input types does not have a handler, check types on handlers")
+			log.Fatalf("One of the input types does not have a handler, check types on handlers in %s or root config", componentPath)
 		}
 	}
 
 	uniquePaths := deDuplicateStringSlice(paths)
 
-	var inputs []input
-
 	for _, path := range uniquePaths {
-		input := input{
+		input := fileInput{
 			path: path,
 		}
 		inputs = append(inputs, input)
 	}
 
 	return inputs
 }
-
-func (input *input) Hash() []byte {
-	file, err := os.Open(input.path)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer file.Close()
-
-	hash := sha512.New384()
-
-	_, copyErr := io.Copy(hash, file)
-	if copyErr != nil {
-		log.Fatal(copyErr)
-	}
-
-	return hash.Sum(nil)
-}

internal/configuration/repository.go

@@ -69,6 +69,9 @@ func (repository *repository) FindComponentsWithAction(action string) []Componen
 	var components []Component
 	for _, component := range repository.components {
 		_, hasProperty := component.Actions[action]
+		if len(component.InputsHash) == 0 {
+			component.calculateHash()
+		}
 		if hasProperty {
 			components = append(components, component)
 		}