Skip to content
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

Jump to bottom

Mock disabled dependency outputs. #2816

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Mock disabled dependency outputs. #2816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 6 additions & 16 deletions config/dependency.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,16 +178,6 @@ func decodeAndRetrieveOutputs(
return nil, err
}

// Skip disabled dependencies
updatedDependencies := terragruntDependency{}
for _, dep := range decodedDependency.Dependencies {
if !dep.isEnabled() {
continue
}
updatedDependencies.Dependencies = append(updatedDependencies.Dependencies, dep)
}
decodedDependency = updatedDependencies

// Merge in included dependencies
if trackInclude != nil {
mergedDecodedDependency, err := handleIncludeForDependency(decodedDependency, trackInclude, terragruntOptions)
Expand Down Expand Up @@ -228,6 +218,9 @@ func checkForDependencyBlockCycles(filename string, decodedDependency terragrunt
visitedPaths := []string{}
currentTraversalPaths := []string{filename}
for _, dependency := range decodedDependency.Dependencies {
if !dependency.isEnabled() {
continue
}
dependencyPath := getCleanedTargetConfigPath(dependency.ConfigPath, filename)
dependencyOptions := cloneTerragruntOptionsForDependency(terragruntOptions, dependencyPath)
if err := checkForDependencyBlockCyclesUsingDFS(dependencyPath, &visitedPaths, &currentTraversalPaths, dependencyOptions); err != nil {
Expand Down Expand Up @@ -306,9 +299,6 @@ func dependencyBlocksToCtyValue(dependencyConfigs []Dependency, terragruntOption
dependencyErrGroup, _ := errgroup.WithContext(context.Background())

for _, dependencyConfig := range dependencyConfigs {
if !dependencyConfig.isEnabled() {
continue
}
dependencyConfig := dependencyConfig // https://golang.org/doc/faq#closures_and_goroutines
dependencyErrGroup.Go(func() error {
// Loose struct to hold the attributes of the dependency. This includes:
Expand Down Expand Up @@ -360,9 +350,6 @@ func dependencyBlocksToCtyValue(dependencyConfigs []Dependency, terragruntOption
// If the dependency block indicates a mock_outputs_merge_strategy_with_state attribute, mock_outputs and state outputs will be merged following the merge strategy
// - If the dependency block does NOT indicate a mock_outputs attribute, this will return an error.
func getTerragruntOutputIfAppliedElseConfiguredDefault(dependencyConfig Dependency, terragruntOptions *options.TerragruntOptions) (*cty.Value, error) {
if !dependencyConfig.isEnabled() {
return nil, nil
}
if dependencyConfig.shouldGetOutputs() {
outputVal, isEmpty, err := getTerragruntOutput(dependencyConfig, terragruntOptions)
if err != nil {
Expand Down Expand Up @@ -413,6 +400,9 @@ func getTerragruntOutputIfAppliedElseConfiguredDefault(dependencyConfig Dependen
// We should only return default outputs if the mock_outputs attribute is set, and if we are running one of the
// allowed commands when `mock_outputs_allowed_terraform_commands` is set as well.
func (dependencyConfig Dependency) shouldReturnMockOutputs(terragruntOptions *options.TerragruntOptions) bool {
if !dependencyConfig.isEnabled() {
return true
}
defaultOutputsSet := dependencyConfig.MockOutputs != nil
allowedCommand :=
dependencyConfig.MockOutputsAllowedTerraformCommands == nil ||
Expand Down