Merge pull request #308 from guilhem/relative_module

Manage relative module path
tenable · Sep 2, 2020 · f98373b · f98373b
2 parents b698de5 + 0a73752
commit f98373b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/pkg/iac-providers/terraform/v12/load-dir.go b/pkg/iac-providers/terraform/v12/load-dir.go
@@ -17,7 +17,6 @@
 package tfv12
 
 import (
-	"bytes"
 	"fmt"
 	"path/filepath"
 	"strings"
@@ -69,13 +68,11 @@ func (*TfV12) LoadIacDir(absRootDir string) (allResourcesConfig output.AllResour
 
 			// determine the absolute path from root module to the sub module
 			// using *configs.ModuleRequest.Path field
-			var (
-				pathArr      = strings.Split(req.Path.String(), ".")
-				pathToModule = absRootDir
-			)
-			for _, subPath := range pathArr {
-				pathToModule = filepath.Join(pathToModule, subPath)
-			}
+
+			pathArr := strings.Split(req.Path.String(), ".")
+			pathArr = pathArr[:len(pathArr)-1]
+
+			pathToModule := filepath.Join(absRootDir, filepath.Join(pathArr...), req.SourceAddr)
 
 			// load sub module directory
 			subMod, diags := parser.LoadConfigDir(pathToModule)
@@ -122,8 +119,10 @@ func (*TfV12) LoadIacDir(absRootDir string) (allResourcesConfig output.AllResour
 				return allResourcesConfig, fmt.Errorf("failed to create ResourceConfig")
 			}
 
-			// trimFilePath
-			resourceConfig.Source = trimFilePath(resourceConfig.Source, absRootDir)
+			resourceConfig.Source, err = filepath.Rel(absRootDir, resourceConfig.Source)
+			if err != nil {
+				return allResourcesConfig, fmt.Errorf("failed to get resource: %s", err)
+			}
 
 			// append to normalized output
 			if _, present := allResourcesConfig[resourceConfig.Type]; !present {
@@ -142,11 +141,3 @@ func (*TfV12) LoadIacDir(absRootDir string) (allResourcesConfig output.AllResour
 	// successful
 	return allResourcesConfig, nil
 }
-
-// trimFilePath returns relative file path wrt to the base path
-func trimFilePath(fullPath, basePath string) string {
-	basePath = strings.Trim(basePath, ".")
-	basePath = strings.Trim(basePath, "/")
-	splits := bytes.Split([]byte(fullPath), []byte(basePath))
-	return strings.TrimPrefix(string(splits[1]), "/")
-}
diff --git a/pkg/iac-providers/terraform/v12/testdata/moduleconfigs/main.tf b/pkg/iac-providers/terraform/v12/testdata/moduleconfigs/main.tf
@@ -47,5 +47,5 @@ module "sqs" {
 }
 
 module "elasticcache" {
-  source = "./elasticcache"
+  source = "../relative-moduleconfigs/elasticcache"
 }
diff --git a/...stdata/moduleconfigs/elasticcache/main.tf → ...lative-moduleconfigs/elasticcache/main.tf b/...stdata/moduleconfigs/elasticcache/main.tf → ...lative-moduleconfigs/elasticcache/main.tf
diff --git a/pkg/iac-providers/terraform/v12/testdata/tfjson/moduleconfigs.json b/pkg/iac-providers/terraform/v12/testdata/tfjson/moduleconfigs.json
@@ -175,7 +175,7 @@
     {
       "id": "aws_elasticache_cluster.noMemcachedInElastiCache",
       "name": "noMemcachedInElastiCache",
-      "source": "elasticcache/main.tf",
+      "source": "../relative-moduleconfigs/elasticcache/main.tf",
       "line": 1,
       "type": "aws_elasticache_cluster",
       "config": {