Vehicle databroker upgrade (#62)

mml5bg · web-flow · commit 293a0c96afd1 · 2023-03-07T12:27:30.000+01:00
diff --git a/.vscode/scripts/run-vehicledatabroker.sh b/.vscode/scripts/run-vehicledatabroker.sh
@@ -30,21 +30,21 @@ DATABROKER_ASSET_FOLDER="$ROOT_DIRECTORY/.vscode/scripts/assets/databroker/$DATA
 if [[ `uname -m` == 'aarch64' || `uname -m` == 'arm64' ]]; then
     echo "Detected ARM architecture"
     PROCESSOR="aarch64"
-    DATABROKER_BINARY_NAME="databroker_aarch64.tar.gz"
-    DATABROKER_EXEC_PATH="$DATABROKER_ASSET_FOLDER/$PROCESSOR/target/release"
+    DATABROKER_BINARY_NAME="databroker-arm64.tar.gz"
+    DATABROKER_EXEC_PATH="$DATABROKER_ASSET_FOLDER/$PROCESSOR/databroker"
 else
     echo "Detected x86_64 architecture"
     PROCESSOR="x86_64"
-    DATABROKER_BINARY_NAME='databroker_x86_64.tar.gz'
-    DATABROKER_EXEC_PATH="$DATABROKER_ASSET_FOLDER/$PROCESSOR/target/release"
+    DATABROKER_BINARY_NAME='databroker-amd64.tar.gz'
+    DATABROKER_EXEC_PATH="$DATABROKER_ASSET_FOLDER/$PROCESSOR/databroker"
 fi
 
 if [[ ! -f "$DATABROKER_EXEC_PATH/databroker" ]]
 then
-  DOWNLOAD_URL=https://github.com/boschglobal/kuksa.val/releases/download
+  DOWNLOAD_URL=https://github.com/eclipse/kuksa.val/releases/download
   echo "Downloading databroker:$DATABROKER_VERSION"
   curl -o $DATABROKER_ASSET_FOLDER/$PROCESSOR/$DATABROKER_BINARY_NAME --create-dirs -L -H "Accept: application/octet-stream" "$DOWNLOAD_URL/$DATABROKER_VERSION/$DATABROKER_BINARY_NAME"
-  tar -xf $DATABROKER_ASSET_FOLDER/$PROCESSOR/$DATABROKER_BINARY_NAME -C $DATABROKER_ASSET_FOLDER/$PROCESSOR
+  tar -xf $DATABROKER_ASSET_FOLDER/$PROCESSOR/$DATABROKER_BINARY_NAME -C "$DATABROKER_ASSET_FOLDER/$PROCESSOR"
 fi
 
 export DAPR_GRPC_PORT=$DATABROKER_GRPC_PORT
diff --git a/examples/array-datatype/AppManifest.json b/examples/array-datatype/AppManifest.json
@@ -15,8 +15,8 @@
                 },
                 {
                     "name": "databroker",
-                    "image": "ghcr.io/boschglobal/kuksa.val/databroker",
-                    "version": "0.0.2"
+                    "image": "ghcr.io/eclipse/kuksa.val/databroker",
+                    "version": "0.3.0"
                 },
                 {
                     "name": "feedercan",
diff --git a/examples/atomic-set/AppManifest.json b/examples/atomic-set/AppManifest.json
@@ -11,7 +11,7 @@
                 {
                     "name": "seatservice",
                     "image": "ghcr.io/boschglobal/kuksa.val.services/seat_service",
-                    "version": "v0.2.0"
+                    "version": "v0.3.0"
                 }
             ],
             "runtime": [
@@ -22,8 +22,8 @@
                 },
                 {
                     "name": "databroker",
-                    "image": "ghcr.io/boschglobal/kuksa.val/databroker",
-                    "version": "0.0.2"
+                    "image": "ghcr.io/eclipse/kuksa.val/databroker",
+                    "version": "0.3.0"
                 },
                 {
                     "name": "feedercan",
diff --git a/examples/datapoint-set/AppManifest.json b/examples/datapoint-set/AppManifest.json
@@ -12,7 +12,7 @@
                 {
                     "name": "seatservice",
                     "image": "ghcr.io/boschglobal/kuksa.val.services/seat_service",
-                    "version": "v0.2.0"
+                    "version": "v0.3.0"
                 }
             ],
             "runtime": [
@@ -23,8 +23,8 @@
                 },
                 {
                     "name": "databroker",
-                    "image": "ghcr.io/boschglobal/kuksa.val/databroker",
-                    "version": "0.0.2"
+                    "image": "ghcr.io/eclipse/kuksa.val/databroker",
+                    "version": "0.3.0"
                 },
                 {
                     "name": "feedercan",
diff --git a/examples/dog-mode/AppManifest.json b/examples/dog-mode/AppManifest.json
@@ -22,8 +22,8 @@
                 },
                 {
                     "name": "databroker",
-                    "image": "ghcr.io/boschglobal/kuksa.val/databroker",
-                    "version": "0.0.2"
+                    "image": "ghcr.io/eclipse/kuksa.val/databroker",
+                    "version": "0.3.0"
                 },
                 {
                     "name": "feedercan",
diff --git a/examples/dynamic-rule/AppManifest.json b/examples/dynamic-rule/AppManifest.json
@@ -15,8 +15,8 @@
                 },
                 {
                     "name": "databroker",
-                    "image": "ghcr.io/boschglobal/kuksa.val/databroker",
-                    "version": "0.0.2"
+                    "image": "ghcr.io/eclipse/kuksa.val/databroker",
+                    "version": "0.3.0"
                 },
                 {
                     "name": "feedercan",
diff --git a/examples/seat-adjuster/AppManifest.json b/examples/seat-adjuster/AppManifest.json
@@ -12,7 +12,7 @@
                 {
                     "name": "seatservice",
                     "image": "ghcr.io/boschglobal/kuksa.val.services/seat_service",
-                    "version": "v0.2.0"
+                    "version": "v0.3.0"
                 }
             ],
             "runtime": [
@@ -23,8 +23,8 @@
                 },
                 {
                     "name": "databroker",
-                    "image": "ghcr.io/boschglobal/kuksa.val/databroker",
-                    "version": "0.0.2"
+                    "image": "ghcr.io/eclipse/kuksa.val/databroker",
+                    "version": "0.3.0"
                 },
                 {
                     "name": "feedercan",
diff --git a/examples/static-rule/AppManifest.json b/examples/static-rule/AppManifest.json
@@ -15,8 +15,8 @@
                 },
                 {
                     "name": "databroker",
-                    "image": "ghcr.io/boschglobal/kuksa.val/databroker",
-                    "version": "0.0.2"
+                    "image": "ghcr.io/eclipse/kuksa.val/databroker",
+                    "version": "0.3.0"
                 },
                 {
                     "name": "feedercan",
diff --git a/examples/vdb-queries/AppManifest.json b/examples/vdb-queries/AppManifest.json
@@ -15,8 +15,8 @@
                 },
                 {
                     "name": "databroker",
-                    "image": "ghcr.io/boschglobal/kuksa.val/databroker",
-                    "version": "0.0.2"
+                    "image": "ghcr.io/eclipse/kuksa.val/databroker",
+                    "version": "0.3.0"
                 },
                 {
                     "name": "feedercan",
diff --git a/prerequisite_settings.json b/prerequisite_settings.json
@@ -3,10 +3,10 @@
         "version": "1.6.9"
     },
     "databroker": {
-        "version": "0.0.2"
+        "version": "0.3.0"
     },
     "seatservice": {
-        "version": "v0.2.0"
+        "version": "v0.3.0"
     },
     "hvacservice": {
         "version": "v0.1.0"

Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,8 @@`
`15`	`15`	`},`
`16`	`16`	`{`
`17`	`17`	`"name": "databroker",`
`18`		`- "image": "ghcr.io/boschglobal/kuksa.val/databroker",`
`19`		`- "version": "0.0.2"`
	`18`	`+ "image": "ghcr.io/eclipse/kuksa.val/databroker",`
	`19`	`+ "version": "0.3.0"`
`20`	`20`	`},`
`21`	`21`	`{`
`22`	`22`	`"name": "feedercan",`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`	`{`
`12`	`12`	`"name": "seatservice",`
`13`	`13`	`"image": "ghcr.io/boschglobal/kuksa.val.services/seat_service",`
`14`		`- "version": "v0.2.0"`
	`14`	`+ "version": "v0.3.0"`
`15`	`15`	`}`
`16`	`16`	`],`
`17`	`17`	`"runtime": [`
`@@ -22,8 +22,8 @@`
`22`	`22`	`},`
`23`	`23`	`{`
`24`	`24`	`"name": "databroker",`
`25`		`- "image": "ghcr.io/boschglobal/kuksa.val/databroker",`
`26`		`- "version": "0.0.2"`
	`25`	`+ "image": "ghcr.io/eclipse/kuksa.val/databroker",`
	`26`	`+ "version": "0.3.0"`
`27`	`27`	`},`
`28`	`28`	`{`
`29`	`29`	`"name": "feedercan",`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`{`
`13`	`13`	`"name": "seatservice",`
`14`	`14`	`"image": "ghcr.io/boschglobal/kuksa.val.services/seat_service",`
`15`		`- "version": "v0.2.0"`
	`15`	`+ "version": "v0.3.0"`
`16`	`16`	`}`
`17`	`17`	`],`
`18`	`18`	`"runtime": [`
`@@ -23,8 +23,8 @@`
`23`	`23`	`},`
`24`	`24`	`{`
`25`	`25`	`"name": "databroker",`
`26`		`- "image": "ghcr.io/boschglobal/kuksa.val/databroker",`
`27`		`- "version": "0.0.2"`
	`26`	`+ "image": "ghcr.io/eclipse/kuksa.val/databroker",`
	`27`	`+ "version": "0.3.0"`
`28`	`28`	`},`
`29`	`29`	`{`
`30`	`30`	`"name": "feedercan",`