feat: Parse for legacy DFDs and shift into the new format

threatcl · Feb 6, 2023 · bcbccec · bcbccec
1 parent 24a1fd7
commit bcbccec
Show file tree

Hide file tree

Showing 6 changed files with 382 additions and 337 deletions.
diff --git a/cmd/hcltm/dfd_test.go b/cmd/hcltm/dfd_test.go
@@ -108,7 +108,7 @@ func TestDfdDot(t *testing.T) {
 	}
 	t.Logf("out: %s", out)
 
-	_, err = os.Open(fmt.Sprintf("%s/out/tm3-tm2onetm2one.dot", d))
+	_, err = os.Open(fmt.Sprintf("%s/out/tm3-tm2onelegacydfd.dot", d))
 	if err != nil {
 		t.Fatalf("Error opening dot: %s", err)
 	}

diff --git a/cmd/hcltm/generate_interactive.go b/cmd/hcltm/generate_interactive.go
@@ -161,7 +161,8 @@ func (c *GenerateInteractiveCommand) Run(args []string) int {
 		return 1
 	}
 
-	err = tmParser.ValidateTm(&tm)
+	// err = tmParser.ValidateTm(&tm)
+	err = tm.ValidateTm(tmParser)
 	if err != nil {
 		fmt.Printf("Error validating TM: %s\n", err)
 		return 1
@@ -235,7 +236,8 @@ func (c *GenerateInteractiveCommand) Run(args []string) int {
 		return 1
 	}
 
-	err = tmParser.ValidateTm(&tm)
+	// err = tmParser.ValidateTm(&tm)
+	err = tm.ValidateTm(tmParser)
 	if err != nil {
 		fmt.Printf("Error validating TM: %s\n", err)
 		return 1
@@ -334,7 +336,8 @@ func (c *GenerateInteractiveCommand) Run(args []string) int {
 				return 1
 			}
 
-			err = tmParser.ValidateTm(&tm)
+			// err = tmParser.ValidateTm(&tm)
+			err = tm.ValidateTm(tmParser)
 			if err != nil {
 				fmt.Printf("Error validating TM: %s\n", err)
 				return 1
@@ -412,7 +415,8 @@ func (c *GenerateInteractiveCommand) Run(args []string) int {
 				return 1
 			}
 
-			err = tmParser.ValidateTm(&tm)
+			// err = tmParser.ValidateTm(&tm)
+			err = tm.ValidateTm(tmParser)
 			if err != nil {
 				fmt.Printf("Error validating TM: %s\n", err)
 				return 1
@@ -490,7 +494,8 @@ func (c *GenerateInteractiveCommand) Run(args []string) int {
 				return 1
 			}
 
-			err = tmParser.ValidateTm(&tm)
+			// err = tmParser.ValidateTm(&tm)
+			err = tm.ValidateTm(tmParser)
 			if err != nil {
 				fmt.Printf("Error validating TM: %s\n", err)
 				return 1
@@ -586,7 +591,8 @@ func (c *GenerateInteractiveCommand) Run(args []string) int {
 				return 1
 			}
 
-			err = tmParser.ValidateTm(&tm)
+			// err = tmParser.ValidateTm(&tm)
+			err = tm.ValidateTm(tmParser)
 			if err != nil {
 				fmt.Printf("Error validating TM: %s\n", err)
 				return 1