🐛 cnquery modules were not being discovered (#698)

Fixes #676

motor/providers/terraform/hcl_parser_test.go

@@ -21,7 +21,7 @@ func TestLoadHclBlocks(t *testing.T) {
 	require.NoError(t, err)
 	require.NotNil(t, tf.parsed)
 	assert.Equal(t, 2, len(tf.tfVars))
-	assert.Equal(t, 4, len(tf.parsed.Files()))
+	assert.Equal(t, 5, len(tf.parsed.Files()))
 }
 
 func TestLoadTfvars(t *testing.T) {

motor/providers/terraform/provider.go

@@ -105,7 +105,7 @@ func New(tc *providers.Config) (*Provider, error) {
 					if err != nil {
 						return errors.Wrap(err, "could not parse tfvars file")
 					}
-				} else {
+				} else if modulesManifest == nil {
 					modulesManifest, err = ParseTerraformModuleManifest(path)
 					if errors.Is(err, os.ErrNotExist) {
 						log.Debug().Str("path", path).Msg("no terraform module manifest found")

motor/providers/terraform/provider_test.go

@@ -19,3 +19,16 @@ func TestTerraform(t *testing.T) {
 	files := p.Parser().Files()
 	assert.Equal(t, len(files), 2)
 }
+
+func TestModuleManifestIssue676(t *testing.T) {
+	// See https://github.com/mondoohq/cnquery/issues/676
+	p, err := New(&providers.Config{
+		Options: map[string]string{
+			"path": "./testdata/issue676",
+		},
+	})
+	require.NoError(t, err)
+
+	require.NotNil(t, p.modulesManifest)
+	require.Len(t, p.modulesManifest.Records, 3)
+}

motor/providers/terraform/testdata/issue676/.terraform/modules/modules.json

@@ -0,0 +1 @@
+{"Modules":[{"Key":"","Source":"","Dir":"."},{"Key":"org-policy_bucket_policy_only","Source":"registry.terraform.io/terraform-google-modules/org-policy/google//modules/bucket_policy_only","Version":"5.2.0","Dir":".terraform/modules/org-policy_bucket_policy_only/modules/bucket_policy_only"},{"Key":"org-policy_bucket_policy_only.storage-uniform-bucket-level-access","Source":"../..","Dir":".terraform/modules/org-policy_bucket_policy_only"}]}

motor/providers/terraform/testdata/issue676/main.tf

@@ -0,0 +1,5 @@
+module "org-policy_bucket_policy_only" {
+  source  = "terraform-google-modules/org-policy/google//modules/bucket_policy_only"
+  version = "5.2.0"
+  # insert the 1 required variable here
+}