fix: Fixing .tf vs .tofu extension parity (#4794)

* fix: Using WalkDir over globs for finding TF Files

* fix: Use util func

* fix: Avoid breaking provider patch

* fix: Adding tests

* fix: Fixing order of `TestTofuFileExtensionRecognition` cases

* fix: Revert disable of build flag

* fix: Require both OpenTofu _and_ AWS for state encryption tests

* Tests fixes

* PR comment fixes

* Revert "PR comment fixes"

This reverts commit 5d84872.

* Benchmark update

* Benchmark simplifications

* Updated cache tests

* Asserts cleanup

* Shared cache check

* Regexp assert

* simplified cache checking

* Updated test for re-using versions

* Updated tests

* Regexp update

---------

Co-authored-by: Denis O <denis.o@linux.com>

Author: yhakbar

.github/workflows/integration-test.yml

@@ -16,6 +16,7 @@ jobs:
           - name: Fixtures with OpenTofu
             os: ubuntu
             target: ./test
+            tags: tofu
             setup_scripts:
               - .github/scripts/setup/tofu-switch.sh
           - name: Fixtures with Latest OSS Terraform
@@ -60,7 +61,7 @@ jobs:
           - name: AWS Tofu
             os: ubuntu
             target: ./...
-            tags: aws
+            tags: 'aws,tofu'
             run: '^TestAws'
             secrets: [AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY, AWS_TEST_S3_ASSUME_ROLE]
             setup_scripts:
@@ -112,12 +113,14 @@ jobs:
           - name: Provider Cache Server with Tofu
             os: ubuntu
             target: ./test
+            tags: tofu
             setup_scripts:
               - .github/scripts/setup/provider-cache-server.sh
               - .github/scripts/setup/tofu-switch.sh
           - name: Provider Cache Dir with Tofu
             os: ubuntu
             target: ./test
+            tags: tofu
             setup_scripts:
               - .github/scripts/setup/provider-cache-dir.sh
               - .github/scripts/setup/tofu-switch.sh

cli/commands/aws-provider-patch/aws-provider-patch.go

@@ -9,7 +9,6 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclwrite"
-	"github.com/mattn/go-zglob"
 	ctyjson "github.com/zclconf/go-cty/cty/json"
 
 	"github.com/gruntwork-io/terragrunt/cli/commands/run"
@@ -79,7 +78,7 @@ type TerraformModule struct {
 // configuration. To be more specific, it only returns the source files downloaded for module "xxx" { ... } blocks into
 // the .terraform/modules folder; it does NOT return Terraform files for the top-level (AKA "root") module.
 //
-// NOTE: this method only supports *.tf files right now. Terraform code defined in *.json files is not currently
+// NOTE: this method supports *.tf and *.tofu files. Terraform/OpenTofu code defined in *.json files is not currently
 // supported.
 func findAllTerraformFilesInModules(opts *options.TerragruntOptions) ([]string, error) {
 	// Terraform downloads modules into the .terraform/modules folder. Unfortunately, it downloads not only the module
@@ -114,15 +113,17 @@ func findAllTerraformFilesInModules(opts *options.TerragruntOptions) ([]string,
 				moduleAbsPath = util.JoinPath(opts.WorkingDir, moduleAbsPath)
 			}
 
-			// Ideally, we'd use a builtin Go library like filepath.Glob here, but per https://github.com/golang/go/issues/11862,
-			// the current go implementation doesn't support treating ** as zero or more directories, just zero or one.
-			// So we use a third-party library.
-			matches, err := zglob.Glob(moduleAbsPath + "/**/*.tf")
+			moduleFiles, err := util.FindTFFiles(moduleAbsPath)
 			if err != nil {
 				return nil, errors.New(err)
 			}
 
-			terraformFiles = append(terraformFiles, matches...)
+			// Filter out JSON files (.tf.json, .tofu.json, or any .json) as hclwrite cannot parse JSON
+			for _, file := range moduleFiles {
+				if !strings.HasSuffix(file, ".json") {
+					terraformFiles = append(terraformFiles, file)
+				}
+			}
 		}
 	}