From 8cad573828d9bea1577141a6e367092c2620c49a Mon Sep 17 00:00:00 2001 From: motatoes Date: Wed, 28 Jun 2023 11:47:35 +0100 Subject: [PATCH 1/2] generate dependency graph after generate projects --- go.mod | 2 +- pkg/configuration/converters.go | 11 +++++------ pkg/digger/digger.go | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index c98b7896c..0a18c22d3 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( gopkg.in/yaml.v3 v3.0.1 ) -require github.com/dominikbraun/graph v0.22.3 // indirect +require github.com/dominikbraun/graph v0.22.3 require ( cloud.google.com/go v0.110.0 // indirect diff --git a/pkg/configuration/converters.go b/pkg/configuration/converters.go index d37e0e855..1e67bc60d 100644 --- a/pkg/configuration/converters.go +++ b/pkg/configuration/converters.go @@ -161,12 +161,6 @@ func ConvertDiggerYamlToConfig(diggerYaml *DiggerConfigYaml, workingDir string, } } - dependencyGraph, err := CreateProjectDependencyGraph(diggerConfig.Projects) - - if err != nil { - return nil, nil, fmt.Errorf("failed to create project dependency graph: %s", err.Error()) - } - if diggerYaml.GenerateProjectsConfig != nil { dirs, err := walker.GetDirs(workingDir) if err != nil { @@ -183,6 +177,11 @@ func ConvertDiggerYamlToConfig(diggerYaml *DiggerConfigYaml, workingDir string, } } + dependencyGraph, err := CreateProjectDependencyGraph(diggerConfig.Projects) + if err != nil { + return nil, nil, fmt.Errorf("failed to create project dependency graph: %s", err.Error()) + } + // if one of the workflows is missing Plan or Apply we copy default values for _, w := range diggerConfig.Workflows { defaultWorkflow := *defaultWorkflow() diff --git a/pkg/digger/digger.go b/pkg/digger/digger.go index 23adee0a4..89b987557 100644 --- a/pkg/digger/digger.go +++ b/pkg/digger/digger.go @@ -135,6 +135,7 @@ func RunCommandsPerProject( switch command { case "digger plan": + fmt.Printf("!!!PERFORMING DIGGER PLAN!!! %v", projectCommands.ProjectName) err := usage.SendUsageRecord(requestedBy, eventName, "plan") if err != nil { return false, false, fmt.Errorf("failed to send usage report. %v", err) From 7d2977a2480abfe21623f9eba6464190e4de1dc3 Mon Sep 17 00:00:00 2001 From: motatoes Date: Wed, 28 Jun 2023 11:56:20 +0100 Subject: [PATCH 2/2] remove print statement --- pkg/digger/digger.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pkg/digger/digger.go b/pkg/digger/digger.go index 89b987557..23adee0a4 100644 --- a/pkg/digger/digger.go +++ b/pkg/digger/digger.go @@ -135,7 +135,6 @@ func RunCommandsPerProject( switch command { case "digger plan": - fmt.Printf("!!!PERFORMING DIGGER PLAN!!! %v", projectCommands.ProjectName) err := usage.SendUsageRecord(requestedBy, eventName, "plan") if err != nil { return false, false, fmt.Errorf("failed to send usage report. %v", err)