Merge pull request #1510 from MattDavis00/mattdavis/DLP-1479

cloudflare · Mar 4, 2024 · 7789ba8 · 7789ba8
2 parents 7a070bc + 350bc11
commit 7789ba8
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 22 deletions.
diff --git a/.changelog/1510.txt b/.changelog/1510.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+dlp: added optional ContextAwareness support
+```
diff --git a/dlp_profile.go b/dlp_profile.go
@@ -50,12 +50,13 @@ type DLPContextAwareness struct {
 // DLPProfile represents a DLP Profile, which contains a set
 // of entries.
 type DLPProfile struct {
-	ID                string              `json:"id,omitempty"`
-	Name              string              `json:"name,omitempty"`
-	Type              string              `json:"type,omitempty"`
-	Description       string              `json:"description,omitempty"`
-	AllowedMatchCount int                 `json:"allowed_match_count"`
-	ContextAwareness  DLPContextAwareness `json:"context_awareness,omitempty"`
+	ID                string `json:"id,omitempty"`
+	Name              string `json:"name,omitempty"`
+	Type              string `json:"type,omitempty"`
+	Description       string `json:"description,omitempty"`
+	AllowedMatchCount int    `json:"allowed_match_count"`
+
+	ContextAwareness *DLPContextAwareness `json:"context_awareness,omitempty"`
 
 	// The following fields are omitted for predefined DLP
 	// profiles.

diff --git a/dlp_profile_test.go b/dlp_profile_test.go
@@ -75,13 +75,7 @@ func TestDLPProfiles(t *testing.T) {
 					"updated_at": "2022-10-18T08:00:57Z",
 					"type": "custom",
 					"description": "just a custom profile example",
-					"allowed_match_count": 1,
-					"context_awareness": {
-						"enabled": false,
-						"skip": {
-							"files": false
-						}
-					}
+					"allowed_match_count": 1
 				}
 			]
 		}
@@ -98,7 +92,7 @@ func TestDLPProfiles(t *testing.T) {
 			Type:              "predefined",
 			Description:       "",
 			AllowedMatchCount: 0,
-			ContextAwareness: DLPContextAwareness{
+			ContextAwareness: &DLPContextAwareness{
 				Enabled: BoolPtr(true),
 				Skip: DLPContextAwarenessSkip{
 					Files: BoolPtr(true),
@@ -126,12 +120,7 @@ func TestDLPProfiles(t *testing.T) {
 			Type:              "custom",
 			Description:       "just a custom profile example",
 			AllowedMatchCount: 1,
-			ContextAwareness: DLPContextAwareness{
-				Enabled: BoolPtr(false),
-				Skip: DLPContextAwarenessSkip{
-					Files: BoolPtr(false),
-				},
-			},
+			// Omit ContextAwareness to test ContextAwareness optionality
 			Entries: []DLPEntry{
 				{
 					ID:        "ef79b054-12d4-4067-bb30-b85f6267b91c",
@@ -211,7 +200,7 @@ func TestGetDLPProfile(t *testing.T) {
 		Type:              "custom",
 		Description:       "just a custom profile example",
 		AllowedMatchCount: 42,
-		ContextAwareness: DLPContextAwareness{
+		ContextAwareness: &DLPContextAwareness{
 			Enabled: BoolPtr(false),
 			Skip: DLPContextAwarenessSkip{
 				Files: BoolPtr(false),
@@ -586,7 +575,7 @@ func TestUpdateDLPPredefinedProfile(t *testing.T) {
 		Type:              "predefined",
 		Description:       "example predefined profile",
 		AllowedMatchCount: 0,
-		ContextAwareness: DLPContextAwareness{
+		ContextAwareness: &DLPContextAwareness{
 			Enabled: BoolPtr(true),
 			Skip: DLPContextAwarenessSkip{
 				Files: BoolPtr(true),