From 1038e134616bd321c98d36f2e9ff3b61f014e9b2 Mon Sep 17 00:00:00 2001 From: Josh Wulf Date: Mon, 16 Nov 2026 02:05:19 +1300 Subject: [PATCH 1/2] fix(gen): sort merged required lists so stable/9 generation is deterministic SpecFlattener emitted a set in hash order, so every regeneration reordered required: in generated/bundled_spec.yaml. main and stable/10 already sort it (5b7e186f). This is a prerequisite for backports that regenerate on stable/9. --- hooks/pre_gen/0100_patch_bundled_spec.py | 9 +++- .../test_patch_bundled_spec_determinism.py | 51 +++++++++++++++++++ 2 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 tests/unit/test_patch_bundled_spec_determinism.py diff --git a/hooks/pre_gen/0100_patch_bundled_spec.py b/hooks/pre_gen/0100_patch_bundled_spec.py index ced8255a4..2ba4826b6 100644 --- a/hooks/pre_gen/0100_patch_bundled_spec.py +++ b/hooks/pre_gen/0100_patch_bundled_spec.py @@ -291,7 +291,14 @@ def flatten_schema(self, schema: SpecNode) -> SpecNode: if merged_props: new_schema["properties"] = merged_props if merged_required: - new_schema["required"] = list(merged_required) + # Deterministic ordering — merged_required is a set + # whose Python iteration order is hash-randomised + # across processes. Without sorting, every + # regeneration flips `required:` array order in the + # bundled spec, producing perpetual content-free + # merge conflicts. Mirrors the same fix applied + # upstream in camunda-schema-bundler 2.4.2 (#35). + new_schema["required"] = sorted(merged_required) # If we have a oneOf, removing the explicit type: object allows the union to work # even if some options are primitives (like string vs object filter) diff --git a/tests/unit/test_patch_bundled_spec_determinism.py b/tests/unit/test_patch_bundled_spec_determinism.py new file mode 100644 index 000000000..aa28dfb21 --- /dev/null +++ b/tests/unit/test_patch_bundled_spec_determinism.py @@ -0,0 +1,51 @@ +"""Generation must be deterministic: the allOf flattener's merged `required` list.""" + +import importlib.util +from pathlib import Path +from typing import Any + +_HOOK = ( + Path(__file__).resolve().parents[2] + / "hooks" + / "pre_gen" + / "0100_patch_bundled_spec.py" +) +_spec = importlib.util.spec_from_file_location("patch_bundled_spec", _HOOK) +assert _spec is not None and _spec.loader is not None +patch_bundled_spec = importlib.util.module_from_spec(_spec) +_spec.loader.exec_module(patch_bundled_spec) + + +def test_flattened_allof_required_is_sorted() -> None: + # A set's iteration order depends on PYTHONHASHSEED, so emitting it unsorted + # reorders `required:` in generated/bundled_spec.yaml on every regeneration. + names = [ + "zeta", + "alpha", + "kappa", + "beta", + "omega", + "delta", + "eta", + "gamma", + "iota", + "theta", + ] + schema: dict[str, Any] = { + "allOf": [ + { + "type": "object", + "properties": {n: {"type": "string"} for n in names[:5]}, + "required": names[:5], + }, + { + "type": "object", + "properties": {n: {"type": "string"} for n in names[5:]}, + "required": names[5:], + }, + ] + } + + flattened = patch_bundled_spec.SpecFlattener({}).flatten_schema(schema) + + assert flattened["required"] == sorted(names) From 586ee82aa6a445647ada1010dab56838674d8fbd Mon Sep 17 00:00:00 2001 From: Josh Wulf Date: Mon, 16 Nov 2026 02:06:00 +1300 Subject: [PATCH 2/2] chore(gen): regenerate for deterministic required ordering --- generated/bundled_spec.yaml | 112 ++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/generated/bundled_spec.yaml b/generated/bundled_spec.yaml index 53a44dcab..9248920db 100644 --- a/generated/bundled_spec.yaml +++ b/generated/bundled_spec.yaml @@ -13370,9 +13370,9 @@ components: type: object required: - name - - value - scope - tenantId + - value properties: value: description: Full value of this cluster variable. @@ -13392,11 +13392,11 @@ components: description: Cluster variable search response item. type: object required: - - tenantId - isTruncated + - name - scope + - tenantId - value - - name properties: value: description: Value of this cluster variable. Can be truncated. @@ -14648,25 +14648,25 @@ components: ' required: - - decisionEvaluationInstanceKey + - decisionDefinitionId + - decisionDefinitionKey - decisionDefinitionName + - decisionDefinitionType + - decisionDefinitionVersion + - decisionEvaluationInstanceKey - decisionEvaluationKey - - processDefinitionKey + - elementInstanceKey + - evaluatedInputs + - evaluationDate - evaluationFailure - matchedRules - - elementInstanceKey - - state + - processDefinitionKey - processInstanceKey - - evaluatedInputs - result - rootDecisionDefinitionKey - - decisionDefinitionId - - decisionDefinitionVersion - - decisionDefinitionType - - tenantId - rootProcessInstanceKey - - decisionDefinitionKey - - evaluationDate + - state + - tenantId EvaluatedDecisionInputItem: required: - inputId @@ -15465,8 +15465,8 @@ components: items: $ref: '#/components/schemas/DocumentReference' required: - - failedDocuments - createdDocuments + - failedDocuments DocumentMetadata: description: Information about the document. type: object @@ -16293,9 +16293,9 @@ components: CreateGlobalTaskListenerRequest: type: object required: - - type - eventTypes - id + - type properties: id: $ref: '#/components/schemas/GlobalListenerId' @@ -16319,8 +16319,8 @@ components: UpdateGlobalTaskListenerRequest: type: object required: - - type - eventTypes + - type properties: eventTypes: $ref: '#/components/schemas/GlobalTaskListenerEventTypes' @@ -16343,12 +16343,12 @@ components: type: object required: - afterNonGlobal - - retries - eventTypes + - id + - priority + - retries - source - type - - priority - - id properties: id: $ref: '#/components/schemas/GlobalListenerId' @@ -19559,10 +19559,10 @@ components: type: string description: The name of the mapping rule. required: - - mappingRuleId + - claimName - claimValue + - mappingRuleId - name - - claimName MappingRuleUpdateRequest: type: object properties: @@ -19577,8 +19577,8 @@ components: description: The name of the mapping rule. required: - claimName - - name - claimValue + - name MappingRuleCreateUpdateResult: type: object properties: @@ -19616,9 +19616,9 @@ components: description: The unique ID of the mapping rule. required: - claimName + - claimValue - mappingRuleId - name - - claimValue MappingRuleUpdateResult: type: object properties: @@ -19636,9 +19636,9 @@ components: description: The unique ID of the mapping rule. required: - claimName + - claimValue - mappingRuleId - name - - claimValue MappingRuleSearchQueryResult: required: - items @@ -22989,11 +22989,11 @@ components: maxLength: 25 UsageMetricsResponse: required: - - processInstances - activeTenants - - tenants - assignees - decisionInstances + - processInstances + - tenants type: object properties: activeTenants: @@ -24316,14 +24316,14 @@ components: $ref: '#/components/schemas/SearchQueryPageResponse' VariableSearchResult: required: - - tenantId - isTruncated + - name - processInstanceKey - rootProcessInstanceKey - scopeKey + - tenantId - value - variableKey - - name description: Variable search response item. type: object properties: @@ -24405,13 +24405,13 @@ components: description: Variable search response item. type: object required: - - tenantId + - name - processInstanceKey - rootProcessInstanceKey - scopeKey + - tenantId - value - variableKey - - name properties: value: description: Full value of this variable. @@ -25880,11 +25880,11 @@ components: minLength: 1 maxLength: 25 required: - - tenantId - - processDefinitionVersion - processDefinitionId - - resourceName - processDefinitionKey + - processDefinitionVersion + - resourceName + - tenantId title: DeploymentMetadataResultProcessDefinition DeploymentMetadataResultDecisionDefinition: nullable: true @@ -25954,13 +25954,13 @@ components: minLength: 1 maxLength: 25 required: - - tenantId - - name + - decisionDefinitionId - decisionDefinitionKey - decisionRequirementsId - - version - decisionRequirementsKey - - decisionDefinitionId + - name + - tenantId + - version title: DeploymentMetadataResultDecisionDefinition DeploymentMetadataResultDecisionRequirements: nullable: true @@ -26004,12 +26004,12 @@ components: minLength: 1 maxLength: 25 required: - - tenantId - decisionRequirementsId + - decisionRequirementsKey + - decisionRequirementsName - resourceName + - tenantId - version - - decisionRequirementsName - - decisionRequirementsKey title: DeploymentMetadataResultDecisionRequirements DeploymentMetadataResultForm: nullable: true @@ -26049,11 +26049,11 @@ components: minLength: 1 maxLength: 25 required: - - tenantId - - resourceName - - version - formId - formKey + - resourceName + - tenantId + - version title: DeploymentMetadataResultForm DeploymentMetadataResultResource: nullable: true @@ -26085,11 +26085,11 @@ components: - $ref: '#/components/schemas/DecisionDefinitionKey' format: ResourceKey required: - - tenantId + - resourceId - resourceKey - - version - resourceName - - resourceId + - tenantId + - version title: DeploymentMetadataResultResource DeleteResourceResponseBatchOperation: nullable: true @@ -26129,8 +26129,8 @@ components: batchOperationType: $ref: '#/components/schemas/BatchOperationTypeEnum' required: - - batchOperationType - batchOperationKey + - batchOperationType title: DeleteResourceResponseBatchOperation DocumentMetadataCustomProperties: type: object @@ -26556,16 +26556,16 @@ components: minLength: 1 maxLength: 25 required: - - dueDate - - changedAttributes - - userTaskKey - - candidateUsers - - candidateGroups - action + - assignee + - candidateGroups + - candidateUsers + - changedAttributes + - dueDate - followUpDate - - priority - formKey - - assignee + - priority + - userTaskKey title: ActivatedJobResultUserTask JobSearchQueryFilter: description: The job search filters. @@ -27423,9 +27423,9 @@ components: type: integer format: int64 required: - - processInstances - assignees - decisionInstances + - processInstances title: UsageMetricsResponseTenants TenantSearchQueryRequestFilter: description: The tenant search filters.