fix(init): do not require re-init after init

gruntwork-io · Feb 19, 2024 · ec916ab · ec916ab
1 parent ccce607
commit ec916ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cli/commands/terraform/download_source.go b/cli/commands/terraform/download_source.go
@@ -116,7 +116,8 @@ func downloadTerraformSourceIfNecessary(terraformSource *terraform.Source, terra
  currentVersion, err := terraformSource.EncodeSourceVersion()
  // if source versions are different or calculating version failed, create file to run init
  // https://github.com/gruntwork-io/terragrunt/issues/1921
- if previousVersion != currentVersion || err != nil {
+ if (previousVersion != "" && previousVersion != currentVersion) || err != nil {
+ terragruntOptions.Logger.Debugf("Requesting re-init, source version has changed from %s to %s recently.", previousVersion, currentVersion)
  initFile := util.JoinPath(terraformSource.WorkingDir, moduleInitRequiredFile)
  f, createErr := os.Create(initFile)
  if createErr != nil {

diff --git a/cli/commands/terraform/download_source_test.go b/cli/commands/terraform/download_source_test.go
@@ -165,7 +165,7 @@ func TestDownloadTerraformSourceIfNecessaryLocalDirToEmptyDir(t *testing.T) {
  downloadDir := tmpDir(t)
  defer os.Remove(downloadDir)
 
- testDownloadTerraformSourceIfNecessary(t, canonicalUrl, downloadDir, false, "# Hello, World", true)
+ testDownloadTerraformSourceIfNecessary(t, canonicalUrl, downloadDir, false, "# Hello, World", false)
 }
 
 func TestDownloadTerraformSourceIfNecessaryLocalDirToAlreadyDownloadedDir(t *testing.T) {
@@ -187,7 +187,7 @@ func TestDownloadTerraformSourceIfNecessaryRemoteUrlToEmptyDir(t *testing.T) {
  downloadDir := tmpDir(t)
  defer os.Remove(downloadDir)
 
- testDownloadTerraformSourceIfNecessary(t, canonicalUrl, downloadDir, false, "# Hello, World", true)
+ testDownloadTerraformSourceIfNecessary(t, canonicalUrl, downloadDir, false, "# Hello, World", false)
 }
 
 func TestDownloadTerraformSourceIfNecessaryRemoteUrlToAlreadyDownloadedDir(t *testing.T) {