Change Uniqueness to UniquenessCriteria

coveooss · Nov 26, 2019 · b14dd25 · b14dd25
1 parent 364da41
commit b14dd25
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/cli/cli_app.go b/cli/cli_app.go
@@ -317,10 +317,10 @@ func runTerragrunt(terragruntOptions *options.TerragruntOptions) (finalStatus er
 		return false
 	}
 
-	if conf.Uniqueness != nil {
+	if conf.UniquenessCriteria != nil {
 		// If uniqueness_criteria has been defined, we set it in the options to ensure that
 		// we use distinct folder based on this criteria
-		terragruntOptions.Uniqueness = *conf.Uniqueness
+		terragruntOptions.UniquenessCriteria = *conf.UniquenessCriteria
 	}
 
 	// Copy the deployment files to the working directory

diff --git a/cli/download_source.go b/cli/download_source.go
@@ -190,7 +190,7 @@ func processTerraformSource(source string, terragruntOptions *options.Terragrunt
 
 	// We add the uniqueness factor to the folder name to ensure that distinct environment are processed in
 	// distinct directory
-	encodedWorkingDir := util.EncodeBase64Sha1(canonicalWorkingDir + terragruntOptions.Uniqueness)
+	encodedWorkingDir := util.EncodeBase64Sha1(canonicalWorkingDir + terragruntOptions.UniquenessCriteria)
 	downloadDir := util.JoinPath(terragruntOptions.DownloadDir, encodedWorkingDir, rootPath)
 	workingDir := util.JoinPath(downloadDir, modulePath)
 	versionFile := util.JoinPath(downloadDir, ".terragrunt-source-version")

diff --git a/config/config.go b/config/config.go
@@ -29,20 +29,20 @@ const (
 
 // TerragruntConfig represents a parsed and expanded configuration
 type TerragruntConfig struct {
-	Description     string                      `hcl:"description"`
-	RunConditions   RunConditions               `hcl:"run_conditions"`
-	Terraform       *TerraformConfig            `hcl:"terraform"`
-	RemoteState     *remote.State               `hcl:"remote_state"`
-	Dependencies    *ModuleDependencies         `hcl:"dependencies"`
-	Uniqueness      *string                     `hcl:"uniqueness_criteria"`
-	AssumeRole      interface{}                 `hcl:"assume_role"`
-	ExtraArgs       TerraformExtraArgumentsList `hcl:"extra_arguments"`
-	PreHooks        HookList                    `hcl:"pre_hook"`
-	PostHooks       HookList                    `hcl:"post_hook"`
-	ExtraCommands   ExtraCommandList            `hcl:"extra_command"`
-	ImportFiles     ImportFilesList             `hcl:"import_files"`
-	ApprovalConfig  ApprovalConfigList          `hcl:"approval_config"`
-	ImportVariables ImportVariablesList         `hcl:"import_variables"`
+	Description        string                      `hcl:"description"`
+	RunConditions      RunConditions               `hcl:"run_conditions"`
+	Terraform          *TerraformConfig            `hcl:"terraform"`
+	RemoteState        *remote.State               `hcl:"remote_state"`
+	Dependencies       *ModuleDependencies         `hcl:"dependencies"`
+	UniquenessCriteria *string                     `hcl:"uniqueness_criteria"`
+	AssumeRole         interface{}                 `hcl:"assume_role"`
+	ExtraArgs          TerraformExtraArgumentsList `hcl:"extra_arguments"`
+	PreHooks           HookList                    `hcl:"pre_hook"`
+	PostHooks          HookList                    `hcl:"post_hook"`
+	ExtraCommands      ExtraCommandList            `hcl:"extra_command"`
+	ImportFiles        ImportFilesList             `hcl:"import_files"`
+	ApprovalConfig     ApprovalConfigList          `hcl:"approval_config"`
+	ImportVariables    ImportVariablesList         `hcl:"import_variables"`
 
 	options      *options.TerragruntOptions
 	variablesSet []hcl.Dictionary
@@ -539,8 +539,8 @@ func (conf *TerragruntConfig) mergeIncludedConfig(includedConfig TerragruntConfi
 		conf.Dependencies.Paths = append(conf.Dependencies.Paths, includedConfig.Dependencies.Paths...)
 	}
 
-	if conf.Uniqueness == nil {
-		conf.Uniqueness = includedConfig.Uniqueness
+	if conf.UniquenessCriteria == nil {
+		conf.UniquenessCriteria = includedConfig.UniquenessCriteria
 	}
 
 	if conf.AssumeRole == nil {

diff --git a/config/config_substitute.go b/config/config_substitute.go
@@ -9,7 +9,7 @@ import (
 
 // SubstituteAllVariables replace all remaining variables by the value
 func (conf *TerragruntConfig) SubstituteAllVariables() {
-	conf.substitute(conf.Uniqueness)
+	conf.substitute(conf.UniquenessCriteria)
 
 	if roles, ok := conf.AssumeRole.([]string); ok {
 		for i := range roles {

diff --git a/configstack/test_helpers.go b/configstack/test_helpers.go
@@ -148,7 +148,7 @@ func assertConfigsEqual(t *testing.T, expected config.TerragruntConfig, actual c
 	assert.Equal(t, expected.PreHooks, actual.PreHooks, messageAndArgs...)
 	assert.Equal(t, expected.RemoteState, actual.RemoteState, messageAndArgs...)
 	assert.Equal(t, expected.Terraform, actual.Terraform, messageAndArgs...)
-	assert.Equal(t, expected.Uniqueness, actual.Uniqueness, messageAndArgs...)
+	assert.Equal(t, expected.UniquenessCriteria, actual.UniquenessCriteria, messageAndArgs...)
 }
 
 // Return the absolute path for the given path

diff --git a/options/options.go b/options/options.go
@@ -84,7 +84,7 @@ type TerragruntOptions struct {
 	// If set in terragrunt configuration, this string is added to the directory name before calculating the hashing
 	// This allow differentiation based on certain attribute to ensure that different config (env, region) are executed
 	// in distinct folder
-	Uniqueness string
+	UniquenessCriteria string
 
 	// If set, this indicate that remaining interpolation are not considered as an error during the configuration
 	// resolving process. This allows further resolution of variables that are not initially defined.