fix: remove json indirection, restructure package

README.md

@@ -18,8 +18,6 @@ All the formats above are transformed into JSON so that they can be used as inpu
 
 ## Development
 
-All code is contained within the `pkg` directory and each file has a corresponding test. Test fixtures are included in the `test/fixtures` directory.
-
 Tests can be run using the `go test` command:
 
 ```bash

pkg/terraform_plan.go → terraform_plan.go

@@ -1,6 +1,7 @@
 package parsers
 
 import (
+	"encoding/json"
 	"fmt"
 	"math/rand"
 	"reflect"
@@ -129,7 +130,7 @@ func isValidResourceActions(resourceAction ResourceActions, isFullScan bool) boo
 
 func ParseTerraformPlan(p []byte, v *interface{}) error {
 	var tfPlanJson TerraformPlanJson
-	if err := ParseJSON(p, &tfPlanJson); err != nil {
+	if err := json.Unmarshal(p, &tfPlanJson); err != nil {
 		return errors.Wrap(err, "failed to parse terraform-plan json payload")
 	}
 	// Currently being used only by Terraform Cloud integration

pkg/terraform_plan_test.go → terraform_plan_test.go

@@ -1,6 +1,7 @@
 package parsers
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"path"
@@ -20,7 +21,7 @@ func getExpectedResult(planFileName, expectedResultsFolder string) (TerraformSca
 		return nil, err
 	}
 	var expectedResult TerraformScanInput
-	err = ParseJSON(expectedResultJsonFile, &expectedResult)
+	err = json.Unmarshal(expectedResultJsonFile, &expectedResult)
 	if err != nil {
 		return nil, err
 	}
@@ -43,7 +44,7 @@ func testPlanFile(t *testing.T, fileName, root string, wg *sync.WaitGroup) {
 			t.Errorf("%v, failed with file %s", err, fileName)
 		}
 		var planJson TerraformPlanJson
-		err = ParseJSON(file, &planJson)
+		err = json.Unmarshal(file, &planJson)
 		if err != nil {
 			t.Errorf("%v, failed with file %s", err, fileName)
 		}
@@ -64,7 +65,7 @@ func testPlanFile(t *testing.T, fileName, root string, wg *sync.WaitGroup) {
 }
 
 func TestTerraformPlanParser(t *testing.T) {
-	root := "../test/fixtures/terraform-plans/"
+	root := "./testdata/terraform-plans/"
 	files, err := ioutil.ReadDir(root)
 	if err != nil {
 		t.Error(err)