fix(ocm): merge resource types by name in discovery#61126
Open
mickenordin wants to merge 2 commits into
Open
Conversation
07a1c6b to
c0461ed
Compare
c0461ed to
d5c56b8
Compare
CarlSchwan
approved these changes
Jun 10, 2026
4e52e3b to
74e1ed6
Compare
susnux
approved these changes
Jun 15, 2026
74e1ed6 to
e4c7640
Compare
e4c7640 to
5e3838b
Compare
d7c2f1d to
9fb228a
Compare
Current code blindy adds any resources to the ocm disocvery, this makes it so that different cloud federation providers can not add different protocols for the same resourceType without the resourceType being duplicated, something that OCM does not allow: ``` REQUIRED: resourceTypes (array) - A list of all resource types this server supports in both the Sending Server role and the Receiving Server role, with their access protocols. Each item in this list MUST itself be an object containing the following fields: name (string) - A supported resource type (file, calendar, contact, ...). Implementations MUST offer support for at least one resource type, where file is the commonly supported one. Each resource type is identified by its name: the list MUST NOT contain more than one resource type object per given name. ... ``` https://datatracker.ietf.org/doc/html/draft-ietf-ocm-open-cloud-mesh-04#name-fields This patch changes this behaviour from this example result: ``` { "name": "folder", "shareTypes": [ "user" ], "protocols": { "webapp": {} } }, { "name": "folder", "shareTypes": [ "user" ], "protocols": { "webapp-receive": { "targets": [ "blank", "iframe" ] } } ``` to: ``` { "name": "folder", "shareTypes": [ "user" ], "protocols": { "webapp": {}, "webapp-receive": { "targets": [ "blank", "iframe" ] } } ``` which is the correct behaviour according to OCM. Signed-off-by: Micke Nordin <kano@sunet.se>
Also update 3rdparty Assisted-by: ClaudeCode:claude-fable-5 Signed-off-by: Micke Nordin <kano@sunet.se>
9fb228a to
64a23d4
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Current code blindy adds any resources to the ocm disocvery, this makes it so that different cloud federation providers can not add different protocols for the same resourceType without the resourceType being duplicated, something that OCM does not allow:
https://datatracker.ietf.org/doc/html/draft-ietf-ocm-open-cloud-mesh-04#name-fields
This patch changes this behaviour from this example result:
to:
which is the correct behaviour according to OCM.
Checklist
AI (if applicable)