Update to work with Config-Service 3.2.x

jason-fox · jason-fox · commit d956ed33b109 · 2025-08-13T18:41:19.000+02:00
diff --git a/.env b/.env
@@ -43,4 +43,4 @@ MYSQL_DB_VERSION=8.1
 # Trusted Issuers List Variables
 TRUSTED_ISSUERS_VERSION=0.2.1
 # Credentials Config Service Variables
-CONFIG_SERVICE_VERSION=2.0.0-PRE-8
+CONFIG_SERVICE_VERSION=3.2.3
diff --git a/README.md b/README.md
@@ -700,19 +700,32 @@ curl -L 'localhost:8081/service/vet'
     "id": "vet",
     "defaultOidcScope": "default",
     "oidcScopes": {
-        "default": [
-            {
-                "type": "VerifiableCredential",
-                "trustedParticipantsLists": [],
-                "trustedIssuersLists": [
-                    "http://trusted-issuers-list:8080"
-                ],
-                "holderVerification": {
-                    "enabled": false,
-                    "claim": "subject"
+        "default": {
+            "credentials": [
+                {
+                    "type": "VerifiableCredential",
+                    "trustedParticipantsLists": [],
+                    "trustedIssuersLists": [
+                        "http://trusted-issuers-list:8080"
+                    ],
+                    "holderVerification": {
+                        "enabled": false,
+                        "claim": "subject"
+                    },
+                    "requireCompliance": false,
+                    "jwtInclusion": {
+                        "enabled": true,
+                        "fullInclusion": false,
+                        "claimsToInclude": []
+                    }
                 }
-            }
-        ]
+            ],
+            "presentationDefinition": {
+                "id": null,
+                "input_descriptors": null
+            },
+            "flatClaims": false
+        }
     }
 }
 ```
diff --git a/docker-compose/common.yml b/docker-compose/common.yml
@@ -68,6 +68,8 @@ services:
       test: ["CMD","mongosh", "localhost:27017/test", "--quiet"]
       interval: 5s
 
+  # Obtain a dump using:
+  # docker exec db-mysql-config /usr/bin/mysqldump --user=root --password=root db  > theirs.sql
   mysql-config-db:
     labels:
       org.fiware: 'tutorial'
@@ -231,6 +233,14 @@ services:
     ports:
       - "${IOTA_NORTH_PORT}:${IOTA_NORTH_PORT}" # localhost:4041
       - "${IOTA_SOUTH_PORT}:${IOTA_SOUTH_PORT}" # localhost:7896
+    deploy:
+      resources:
+        limits:
+          memory: 512M
+          cpus: '1.0'
+        reservations:
+          memory: 256M
+          cpus: '0.5'
     environment:
       - IOTA_NORTH_PORT=${IOTA_NORTH_PORT}
       - IOTA_REGISTRY_TYPE=mongodb #Whether to hold IoT device info in memory or in a database
diff --git a/link-devices b/link-devices
@@ -0,0 +1,84 @@
+#!/bin/bash
+#
+#  curl commands to reload the data from the previous tutorial
+#
+#
+
+set -e
+echo
+printf "⏳ Link Devices to Animal entities"
+
+
+generate_post_data()
+{
+  cat <<EOF
+  $devices
+EOF
+}
+
+
+# Associate 100 cow collar Devices to Animal entities
+
+devices="{\"devices\":[";
+for number in 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018 019 020 021 022 023 024 025 026 027 028 029 030 031 032 033 034 035 036 037 038 039 040 041 042 043 044 045 046 047 048 049 050 051 052 053 054 055 056 057 058 059 060 061 062 063 064 065 066 067 068 069 070 071 072 073 074 075 076 077 078 079 080 081 082 083 084 085 086 087 088 089 090 091 092 093 094 095 096 097 098 099 100
+do
+
+  devices="$devices {\"device_id\":\"cow$number\", \"entity_type\": \"Device\" , \"entity_name\": \"urn:ngsi-ld:Device:cow$number\", \"apikey\": \"98699\",";
+  devices="$devices \"static_attributes\": [
+         {
+          \"name\": \"controlledAsset\", 
+          \"type\": \"Relationship\", \"link\": {
+             \"attributes\": [\"heartRate\", \"location\"],
+             \"name\": \"providedBy\",
+             \"type\": \"Animal\"
+          },
+          \"value\": \"urn:ngsi-ld:Animal:cow$number\"}]}";
+
+  if [ $number == '100' ]
+  then
+    devices="$devices]}";
+  else 
+    devices="$devices,";
+  fi
+done
+
+curl -s -o /dev/null -X POST \
+   'http://iot-agent:4041/iot/devices' \
+   -H 'Content-Type: application/json' \
+   -H 'fiware-service: openiot' \
+   -H 'fiware-servicepath: /' \
+   -d "$(generate_post_data)"
+
+# Associate 100 pig collar Devices to Animal entities
+
+devices="{\"devices\":[";
+for number in 001 002 003 004 005 006 007 008 009 010 011 012 013 014 015 016 017 018 019 020 021 022 023 024 025 026 027 028 029 030 031 032 033 034 035 036 037 038 039 040 041 042 043 044 045 046 047 048 049 050 051 052 053 054 055 056 057 058 059 060 061 062 063 064 065 066 067 068 069 070 071 072 073 074 075 076 077 078 079 080 081 082 083 084 085 086 087 088 089 090 091 092 093 094 095 096 097 098 099 100
+do
+
+  devices="$devices {\"device_id\":\"pig$number\", \"entity_type\": \"Device\" , \"entity_name\": \"urn:ngsi-ld:Device:pig$number\", \"apikey\": \"110990\",";
+  devices="$devices \"static_attributes\": [
+         {
+          \"name\": \"controlledAsset\", 
+          \"type\": \"Relationship\", \"link\": {
+             \"attributes\": [\"heartRate\", \"location\"],
+             \"name\": \"providedBy\",
+             \"type\": \"Animal\"
+          },
+          \"value\": \"urn:ngsi-ld:Animal:pig$number\"}]}";
+
+  if [ $number == '100' ]
+  then
+    devices="$devices]}";
+  else 
+    devices="$devices,";
+  fi
+done
+
+curl -s -o /dev/null -X POST \
+   'http://iot-agent:4041/iot/devices' \
+   -H 'Content-Type: application/json' \
+   -H 'fiware-service: openiot' \
+   -H 'fiware-servicepath: /' \
+   -d "$(generate_post_data)"
+
+echo -e " \033[1;32mdone\033[0m"
diff --git a/mysql-data/backup.sql b/mysql-data/backup.sql
@@ -2,7 +2,7 @@
 --
 -- Host: localhost    Database: db
 -- ------------------------------------------------------
--- Server version	8.1.0
+-- Server version 8.1.0
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -44,10 +44,38 @@ CREATE TABLE `flyway_schema_history` (
 
 LOCK TABLES `flyway_schema_history` WRITE;
 /*!40000 ALTER TABLE `flyway_schema_history` DISABLE KEYS */;
-INSERT INTO `flyway_schema_history` VALUES (1,'0.0.1','initial-migration','SQL','V0_0_1__initial-migration.sql',-1767291177,'user','2025-02-19 11:58:53',82,1),(2,'1.0.2','minimal table','SQL','V1_0_2__minimal_table.sql',-454303568,'user','2025-02-19 11:58:53',54,1);
+INSERT INTO `flyway_schema_history` VALUES (1,'0.0.1','initial-migration','SQL','V0_0_1__initial-migration.sql',-1767291177,'user','2025-08-13 14:51:32',92,1),(2,'1.0.2','minimal table','SQL','V1_0_2__minimal_table.sql',-454303568,'user','2025-08-13 14:51:32',73,1),(3,'2.0.0','clean tables','SQL','V2_0_0__clean_tables.sql',-1059881192,'user','2025-08-13 14:51:32',81,1),(4,'2.0.1','add flat claim flag','SQL','V2_0_1__add_flat_claim_flag.sql',485455161,'user','2025-08-13 14:51:32',19,1);
 /*!40000 ALTER TABLE `flyway_schema_history` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `scope_entry`
+--
+
+DROP TABLE IF EXISTS `scope_entry`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `scope_entry` (
+  `id` bigint NOT NULL AUTO_INCREMENT,
+  `service_id` varchar(255) DEFAULT NULL,
+  `scope_key` varchar(255) DEFAULT NULL,
+  `credentials` longtext NOT NULL,
+  `presentation_definition` longtext NOT NULL,
+  `flat_claims` tinyint(1) NOT NULL,
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=2 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `scope_entry`
+--
+
+LOCK TABLES `scope_entry` WRITE;
+/*!40000 ALTER TABLE `scope_entry` DISABLE KEYS */;
+INSERT INTO `scope_entry` VALUES (1,'vet','default','[{\"credentialType\":\"VerifiableCredential\",\"verifyHolder\":false,\"requireCompliance\":false,\"jwtInclusion\":{\"enabled\":true,\"fullInclusion\":false},\"holderClaim\":\"subject\",\"trustedLists\":[{\"type\":\"TRUSTED_ISSUERS\",\"listType\":\"ebsi\",\"endpoint\":\"http://trusted-issuers-list:8080\"}]}]','{}',0);
+/*!40000 ALTER TABLE `scope_entry` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `service`
 --
@@ -57,8 +85,7 @@ DROP TABLE IF EXISTS `service`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `service` (
   `id` varchar(255) NOT NULL,
-  `default_oidc_scope` varchar(255) NOT NULL,
-  `oidc_scopes` longtext NOT NULL,
+  `default_oidc_scope` varchar(255) DEFAULT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -69,7 +96,7 @@ CREATE TABLE `service` (
 
 LOCK TABLES `service` WRITE;
 /*!40000 ALTER TABLE `service` DISABLE KEYS */;
-INSERT INTO `service` VALUES ('vet','default','{\"default\":[{\"credentialType\":\"VerifiableCredential\",\"trustedLists\":[{\"type\":\"TRUSTED_ISSUERS\",\"listType\":\"EBSI\",\"endpoint\":\"http://trusted-issuers-list:8080\"}],\"verifyHolder\":false,\"holderClaim\":\"subject\"}]}');
+INSERT INTO `service` VALUES ('vet','default');
 /*!40000 ALTER TABLE `service` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
@@ -82,4 +109,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2025-02-19 13:12:29
+-- Dump completed on 2025-08-13 15:10:13
diff --git a/provision-devices b/provision-devices
diff --git a/services b/services
