fix query (#5215)

Signed-off-by: joaorufi <[email protected]>
Checkmarx · Apr 20, 2022 · 94fe8aa · 94fe8aa
1 parent bdae6a8
commit 94fe8aa
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/...ay_without_content_encoding/metadata.json → ...ay_with_invalid_compression/metadata.json b/...ay_without_content_encoding/metadata.json → ...ay_with_invalid_compression/metadata.json
@@ -1,9 +1,9 @@
 {
   "id": "d6653eee-2d4d-4e6a-976f-6794a497999a",
-  "queryName": "API Gateway Without Content Encoding",
+  "queryName": "API Gateway With Invalid Compression",
   "severity": "MEDIUM",
   "category": "Encryption",
-  "descriptionText": "Enable Content Encoding through the attribute 'MinimumCompressionSize'. This value should be greater than -1 and smaller than 10485760.",
+  "descriptionText": "Attribute 'MinimumCompressionSize' should be set and it's value should be greater than -1 and smaller than 10485760.",
   "descriptionUrl": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html",
   "platform": "CloudFormation",
   "descriptionID": "de76ae0f",

diff --git a/...teway_without_content_encoding/query.rego → ...teway_with_invalid_compression/query.rego b/...teway_without_content_encoding/query.rego → ...teway_with_invalid_compression/query.rego
@@ -14,7 +14,7 @@ CxPolicy[result] {
 		"documentId": input.document[i].id,
 		"searchKey": sprintf("Resources.%s.Properties.MinimumCompressionSize", [name]),
 		"issueType": "IncorrectValue",
-		"keyExpectedValue": "Resources.%s.Properties.MinimumCompressionSize is greater than -1 and smaller than 10485760",
+		"keyExpectedValue": "Resources.%s.Properties.MinimumCompressionSize to be greater than -1 and smaller than 10485760",
 		"keyActualValue": "Resources.%s.Properties.MinimumCompressionSize is set but smaller than 0",
 		"searchLine": common_lib.build_search_line(["Resources", name, "Properties", "MinimumCompressionSize"], []),
 	}
@@ -32,7 +32,7 @@ CxPolicy[result] {
 		"documentId": input.document[i].id,
 		"searchKey": sprintf("Resources.%s.Properties.MinimumCompressionSize", [name]),
 		"issueType": "IncorrectValue",
-		"keyExpectedValue": "Resources.%s.Properties.MinimumCompressionSize is greater than -1 and smaller than 10485760",
+		"keyExpectedValue": "Resources.%s.Properties.MinimumCompressionSize to be greater than -1 and smaller than 10485760",
 		"keyActualValue": "Resources.%s.Properties.MinimumCompressionSize is set but greater than 10485759",
 		"searchLine": common_lib.build_search_line(["Resources", name, "Properties", "MinimumCompressionSize"], []),
 	}
@@ -50,7 +50,7 @@ CxPolicy[result] {
 		"documentId": input.document[i].id,
 		"searchKey": sprintf("Resources.%s.Properties", [name]),
 		"issueType": "MissingAttribute",
-		"keyExpectedValue": sprintf("Resources.%s.Properties.MinimumCompressionSize is defined", [name]),
+		"keyExpectedValue": sprintf("Resources.%s.Properties.MinimumCompressionSize to be defined", [name]),
 		"keyActualValue": sprintf("Resources.%s.Properties.MinimumCompressionSize is not defined", [name]),
 		"searchLine": common_lib.build_search_line(["Resources", name, "Properties"], []),
 	}

diff --git a/...hout_content_encoding/test/negative1.yaml → ...h_invalid_compression/test/negative1.yaml b/...hout_content_encoding/test/negative1.yaml → ...h_invalid_compression/test/negative1.yaml
diff --git a/...hout_content_encoding/test/negative2.json → ...h_invalid_compression/test/negative2.json b/...hout_content_encoding/test/negative2.json → ...h_invalid_compression/test/negative2.json
diff --git a/...hout_content_encoding/test/positive1.yaml → ...h_invalid_compression/test/positive1.yaml b/...hout_content_encoding/test/positive1.yaml → ...h_invalid_compression/test/positive1.yaml
diff --git a/...hout_content_encoding/test/positive2.yaml → ...h_invalid_compression/test/positive2.yaml b/...hout_content_encoding/test/positive2.yaml → ...h_invalid_compression/test/positive2.yaml
diff --git a/...hout_content_encoding/test/positive3.yaml → ...h_invalid_compression/test/positive3.yaml b/...hout_content_encoding/test/positive3.yaml → ...h_invalid_compression/test/positive3.yaml
diff --git a/...hout_content_encoding/test/positive4.json → ...h_invalid_compression/test/positive4.json b/...hout_content_encoding/test/positive4.json → ...h_invalid_compression/test/positive4.json
diff --git a/...hout_content_encoding/test/positive5.json → ...h_invalid_compression/test/positive5.json b/...hout_content_encoding/test/positive5.json → ...h_invalid_compression/test/positive5.json
diff --git a/...hout_content_encoding/test/positive6.json → ...h_invalid_compression/test/positive6.json b/...hout_content_encoding/test/positive6.json → ...h_invalid_compression/test/positive6.json
diff --git a/...coding/test/positive_expected_result.json → ...ession/test/positive_expected_result.json b/...coding/test/positive_expected_result.json → ...ession/test/positive_expected_result.json
@@ -1,36 +1,36 @@
 [
   {
-    "queryName": "API Gateway Without Content Encoding",
+    "queryName": "API Gateway With Invalid Compression",
     "severity": "MEDIUM",
     "line": 17,
     "fileName": "positive1.yaml"
   },
   {
-    "queryName": "API Gateway Without Content Encoding",
+    "queryName": "API Gateway With Invalid Compression",
     "severity": "MEDIUM",
     "line": 22,
     "fileName": "positive4.json"
   },
   {
-    "queryName": "API Gateway Without Content Encoding",
+    "queryName": "API Gateway With Invalid Compression",
     "severity": "MEDIUM",
     "line": 17,
     "fileName": "positive2.yaml"
   },
   {
-    "queryName": "API Gateway Without Content Encoding",
+    "queryName": "API Gateway With Invalid Compression",
     "severity": "MEDIUM",
     "line": 22,
     "fileName": "positive5.json"
   },
   {
-    "queryName": "API Gateway Without Content Encoding",
+    "queryName": "API Gateway With Invalid Compression",
     "severity": "MEDIUM",
     "line": 5,
     "fileName": "positive3.yaml"
   },
   {
-    "queryName": "API Gateway Without Content Encoding",
+    "queryName": "API Gateway With Invalid Compression",
     "severity": "MEDIUM",
     "line": 5,
     "fileName": "positive6.json"