From 414764353b074a440a083d474b2d521562b1f039 Mon Sep 17 00:00:00 2001
From: David Antolin Alvarez <dantolin@iriusrisk.com>
Date: Tue, 29 Aug 2023 13:42:48 +0200
Subject: [PATCH] [OPT-952] Removed type from version 0.1.0

---
 .gitignore      | 122 ++++++++++++++++++++++++++++++++++++++++++++++++
 EXAMPLE.json    |   2 -
 EXAMPLE.yaml    |   2 -
 README.md       |  17 +------
 otm_schema.json |   1 -
 5 files changed, 124 insertions(+), 20 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..f467ff8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,122 @@
+# Workspace
+*.code-workspace
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+test-reports/
+/coveragereport/
+
+# SonarLint plugin
+.scannerwork
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+# caret editor
+caret
+
+# IntelliJ/Pycharm folder
+/.idea
+
+# Intermediate files
+**/diagram.xml
+**/product.xml
diff --git a/EXAMPLE.json b/EXAMPLE.json
index abe1150..e25e8b4 100644
--- a/EXAMPLE.json
+++ b/EXAMPLE.json
@@ -229,7 +229,6 @@
     {
       "name": "Internet",
       "id": "f0ba7722-39b6-4c81-8290-a30a248bb8d9",
-      "type": "internet",
       "description": "This is the internet trust zone",
       "risk": {
         "trustRating": 20
@@ -253,7 +252,6 @@
     {
       "name": "Private",
       "id": "2ab4effa-40b7-4cd2-ba81-8247d29a6f2d",
-      "type": "private",
       "description": "Private trustzone for protected components",
       "risk": {
         "trustRating": 100
diff --git a/EXAMPLE.yaml b/EXAMPLE.yaml
index cc6f87d..11d4d3a 100644
--- a/EXAMPLE.yaml
+++ b/EXAMPLE.yaml
@@ -167,7 +167,6 @@ dataflows:
 trustZones:
   - name: Internet
     id: f0ba7722-39b6-4c81-8290-a30a248bb8d9
-    type: internet
     description: This is the internet trust zone
     risk:
       trustRating: 20
@@ -183,7 +182,6 @@ trustZones:
     attributes:
   - name: Private
     id: 2ab4effa-40b7-4cd2-ba81-8247d29a6f2d
-    type: private
     description: Private trustzone for protected components
     risk:
       trustRating: 100
diff --git a/README.md b/README.md
index 21f7624..f81d9f1 100644
--- a/README.md
+++ b/README.md
@@ -755,7 +755,7 @@ Assets are the different kinds of sensible information that take part in our thr
 
 ```yaml
 assets:
-    - name: Credit Card Data
+  - name: Credit Card Data
     id: cc-data
     description: Credit card numbers used for payments in the platform
     risk:
@@ -1132,18 +1132,6 @@ Trust zones are the different areas within which components are located. They de
 </td>
 </tr>
 
-<tr></tr>
-<tr>
-<td>type</td>
-<td>string</td>
-<td><b>REQUIRED</b> Type for the trust zone</td>
-<td>
-
-    type: internet
-
-</td>
-</tr>
-
 <tr></tr>
 <tr>
 <td>description</td>
@@ -1211,7 +1199,6 @@ A trust zone can have <b>zero or one parent</b>: another component or a trust zo
 trustzones:
   - name: Internet
     id: 730df42e-69a4-11ed-bd69-9b318e4f98c5
-    type: internet
     description: This is the internet trust zone
     risk:
       trustRating: 20
@@ -1864,7 +1851,7 @@ mitigations:
   - name: Mitigation 2
     id: 3b837730-e300-11eb-ba80-0242ac130004
     description: Description for mitigation 2
-    riskReduction 100
+    riskReduction: 100
 ```
 
 ## Mitigation instance object
diff --git a/otm_schema.json b/otm_schema.json
index 3eb1732..9727ea1 100644
--- a/otm_schema.json
+++ b/otm_schema.json
@@ -74,7 +74,6 @@
                 "properties": {
                     "id": {"type": "string"},
                     "name": {"type": "string"},
-                    "type": {"type": "string"},
                     "description": {"type": ["string", "null"]},
                     "risk": {
                         "type": "object",