Merge branch 'main' into johnsca/feat/ENG-2685/default-policy-collection

Author: johnsca

scripts/openapi.json

@@ -2194,7 +2194,7 @@
               "added": 0,
               "updated": 0,
               "removed": 0,
-              "started_at": "2023-09-19T20:57:16.486859"
+              "started_at": "2023-10-06T20:10:54.534411"
             }
           }
         }
@@ -2320,7 +2320,7 @@
               "added": 0,
               "updated": 0,
               "removed": 0,
-              "started_at": "2023-09-19T20:57:16.486380"
+              "started_at": "2023-10-06T20:10:54.533561"
             }
           }
         }
@@ -2715,7 +2715,9 @@
               },
               {
                 "type": "array",
-                "items": {}
+                "items": {
+                  "type": "string"
+                }
               }
             ]
           },
@@ -2832,14 +2834,9 @@
       },
       "Severity": {
         "title": "Severity",
-        "enum": [
-          "HIGH",
-          "MEDIUM",
-          "LOW",
-          "UNKNOWN"
-        ],
         "type": "string",
-        "description": "An enumeration."
+        "description": "Severity of a policy violation.",
+        "pattern": "(?i)^(high|medium|low|unknown)$"
       },
       "Summary": {
         "title": "Summary",

stacklet/client/sinistral/commands/scans.py

@@ -90,7 +90,10 @@ class Create(ClientCommand):
                                         "title": "Resource",
                                         "anyOf": [
                                             {"type": "string"},
-                                            {"type": "array", "items": {}},
+                                            {
+                                                "type": "array",
+                                                "items": {"type": "string"},
+                                            },
                                         ],
                                     },
                                     "description": {
@@ -103,14 +106,9 @@ class Create(ClientCommand):
                                         "properties": {
                                             "severity": {
                                                 "title": "Severity",
-                                                "enum": [
-                                                    "HIGH",
-                                                    "MEDIUM",
-                                                    "LOW",
-                                                    "UNKNOWN",
-                                                ],
                                                 "type": "string",
-                                                "description": "An enumeration.",
+                                                "description": "Severity of a policy violation.",
+                                                "pattern": "(?i)^(high|medium|low|unknown)$",
                                             }
                                         },
                                     },

tests/test_client.py

@@ -316,7 +316,8 @@ def test_client_command_uses_query_params():
         assert res == {"a": "policy"}
 
 
-def test_client_command_scan_create():
+@pytest.mark.parametrize("severity", ["HIGH", "high"])
+def test_client_command_scan_create(severity):
     client = sinistral_client().client("scans")
     with patch.object(
         RestExecutor, "post", return_value=get_mock_response(json={"id": "new-scan"})
@@ -332,7 +333,7 @@ def test_client_command_scan_create():
                         "description": "foo",
                         "filters": [],
                         "mode": {},
-                        "metadata": {"severity": "HIGH"},
+                        "metadata": {"severity": f"{severity}"},
                     },
                     "resource": {
                         "id": "foo",