Skip to content

Commit 9631a97

Browse files
giulio93giulio93
committed
deprecate require_devices
1 parent d7d1753 commit 9631a97

File tree

6 files changed

+1
-36
lines changed

6 files changed

+1
-36
lines changed

‎debian/arduino-app-cli/home/arduino/.local/share/arduino-app-cli/assets/0.5.0/bricks-list.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ bricks:
55
local database.
66
require_container: false
77
require_model: false
8-
require_devices: false
98
mount_devices_into_container: false
109
ports: []
1110
category: storage
@@ -17,7 +16,6 @@ bricks:
1716
\ or with custom object detection models trained on Edge Impulse platform. \n"
1817
require_container: true
1918
require_model: true
20-
require_devices: false
2119
mount_devices_into_container: false
2220
ports: []
2321
category: video
@@ -38,7 +36,6 @@ bricks:
3836
'
3937
require_container: false
4038
require_model: false
41-
require_devices: false
4239
mount_devices_into_container: false
4340
ports: []
4441
category: text
@@ -47,7 +44,6 @@ bricks:
4744
description: Scans a camera for barcodes and QR codes
4845
require_container: false
4946
require_model: false
50-
require_devices: false
5147
mount_devices_into_container: false
5248
ports: []
5349
category: video
@@ -64,7 +60,6 @@ bricks:
6460
'
6561
require_container: true
6662
require_model: true
67-
require_devices: false
6863
mount_devices_into_container: false
6964
ports: []
7065
category: audio
@@ -81,7 +76,6 @@ bricks:
8176
description: Connects to Arduino Cloud
8277
require_container: false
8378
require_model: false
84-
require_devices: false
8579
mount_devices_into_container: false
8680
ports: []
8781
category: null
@@ -98,7 +92,6 @@ bricks:
9892
\ image classification models trained on Edge Impulse platform. \n"
9993
require_container: true
10094
require_model: true
101-
require_devices: false
10295
mount_devices_into_container: false
10396
ports: []
10497
category: video
@@ -115,7 +108,6 @@ bricks:
115108
description: A simplified user interface based on Streamlit and Python.
116109
require_container: false
117110
require_model: false
118-
require_devices: false
119111
mount_devices_into_container: false
120112
ports:
121113
- 7000
@@ -135,7 +127,6 @@ bricks:
135127
'
136128
require_container: true
137129
require_model: true
138-
require_devices: false
139130
mount_devices_into_container: false
140131
ports: []
141132
category: null
@@ -155,7 +146,6 @@ bricks:
155146
APIs and a WebSocket exposed by a web server.
156147
require_container: false
157148
require_model: false
158-
require_devices: false
159149
mount_devices_into_container: false
160150
ports:
161151
- 7000
@@ -172,7 +162,6 @@ bricks:
172162
'
173163
require_container: true
174164
require_model: true
175-
require_devices: false
176165
mount_devices_into_container: false
177166
ports: []
178167
category: audio
@@ -224,7 +213,6 @@ bricks:
224213
and weather APIs. Requires an internet connection.
225214
require_container: false
226215
require_model: false
227-
require_devices: false
228216
mount_devices_into_container: false
229217
ports: []
230218
category: miscellaneous
@@ -241,7 +229,6 @@ bricks:
241229
'
242230
require_container: true
243231
require_model: true
244-
require_devices: false
245232
mount_devices_into_container: false
246233
ports: []
247234
category: null
@@ -259,7 +246,6 @@ bricks:
259246
built on top of InfluxDB.
260247
require_container: true
261248
require_model: false
262-
require_devices: false
263249
mount_devices_into_container: false
264250
ports: []
265251
category: storage
@@ -283,7 +269,6 @@ bricks:
283269
\ detection models trained on the Edge Impulse platform. \n"
284270
require_container: true
285271
require_model: true
286-
require_devices: false
287272
mount_devices_into_container: false
288273
ports: []
289274
category: image

