Extend license, community, and social_media enums (#599)

* Extend license, community, and social_media enums

(to accomodate needs of OWASP Juice Shop; see OWASP/www-project-juice-shop#16 (comment))

* Make new enum entries known in test cases

* Honor line length restrictions

* Cut lines more strictly

* Apply missing enum changes

* Remove trailing comma

* Update code

---------

Co-authored-by: Arkadii Yakovets <[email protected]>
Co-authored-by: Arkadii Yakovets <[email protected]>

Author: bkimminich

common.json

@@ -21,6 +21,8 @@
           "enum": [
             "discord",
             "github-discussions",
+            "matrix",
+            "reddit",
             "slack"
           ],
           "type": "string"
@@ -274,6 +276,7 @@
           "description": "The type of social media platform.",
           "enum": [
             "bluesky",
+            "facebook",
             "linkedin",
             "mastodon",
             "x",

project.json

@@ -118,6 +118,7 @@
           "BSD-2-Clause",
           "BSD-3-Clause",
           "CC-BY-4.0",
+          "CC-BY-NC-ND-4.0",
           "CC-BY-SA-4.0",
           "CC0-1.0",
           "EUPL-1.2",

tests/schema/common/community_test.py

@@ -17,15 +17,18 @@
         ("name_undefined.yaml", "$: 'name' is a required property"),
         (
             "platform_empty.yaml",
-            "$.platform: '' is not one of ['discord', 'github-discussions', 'slack']",
+            "$.platform: '' is not one of ['discord', 'github-discussions', 'matrix', "
+            "'reddit', 'slack']",
         ),
         (
             "platform_invalid.yaml",
-            "$.platform: 'telegram' is not one of ['discord', 'github-discussions', 'slack']",
+            "$.platform: 'telegram' is not one of ['discord', 'github-discussions', 'matrix', "
+            "'reddit', 'slack']",
         ),
         (
             "platform_null.yaml",
-            "$.platform: None is not one of ['discord', 'github-discussions', 'slack']",
+            "$.platform: None is not one of ['discord', 'github-discussions', 'matrix', "
+            "'reddit', 'slack']",
         ),
         ("platform_undefined.yaml", "$: 'platform' is a required property"),
         ("url_empty.yaml", "$.url: '' is not a 'uri'"),

tests/schema/common/social_media_test.py

@@ -14,16 +14,18 @@
         ("description_null.yaml", "$.description: None is not of type 'string'"),
         (
             "platform_empty.yaml",
-            "$.platform: '' is not one of ['bluesky', 'linkedin', 'mastodon', 'x', 'youtube']",
+            "$.platform: '' is not one of ['bluesky', 'facebook', 'linkedin', 'mastodon', 'x', "
+            "'youtube']",
         ),
         (
             "platform_invalid.yaml",
-            "$.platform: 'bitcoin' is not one of ['bluesky', 'linkedin', 'mastodon', 'x', "
-            "'youtube']",
+            "$.platform: 'bitcoin' is not one of ['bluesky', 'facebook', 'linkedin', 'mastodon', "
+            "'x', 'youtube']",
         ),
         (
             "platform_null.yaml",
-            "$.platform: None is not one of ['bluesky', 'linkedin', 'mastodon', 'x', 'youtube']",
+            "$.platform: None is not one of ['bluesky', 'facebook', 'linkedin', 'mastodon', "
+            "'x', 'youtube']",
         ),
         ("platform_undefined.yaml", "$: 'platform' is a required property"),
         ("url_empty.yaml", "$.url: '' is not a 'uri'"),

tests/schema/project_test.py

@@ -85,8 +85,8 @@
             "license_invalid.yaml",
             "$.license[0]: 'INVALID-LICENSE-VALUE' is not one of ['AGPL-3.0', "
             "'Apache License 2.0', 'Apache-2.0', 'BSD-2-Clause', 'BSD-3-Clause', "
-            "'CC-BY-4.0', 'CC-BY-SA-4.0', 'CC0-1.0', 'EUPL-1.2', 'GPL-2.0', 'GPL-3.0', "
-            "'LGPL-2.1', 'LGPL-3.0', 'MIT', 'MPL-2.0', 'OTHER']",
+            "'CC-BY-4.0', 'CC-BY-NC-ND-4.0', 'CC-BY-SA-4.0', 'CC0-1.0', 'EUPL-1.2', "
+            "'GPL-2.0', 'GPL-3.0', 'LGPL-2.1', 'LGPL-3.0', 'MIT', 'MPL-2.0', 'OTHER']",
         ),
         ("logo_empty.yaml", "$.logo: [] should be non-empty"),
         ("logo_null.yaml", "$.logo: None is not of type 'array'"),