Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6367be9
Adds CI Workflow for Examples
FriedJannik May 14, 2025
97fa6ee
Changes wrong docker-compose path
FriedJannik May 14, 2025
5ae2a58
Changes version of DynamicRBAC to milestone-05 (test purpose)
FriedJannik May 14, 2025
051a62d
Changes version of DynamicRBAC to b0f9724 (test purpose)
FriedJannik May 14, 2025
722fadf
Changes version of DynamicRBAC to 2ddae04 (test purpose)
FriedJannik May 14, 2025
490aff0
Changes version of DynamicRBAC to 19b8725 (test purpose)
FriedJannik May 14, 2025
e45789d
Changes version of DynamicRBAC to 025c597 (test purpose)
FriedJannik May 14, 2025
ab98e33
Changes version of DynamicRBAC to 2f374eb (test purpose)
FriedJannik May 14, 2025
3c04bfd
Changes version of DynamicRBAC to e0e13f1 (test purpose)
FriedJannik May 14, 2025
482f0fd
Changes version of DynamicRBAC to 7cc0cf5 (test purpose)
FriedJannik May 14, 2025
ddfe68d
Changes version of DynamicRBAC to f619d5a (test purpose)
FriedJannik May 14, 2025
79f9d19
Changes version of DynamicRBAC to bb3ce87 (test purpose)
FriedJannik May 14, 2025
bd7e65b
Changes version of DynamicRBAC to cdd6ad7 (test purpose)
FriedJannik May 14, 2025
2fcfb8d
Changes version of DynamicRBAC to a84f97b (test purpose)
FriedJannik May 14, 2025
918804d
Removes Discovery Integration
FriedJannik May 14, 2025
1d65542
Changes version back to Snapshot
FriedJannik May 14, 2025
7152cf7
Changes Discovery Integration
FriedJannik May 14, 2025
b149f71
Adds admin rule
FriedJannik May 14, 2025
b6a4a34
Merge remote-tracking branch 'refs/remotes/basyx/main' into fix/Secur…
FriedJannik May 27, 2025
8bdcfa0
Merge branch 'eclipse-basyx:main' into fix/SecuritySubmodelDuplicateI…
FriedJannik May 28, 2025
6d4b916
Fixes Duplicate Rule Error on Restart
FriedJannik May 28, 2025
43cb1fb
Merge branch 'fix/SecuritySubmodelDuplicateInitialRoles' of https://g…
FriedJannik May 28, 2025
74f34ce
Fixes DynamicRBAC Example
FriedJannik May 28, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,17 @@ public void addRule(RbacRule rbacRule) {
.map(rule -> ruleAdapter.adapt(rule, createKey(rule))).collect(Collectors.toList());

rbacRulesSMC.stream().forEach(rule -> {
try {
smService.createSubmodelElement(rule);
try{
smService.getSubmodelElement(rule.getIdShort());
LOGGER.warn("Rule with key " + rule.getIdShort() + " already exists. Skipping creation.");
} catch (Exception e) {
LOGGER.error("Exception while creating SubmodelElement for rule: " + rule.getIdShort() + ". Error: " + e.getMessage());
try {
smService.createSubmodelElement(rule);
} catch (Exception e2) {
LOGGER.error("Exception while creating SubmodelElement for rule: " + rule.getIdShort() + ". Error: " + e2.getMessage());
}
}

});
}

Expand Down
3 changes: 2 additions & 1 deletion examples/BaSyxDynamicRBAC/basyx/aas-env.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
server.port=8081
basyx.backend=InMemory
basyx.backend=MongoDB
spring.data.mongodb.uri = mongodb://mongoAdmin:mongoPassword@mongo:27017/aas-env?authSource=admin
basyx.environment=file:aas
basyx.cors.allowed-origins=*
basyx.cors.allowed-methods=GET,POST,PATCH,DELETE,PUT,OPTIONS,HEAD
Expand Down
2 changes: 2 additions & 0 deletions examples/BaSyxDynamicRBAC/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ services:
- '8081:8081'
restart: always
depends_on:
keycloak:
condition: service_healthy
aas-registry:
condition: service_healthy
sm-registry:
Expand Down
Loading