feat: add country definitions and unify schema validation

.github/workflows/ci.yml

@@ -21,4 +21,7 @@ jobs:
               uses: sourcemeta/jsonschema@v11.5.1
 
             - name: Validate Service Schema
-              run: jsonschema validate ./schema.json ./services/*.json
+              run: jsonschema validate ./schemas/services.schema.json ./services/*.json
+
+            - name: Validate Country Schema
+              run: jsonschema validate ./schemas/countries.schema.json ./countries/*.json

.github/workflows/release.yml

@@ -28,8 +28,11 @@ jobs:
             - name: Upload Compiled Services
               uses: actions/upload-artifact@v4
               with:
-                  name: services-compiled
-                  path: services.json
+                  name: cloud-shield-definitions
+                  path: |
+                      services.json
+                      countries.json
+                      ids.json
                   retention-days: 90
 
             - name: Create Release and Upload Asset
@@ -42,7 +45,9 @@ jobs:
                   echo "Creating release ${TAG_NAME}"
 
                   gh release create "${TAG_NAME}" \
-                    --title "Services ${VERSION}" \
-                    --notes "Combined service definitions" \
+                    --title "Definitions ${VERSION}" \
+                    --notes "Combined service and country definitions" \
                     --latest \
-                    services.json
+                    services.json \
+                    countries.json \
+                    ids.json

.gitignore

@@ -1,5 +1,6 @@
 # Compiled output
 services.json
+countries.json
 
 # Node modules (if needed in future)
 node_modules/

.vscode/settings.json

@@ -4,10 +4,16 @@
             "fileMatch": [
                 "services/*.json"
             ],
-            "url": "./schema.json"
+            "url": "./schemas/services.schema.json"
+        },
+        {
+            "fileMatch": [
+                "countries/*.json"
+            ],
+            "url": "./schemas/countries.schema.json"
         }
     ],
     "json.validate.enable": true,
     "editor.defaultFormatter": "esbenp.prettier-vscode",
     "editor.formatOnSave": true
-}
+}

README.md

@@ -3,58 +3,80 @@
 </p>
 
 
-# Securepoint DNS Services
+# Securepoint Cloud Shield Definitions
 
-A collection of services with the corresponding domains used in our product "Cloud Shield".
+A collection of Cloud Shield definitions, including services with their domains and ISO country definitions.
 
 ## Overview
 
-This repository contains JSON definitions for various services and their associated domains that are used by Cloud Shield. Each service is defined in a separate JSON file that follows a standardized schema to ensure consistency and reliability.
+This repository contains JSON definitions used by Cloud Shield. Services are defined with their associated domains, and countries are defined by ISO alpha-2 code with English and German display names.
 
 ## Repository Structure
 
 ```
-dns-services/
+cloud-shield-definitions/
 ├── README.md
-├── schema.json         # JSON schema defining the service structure
-├── compile.js          # Script to compile all services into a single JSON file
-└── services/           # Directory containing all service definitions
-    ├── service1.json
-    ├── service2.json
+├── schemas/
+│   ├── services.schema.json  # JSON schema defining the service structure
+│   └── countries.schema.json # JSON schema defining the country structure
+├── main.go             # Script to compile all definitions into generated JSON files
+├── ids.json            # Stable numeric IDs grouped by service filename and ISO country code
+├── services/           # Directory containing all service definitions
+│   ├── service1.json
+│   ├── service2.json
+│   └── ...
+└── countries/          # Directory containing ISO country definitions
+    ├── DE.json
+    ├── FR.json
     └── ...
 ```
 
-## Compiled Services
+## Compiled Definitions
 
-All individual service files are automatically compiled into a single `services.json` file through the CI/CD pipeline. This compiled file contains all services in a single JSON object where each key is the filename (without `.json` extension).
+All individual definition files are automatically compiled into generated JSON catalogs. Service definitions are compiled into `services.json`, and country definitions are compiled into `countries.json`.
 
 ### Downloading the Compiled File
 
-The compiled `services.json` file is available in two ways:
+The compiled files are available in two ways:
 
 1. **GitHub Releases**: Automatically published with each push to master branch
 2. **GitHub Actions Artifacts**: Available for all CI runs (including pull requests)
 
 ### Local Compilation
 
-To compile the services locally:
+To compile the definitions locally:
 
 ```bash
-node compile.js
+go run main.go
 ```
 
-This will generate a `services.json` file in the root directory containing all services.
+This will generate:
+
+- `services.json` with the compiled service catalog
+- `countries.json` with the compiled country catalog
+- `ids.json` with the stable numeric ID registry in the form `{ "services": {...}, "countries": {...} }`
+
+Each compiled service includes an `id` field. Each compiled country includes an `id` and `code` field. Existing IDs are preserved, and only newly added definition files receive the next free number.
 
 ## Adding New Services
 
 To add a new service:
 
 1. Create a new JSON file in the `services` directory
-2. Follow the structure defined in `schema.json`
+2. Follow the structure defined in `schemas/services.schema.json`
 3. Include all required fields and adhere to the specified formats
 4. Use a descriptive filename that clearly identifies the service
 5. Validate your JSON against the schema before submitting
 
+## Adding New Countries
+
+To add a new country definition:
+
+1. Create a new JSON file in the `countries` directory named with the ISO alpha-2 code, for example `DE.json`
+2. Follow the structure defined in `schemas/countries.schema.json`
+3. Include English and German names in the `name` object
+4. Do not rename existing country files after they are merged
+
 
 > [!WARNING]
 > **DO NOT change existing file names once they are merged into the repository.**
@@ -73,4 +95,4 @@ If you have suggestions for new services or improvements, please open an issue o
 
 ## License
 
-MIT License
+MIT License

countries/AD.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Andorra",
+        "de": "Andorra"
+    }
+}

countries/AE.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "United Arab Emirates",
+        "de": "Vereinigte Arabische Emirate"
+    }
+}

countries/AF.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Afghanistan",
+        "de": "Afghanistan"
+    }
+}

countries/AG.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Antigua & Barbuda",
+        "de": "Antigua und Barbuda"
+    }
+}

countries/AI.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Anguilla",
+        "de": "Anguilla"
+    }
+}

countries/AL.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Albania",
+        "de": "Albanien"
+    }
+}

countries/AM.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Armenia",
+        "de": "Armenien"
+    }
+}

countries/AO.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Angola",
+        "de": "Angola"
+    }
+}

countries/AQ.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Antarctica",
+        "de": "Antarktis"
+    }
+}

countries/AR.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Argentina",
+        "de": "Argentinien"
+    }
+}

countries/AS.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "American Samoa",
+        "de": "Amerikanisch-Samoa"
+    }
+}

countries/AT.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Austria",
+        "de": "Österreich"
+    }
+}

countries/AU.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Australia",
+        "de": "Australien"
+    }
+}

countries/AW.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Aruba",
+        "de": "Aruba"
+    }
+}

countries/AX.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Åland Islands",
+        "de": "Ålandinseln"
+    }
+}

countries/AZ.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Azerbaijan",
+        "de": "Aserbaidschan"
+    }
+}

countries/BA.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Bosnia & Herzegovina",
+        "de": "Bosnien und Herzegowina"
+    }
+}

countries/BB.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Barbados",
+        "de": "Barbados"
+    }
+}

countries/BD.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Bangladesh",
+        "de": "Bangladesch"
+    }
+}

countries/BE.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Belgium",
+        "de": "Belgien"
+    }
+}

countries/BF.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Burkina Faso",
+        "de": "Burkina Faso"
+    }
+}

countries/BG.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Bulgaria",
+        "de": "Bulgarien"
+    }
+}

countries/BH.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Bahrain",
+        "de": "Bahrain"
+    }
+}

countries/BI.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Burundi",
+        "de": "Burundi"
+    }
+}

countries/BJ.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Benin",
+        "de": "Benin"
+    }
+}

countries/BL.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "St. Barthélemy",
+        "de": "St. Barthélemy"
+    }
+}

countries/BM.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Bermuda",
+        "de": "Bermuda"
+    }
+}

countries/BN.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Brunei",
+        "de": "Brunei Darussalam"
+    }
+}

countries/BO.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Bolivia",
+        "de": "Bolivien"
+    }
+}

countries/BQ.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Caribbean Netherlands",
+        "de": "Karibische Niederlande"
+    }
+}

countries/BR.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Brazil",
+        "de": "Brasilien"
+    }
+}

countries/BS.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Bahamas",
+        "de": "Bahamas"
+    }
+}

countries/BT.json

@@ -0,0 +1,6 @@
+{
+    "name": {
+        "en": "Bhutan",
+        "de": "Bhutan"
+    }
+}