Skip to content

Fix generate projects error #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 28, 2023
Merged

Fix generate projects error #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bab12ba
Merge pull request #405 from diggerhq/develop
veziak Jun 23, 2023
f9d9983
Merge pull request #408 from diggerhq/develop
veziak Jun 26, 2023
e2c46f0
Merge pull request #410 from diggerhq/develop
veziak Jun 26, 2023
3ebf0cf
Merge pull request #412 from diggerhq/develop
veziak Jun 26, 2023
8cad573
generate dependency graph after generate projects
motatoes Jun 28, 2023
7d2977a
remove print statement
motatoes Jun 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions pkg/configuration/converters.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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()
Expand Down