diff --git a/terraform/terraform.go b/terraform/terraform.go index c62d230..06e751c 100644 --- a/terraform/terraform.go +++ b/terraform/terraform.go @@ -52,7 +52,7 @@ func IsTerraformInitRun(dir string) bool { } func GetTerraformFilePaths(rootDir string) []string { - const tfFileMatcher = "/**/*.tf" + const tfFileMatcher = "/*.tf" tfFiles, err := doublestar.Glob(rootDir + tfFileMatcher) errors.PanicOnError(err, nil) diff --git a/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/invalid/invalid.tf b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/invalid/invalid.tf new file mode 100644 index 0000000..a0fa0cf --- /dev/null +++ b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/invalid/invalid.tf @@ -0,0 +1 @@ +a b c d e f g diff --git a/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/main.terratag.tf b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/main.terratag.tf new file mode 100644 index 0000000..49a9592 --- /dev/null +++ b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/main.terratag.tf @@ -0,0 +1,23 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 2.0" + } + } +} + +provider "aws" { + region = "us-east-1" +} + +resource "aws_s3_bucket" "b" { + bucket = "my-tf-test-bucket" + acl = "private" + + tags = merge( map("Name","Mybucket"), local.terratag_added_main) +} +locals { + terratag_added_main = {"env0_environment_id"="40907eff-cf7c-419a-8694-e1c6bf1d1168","env0_project_id"="43fd4ff1-8d37-4d9d-ac97-295bd850bf94"} +} + diff --git a/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/main.tf.bak b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/main.tf.bak new file mode 100644 index 0000000..fa9f180 --- /dev/null +++ b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/expected/main.tf.bak @@ -0,0 +1,21 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 2.0" + } + } +} + +provider "aws" { + region = "us-east-1" +} + +resource "aws_s3_bucket" "b" { + bucket = "my-tf-test-bucket" + acl = "private" + + tags { + Name = "My bucket" + } +} \ No newline at end of file diff --git a/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/input/invalid/invalid.tf b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/input/invalid/invalid.tf new file mode 100644 index 0000000..a0fa0cf --- /dev/null +++ b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/input/invalid/invalid.tf @@ -0,0 +1 @@ +a b c d e f g diff --git a/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/input/main.tf b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/input/main.tf new file mode 100644 index 0000000..fa9f180 --- /dev/null +++ b/test/fixture/terraform_13/git_issue_43__invalid_tf_files_in_subfolders/input/main.tf @@ -0,0 +1,21 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 2.0" + } + } +} + +provider "aws" { + region = "us-east-1" +} + +resource "aws_s3_bucket" "b" { + bucket = "my-tf-test-bucket" + acl = "private" + + tags { + Name = "My bucket" + } +} \ No newline at end of file