Skip to content

fix: updated u2c logic to filter out urls with negative priority #4416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: next
Choose a base branch
from
Open

fix: updated u2c logic to filter out urls with negative priority #4416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4c58d42
fix: updated u2c logic to filter out urls with negative priority
Jul 29, 2025
f3d43b1
fix: edge case
Jul 29, 2025
9450eee
fix: updated test
Jul 29, 2025
5585384
Merge branch 'next' into u2c-negative-priority-handling
johnsoter13 Jul 30, 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
4 changes: 3 additions & 1 deletion packages/@webex/webex-core/src/lib/services/service-url.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ const ServiceUrl = AmpState.extend({
return this._generateHostUrl(
filteredHosts.reduce(
(previous, current) =>
previous.priority > current.priority || !previous.homeCluster ? current : previous,
current.priority > 0 && (previous.priority > current.priority || !previous.homeCluster)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to do a couple more things

  1. homeCluster should not override priority decisions (this is a problem with the current implementation)
  2. the array probably needs to be pre-sorted by priority

As it is right now, -1 urls would be removed, but we could still have a logic error based on the following
A. If homeCluster is set to true for an "invalid" FQDN
B. if the order of the array is incorrect

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I also think we need Colin's input on this re: homeCluster since he added this part

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

did we decide we don't have to do these? i thought we could merge this as is?

? current
: previous,
{}
).host
);
Expand Down
35 changes: 35 additions & 0 deletions packages/@webex/webex-core/test/integration/spec/services/services.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,41 @@ describe('webex-core', () => {

assert.isUndefined(serviceObject);
});

it('handles case where there is a priority of -1 for a service url', () => {
const negativePriorityTemplate = {
defaultUrl: 'https://www.negative-priority.com/api/v1',
hosts: [
{
host: 'www.negative-priority.com',
ttl: -1,
priority: 1,
id: 'exampleClusterId2',
homeCluster: true,
},
{
host: 'www.negative-p3.com',
ttl: -1,
priority: -1,
id: 'exampleClusterId',
homeCluster: true,
},
],
name: 'negative-priority',
};
const negativePriorityUrl = new ServiceUrl(negativePriorityTemplate);
catalog._loadServiceUrls('preauth', [negativePriorityUrl]);

const serviceObject = services.getServiceFromUrl(
'https://www.negative-priority.com/api/v1/somepath'
);

assert.equal(serviceObject.name, negativePriorityTemplate.name);
assert.equal(serviceObject.defaultUrl, negativePriorityTemplate.defaultUrl);
assert.equal(serviceObject.priorityUrl, 'https://www.negative-priority.com/api/v1');

catalog._unloadServiceUrls('preauth', [negativePriorityUrl]);
});
});

describe('#hasService()', () => {
Expand Down
Loading