‎internal/e2e/daemon/testdata/assets/0.5.0/bricks-list.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ bricks:
55
local database.
66
require_container: false
77
require_model: false
8-
require_devices: false
98
mount_devices_into_container: false
109
ports: []
1110
category: storage
@@ -17,7 +16,6 @@ bricks:
1716
\ or with custom object detection models trained on Edge Impulse platform. \n"
1817
require_container: true
1918
require_model: true
20-
require_devices: false
2119
mount_devices_into_container: false
2220
ports: []
2321
category: video
@@ -38,7 +36,6 @@ bricks:
3836
'
3937
require_container: false
4038
require_model: false
41-
require_devices: false
4239
mount_devices_into_container: false
4340
ports: []
4441
category: text
@@ -47,7 +44,6 @@ bricks:
4744
description: Scans a camera for barcodes and QR codes
4845
require_container: false
4946
require_model: false
50-
require_devices: false
5147
mount_devices_into_container: false
5248
ports: []
5349
category: video
@@ -64,7 +60,6 @@ bricks:
6460
'
6561
require_container: true
6662
require_model: true
67-
require_devices: false
6863
mount_devices_into_container: false
6964
ports: []
7065
category: audio
@@ -81,7 +76,6 @@ bricks:
8176
description: Connects to Arduino Cloud
8277
require_container: false
8378
require_model: false
84-
require_devices: false
8579
mount_devices_into_container: false
8680
ports: []
8781
category: null
@@ -98,7 +92,6 @@ bricks:
9892
\ image classification models trained on Edge Impulse platform. \n"
9993
require_container: true
10094
require_model: true
101-
require_devices: false
10295
mount_devices_into_container: false
10396
ports: []
10497
category: video
@@ -115,7 +108,6 @@ bricks:
115108
description: A simplified user interface based on Streamlit and Python.
116109
require_container: false
117110
require_model: false
118-
require_devices: false
119111
mount_devices_into_container: false
120112
ports:
121113
- 7000
@@ -135,7 +127,6 @@ bricks:
135127
'
136128
require_container: true
137129
require_model: true
138-
require_devices: false
139130
mount_devices_into_container: false
140131
ports: []
141132
category: null
@@ -155,7 +146,6 @@ bricks:
155146
APIs and a WebSocket exposed by a web server.
156147
require_container: false
157148
require_model: false
158-
require_devices: false
159149
mount_devices_into_container: false
160150
ports:
161151
- 7000
@@ -172,7 +162,6 @@ bricks:
172162
'
173163
require_container: true
174164
require_model: true
175-
require_devices: false
176165
mount_devices_into_container: false
177166
ports: []
178167
category: audio
@@ -224,7 +213,6 @@ bricks:
224213
and weather APIs. Requires an internet connection.
225214
require_container: false
226215
require_model: false
227-
require_devices: false
228216
mount_devices_into_container: false
229217
ports: []
230218
category: miscellaneous
@@ -241,7 +229,6 @@ bricks:
241229
'
242230
require_container: true
243231
require_model: true
244-
require_devices: false
245232
mount_devices_into_container: false
246233
ports: []
247234
category: null
@@ -259,7 +246,6 @@ bricks:
259246
built on top of InfluxDB.
260247
require_container: true
261248
require_model: false
262-
require_devices: false
263249
mount_devices_into_container: false
264250
ports: []
265251
category: storage
@@ -283,7 +269,6 @@ bricks:
283269
\ detection models trained on the Edge Impulse platform. \n"
284270
require_container: true
285271
require_model: true
286-
require_devices: false
287272
mount_devices_into_container: false
288273
ports: []
289274
category: image

‎internal/orchestrator/bricks/testdata/bricks-list.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ bricks:
44
description: Connects to Arduino Cloud
55
require_container: false
66
require_model: false
7-
require_devices: false
87
mount_devices_into_container: false
98
ports: []
109
category: null
@@ -19,7 +18,6 @@ bricks:
1918
local database.
2019
require_container: false
2120
require_model: false
22-
require_devices: false
2321
mount_devices_into_container: false
2422
ports: []
2523
category: storage

‎internal/orchestrator/bricksindex/bricks_index_test.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@ func TestBricksIndexYAMLFormats(t *testing.T) {
148148
category: storage
149149
require_container: true
150150
require_model: true
151-
require_devices: false
152151
mount_devices_into_container: true
153152
model_name: a-complex-model
154153
required_devices:

‎internal/orchestrator/orchestrator_test.go‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ bricks:
447447
\ or with custom object detection models trained on Edge Impulse platform. \n"
448448
require_container: true
449449
require_model: true
450-
require_devices: false
451450
ports: []
452451
category: video
453452
model_name: yolox-object-detection
@@ -533,7 +532,6 @@ bricks:
533532
\ or with custom object detection models trained on Edge Impulse platform. \n"
534533
require_container: true
535534
require_model: true
536-
require_devices: false
537535
category: video
538536
model_name: yolox-object-detection
539537
variables:

‎internal/orchestrator/provision.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ func generateMainComposeFile(
257257
}
258258

259259
// 4. Retrieve the required devices that we have to mount
260-
slog.Debug("Brick config", slog.Bool("require_devices", idxBrick.MountDevicesIntoContainer), slog.Any("ports", ports), slog.Any("required_devices", idxBrick.RequiredDevices))
260+
slog.Debug("Brick config", slog.Bool("mount_devices_into_container", idxBrick.MountDevicesIntoContainer), slog.Any("ports", ports), slog.Any("required_devices", idxBrick.RequiredDevices))
261261
if idxBrick.MountDevicesIntoContainer {
262262
servicesThatRequireDevices = slices.AppendSeq(servicesThatRequireDevices, maps.Keys(svcs))
263263
}

0 commit comments

Comments
 (0)