Commit 9aba91d
authored
fix: preserve activation SHA256 for source-mapped activations on project sync (AAP-72873) (#1547)
## Summary
- `_sync_rulebook()` in `imports.py` bulk-updated all non-auto-restart
activations' `rulebook_rulesets_sha256` without excluding source-mapped
activations, synchronizing the hashes and preventing the stale warning
from firing
- `_update_activation_content()` in `project.py` unconditionally set the
activation hash to the rulebook hash for resume-waiting activations,
with the same effect
- Both fixes preserve the activation's original SHA256 when
`source_mappings` is present, matching the existing guard in
`_check_and_restart_activation()` (line 279)
## Root Cause
The warning logic in `ActivationReadSerializer.to_representation()`
(activation.py:1077-1089) correctly compares
`activation.rulebook_rulesets_sha256` against `rulebook.rulesets_sha256`
to detect divergence after a project sync. However, two code paths
overwrote the activation's SHA256 to match the new rulebook hash
*before* the serializer could detect the difference, making the warning
unreachable.
The auto-restart path (`_check_and_restart_activation`) already handled
this correctly by skipping source-mapped activations when content
changes. This fix applies the same guard to the two missed paths.
## Test plan
- [x] New test:
`test_sync_rulebook_preserves_sha256_for_source_mapped_activations`
- [x] New test:
`test_sync_rulebook_updates_sha256_for_non_source_mapped_activations`
- [x] New test:
`test_update_activation_content_preserves_sha256_for_source_mapped`
- [x] New test:
`test_update_activation_content_updates_sha256_for_non_source_mapped`
- [x] All 75 existing tests in `test_projects.py` pass (no regressions)
- [ ] End-to-end: create activation with source mapping, sync project
with changed rulebook, verify warning appears in API response
## Related
- **Jira:** [AAP-72873](https://redhat.atlassian.net/browse/AAP-72873)
- **Related:**
[AAP-65811](https://redhat.atlassian.net/browse/AAP-65811) — original
design for SHA256 staleness detection
<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit
* **Bug Fixes**
* Enhanced rulebook synchronization to properly manage content
validation and cache state during activation updates, improving
consistency of rulebook data handling across different activation
configurations.
* **Tests**
* Added integration tests covering rulebook synchronization and
activation content update behavior to ensure proper cache and content
state management.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->1 parent 5e0cbb3 commit 9aba91d
3 files changed
Lines changed: 169 additions & 3 deletions
File tree
- src/aap_eda
- services/project
- tasks
- tests/integration/tasks
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
213 | | - | |
| 213 | + | |
214 | 214 | | |
215 | 215 | | |
216 | | - | |
| 216 | + | |
| 217 | + | |
217 | 218 | | |
218 | 219 | | |
219 | 220 | | |
220 | 221 | | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
221 | 228 | | |
222 | 229 | | |
223 | 230 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
364 | 364 | | |
365 | 365 | | |
366 | 366 | | |
367 | | - | |
| 367 | + | |
| 368 | + | |
368 | 369 | | |
369 | 370 | | |
370 | 371 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1062 | 1062 | | |
1063 | 1063 | | |
1064 | 1064 | | |
| 1065 | + | |
| 1066 | + | |
| 1067 | + | |
| 1068 | + | |
| 1069 | + | |
| 1070 | + | |
| 1071 | + | |
| 1072 | + | |
| 1073 | + | |
| 1074 | + | |
| 1075 | + | |
| 1076 | + | |
| 1077 | + | |
| 1078 | + | |
| 1079 | + | |
| 1080 | + | |
| 1081 | + | |
| 1082 | + | |
| 1083 | + | |
| 1084 | + | |
| 1085 | + | |
| 1086 | + | |
| 1087 | + | |
| 1088 | + | |
| 1089 | + | |
| 1090 | + | |
| 1091 | + | |
| 1092 | + | |
| 1093 | + | |
| 1094 | + | |
| 1095 | + | |
| 1096 | + | |
| 1097 | + | |
| 1098 | + | |
| 1099 | + | |
| 1100 | + | |
| 1101 | + | |
| 1102 | + | |
| 1103 | + | |
| 1104 | + | |
| 1105 | + | |
| 1106 | + | |
| 1107 | + | |
| 1108 | + | |
| 1109 | + | |
| 1110 | + | |
| 1111 | + | |
| 1112 | + | |
| 1113 | + | |
| 1114 | + | |
| 1115 | + | |
| 1116 | + | |
| 1117 | + | |
| 1118 | + | |
| 1119 | + | |
| 1120 | + | |
| 1121 | + | |
| 1122 | + | |
| 1123 | + | |
| 1124 | + | |
| 1125 | + | |
| 1126 | + | |
| 1127 | + | |
| 1128 | + | |
| 1129 | + | |
| 1130 | + | |
| 1131 | + | |
| 1132 | + | |
| 1133 | + | |
| 1134 | + | |
| 1135 | + | |
| 1136 | + | |
| 1137 | + | |
| 1138 | + | |
| 1139 | + | |
| 1140 | + | |
| 1141 | + | |
| 1142 | + | |
| 1143 | + | |
| 1144 | + | |
| 1145 | + | |
| 1146 | + | |
| 1147 | + | |
| 1148 | + | |
| 1149 | + | |
| 1150 | + | |
| 1151 | + | |
| 1152 | + | |
| 1153 | + | |
| 1154 | + | |
| 1155 | + | |
| 1156 | + | |
| 1157 | + | |
| 1158 | + | |
| 1159 | + | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
| 1172 | + | |
| 1173 | + | |
| 1174 | + | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
| 1179 | + | |
| 1180 | + | |
| 1181 | + | |
| 1182 | + | |
| 1183 | + | |
| 1184 | + | |
| 1185 | + | |
| 1186 | + | |
| 1187 | + | |
| 1188 | + | |
| 1189 | + | |
| 1190 | + | |
| 1191 | + | |
| 1192 | + | |
| 1193 | + | |
| 1194 | + | |
| 1195 | + | |
| 1196 | + | |
| 1197 | + | |
| 1198 | + | |
| 1199 | + | |
| 1200 | + | |
| 1201 | + | |
| 1202 | + | |
| 1203 | + | |
| 1204 | + | |
| 1205 | + | |
| 1206 | + | |
| 1207 | + | |
| 1208 | + | |
| 1209 | + | |
| 1210 | + | |
| 1211 | + | |
| 1212 | + | |
| 1213 | + | |
| 1214 | + | |
| 1215 | + | |
| 1216 | + | |
| 1217 | + | |
| 1218 | + | |
| 1219 | + | |
| 1220 | + | |
| 1221 | + | |
| 1222 | + | |
1065 | 1223 | | |
1066 | 1224 | | |
1067 | 1225 | | |
| |||
0 commit comments