fix(recipe): type processed incorrectly (#1038)

* fix(recipe): type processed incorrectly * fix: sort data category groups to fix flakey snapshot
Bearer · Jun 6, 2023 · ba142fa · ba142fa
1 parent 0cc1d54
commit ba142fa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/pkg/classification/interfaces/interfaces.go b/pkg/classification/interfaces/interfaces.go
@@ -58,6 +58,7 @@ type RecipeURLMatch struct {
 	RecipeURL        string
 	RecipeUUID       string
 	RecipeName       string
+	RecipeType       string
 	RecipeSubType    string
 	ExcludedURL      bool
 }
@@ -223,7 +224,7 @@ func (classifier *Classifier) Classify(data detections.Detection) (*ClassifiedIn
 				RecipeMatch:   true,
 				RecipeUUID:    recipeMatch.RecipeUUID,
 				RecipeName:    recipeMatch.RecipeName,
-				RecipeType:    "",
+				RecipeType:    recipeMatch.RecipeType,
 				RecipeSubType: recipeMatch.RecipeSubType,
 			},
 		}
@@ -301,6 +302,7 @@ func (classifier *Classifier) FindMatchingRecipeUrl(detectionURL string) (*Recip
 				RecipeURL:        recipeURL.URL,
 				RecipeUUID:       recipe.UUID,
 				RecipeName:       recipe.Name,
+				RecipeType:       recipe.Type,
 				RecipeSubType:    recipe.SubType,
 			}
 		}

diff --git a/pkg/classification/interfaces/interfaces_test.go b/pkg/classification/interfaces/interfaces_test.go
@@ -44,6 +44,7 @@ func TestInterface(t *testing.T) {
 			Want: &interfaces.Classification{
 				URL:           "https://api.stripe.com",
 				RecipeName:    "Stripe",
+				RecipeType:    "external_service",
 				RecipeSubType: "third_party",
 				RecipeUUID:    "c24b836a-d035-49dc-808f-1912f16f690d",
 				RecipeMatch:   true,
@@ -129,6 +130,7 @@ func TestInterface(t *testing.T) {
 			Want: &interfaces.Classification{
 				URL:           "http://*.stripe.com",
 				RecipeName:    "Stripe",
+				RecipeType:    "external_service",
 				RecipeSubType: "third_party",
 				RecipeUUID:    "c24b836a-d035-49dc-808f-1912f16f690d",
 				RecipeMatch:   true,
@@ -160,6 +162,7 @@ func TestInterface(t *testing.T) {
 			Want: &interfaces.Classification{
 				URL:           "https://googleapis.com/auth/spreadsheets",
 				RecipeName:    "Google Spreadsheets",
+				RecipeType:    "external_service",
 				RecipeSubType: "third_party",
 				RecipeUUID:    "ebe2e05e-bc56-4204-9329-d9b8d3cf1837",
 				RecipeMatch:   true,

diff --git a/pkg/report/output/dataflow/datatypes/datatypes.go b/pkg/report/output/dataflow/datatypes/datatypes.go
@@ -1,6 +1,8 @@
 package datatypes
 
 import (
+	"sort"
+
 	"github.com/bearer/bearer/pkg/classification/db"
 	"github.com/bearer/bearer/pkg/commands/process/settings"
 	"github.com/bearer/bearer/pkg/report/detectors"
@@ -109,6 +111,8 @@ func (holder *Holder) addDatatype(
 			categoryGroups = append(categoryGroups, group.Name)
 		}
 
+		sort.Strings(categoryGroups)
+
 		datatype := datatypeHolder{
 			name:           classification.Name,
 			categoryName:   classification.Category.Name,