Merge pull request #589 from OWASP/release-fix

Adding tarot as a template for the leaflet.
OWASP · Jun 3, 2024 · 07a5a73 · 07a5a73
2 parents adfb04d + aa2ea15
commit 07a5a73
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -81,11 +81,10 @@
               title: "Latest pre-release"
               files: |
                 CHANGELOG.md
-                LICENSE
                 LICENSE.md
                 README.md
                 creative-commons-attribution-3.0.txt
-                output/owasp_cornucopia_mobileapp_1.00.zip
+                output/owasp_cornucopia_mobileapp_1.00_en.zip
                 output/owasp_cornucopia_webapp_1.22_en.zip
                 output/owasp_cornucopia_webapp_1.22_es.zip
                 output/owasp_cornucopia_webapp_1.22_fr.zip

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -65,7 +65,7 @@
             run: pipenv run coverage xml
           - name: Check test coverage - Report
             run: pipenv run coverage report --fail-under 85 scripts/convert*        
-          - name: Generate new output files
+          - name: Generate new output file
             run: | 
               pipenv run python scripts/convert.py -l all -lt all -t bridge -v 1.22 -e webapp
               pipenv run python scripts/convert.py -l all -lt all -t tarot -v 1.22 -e webapp
@@ -94,11 +94,10 @@
               prerelease: false
               files: |
                 CHANGELOG.md
-                LICENSE
                 LICENSE.md
                 README.md
                 creative-commons-attribution-3.0.txt
-                output/owasp_cornucopia_mobileapp_1.00.zip
+                output/owasp_cornucopia_mobileapp_1.00_en.zip
                 output/owasp_cornucopia_webapp_1.22_en.zip
                 output/owasp_cornucopia_webapp_1.22_es.zip
                 output/owasp_cornucopia_webapp_1.22_fr.zip

diff --git a/scripts/convert.py b/scripts/convert.py
@@ -445,7 +445,7 @@ def get_mapping_data_for_edition(
     """Get the raw data of the replacement text from correct yaml file"""
     data: Dict[Any, Dict[Any, Any]] = {}
     logging.debug(
-        f" --- Starting get_mapping_data_for_edition() for edition: "
+        " --- Starting get_mapping_data_for_edition() for edition: "
         f"{edition} , language: {language} and version: {version} "
         f" with mapping to version {get_valid_mapping_for_version(version, edition)}"
     )
@@ -804,9 +804,6 @@ def get_valid_mapping_for_version(version: str, edition: str) -> str:
 
 def get_valid_templates() -> List[str]:
     templates = []
-    if convert_vars.args.layout.lower() in "leaflet":
-        templates.append("bridge")
-        return templates
     if convert_vars.args.template.lower() == "all":
         for template in [t for t in convert_vars.TEMPLATE_CHOICES if t not in ("all", "bridge_qr")]:
             templates.append(template)

diff --git a/source/webapp-mappings-2.00.yaml b/source/webapp-mappings-2.00.yaml
@@ -9,7 +9,7 @@ meta:
   languages: ["en", "es", "fr", "nl", "nl", "no-nb", "pt-br"]
 suits:
 -
-  name: "Data Validation & Encoding"
+  name: "DATA VALIDATION & ENCODING"
   cards:
   -
     id: "DV2"
@@ -108,7 +108,7 @@ suits:
     capec: [ 23, 28, 76, 152, 160, 261 ]
     safecode: [ 2, 19, 20 ]
 -
-  name: "Authentication"
+  name: "AUTHENTICATION"
   cards:
   -
     id: "AC2"
@@ -207,7 +207,7 @@ suits:
     capec: [ 115, 207, 554 ]
     safecode: [ 14, 28 ]
 -
-  name: "Session Management"
+  name: "SESSION MANAGEMENT"
   cards:
   -
     id: "SM2"
@@ -306,7 +306,7 @@ suits:
     capec: [ 21 ]
     safecode: [ 14, 28 ]
 -
-  name: "Authorization"
+  name: "AUTHORIZATION"
   cards:
   -
     id: "AZ2"
@@ -405,7 +405,7 @@ suits:
     capec: [ 207, 554 ]
     safecode: [ 8, 10, 11 ]
 -
-  name: "Cryptography"
+  name: "CRYPTOGRAPHY"
   cards:
   -
     id: "CR2"
@@ -504,7 +504,7 @@ suits:
     capec: [ 207, 554 ]
     safecode: [ 14, 21, 29 ]
 -
-  name: "Cornucopia"
+  name: "CORNUCOPIA"
   cards:
   -
     id: "CO2"

diff --git a/tests/scripts/convert_utest.py b/tests/scripts/convert_utest.py
@@ -113,7 +113,7 @@ def test_get_valid_style_choices_dynamic(self) -> None:
 
     def test_get_valid_style_choices_blank(self) -> None:
         c.convert_vars.args = argparse.Namespace(template="", layout="")
-        want_template = ["bridge"]
+        want_template = ["bridge", "tarot"]
 
         got_template = c.get_valid_templates()
         self.assertListEqual(want_template, got_template)
@@ -127,7 +127,7 @@ def test_get_valid_style_choices_all(self) -> None:
 
     def test_get_valid_style_choices_for_leaflet(self) -> None:
         c.convert_vars.args = argparse.Namespace(template="all", layout="leaflet")
-        want_template = ["bridge"]
+        want_template = ["bridge", "tarot"]
 
         got_template = c.get_valid_templates()
         self.assertListEqual(want_template, got_template)