luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #15159 from hashicorp/ui/fix-peered-service-not-unique-based-on-peer 

ui: Fix PeerName is part of service uniqueness
This commit is contained in:
Michael Klein 2022-10-27 20:26:50 +02:00 committed by GitHub
parent fc74c0c7fb 9c965f98fd
commit 3389d3883b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/packages/consul-ui/app/models/service.js
View File

@ -5,7 +5,7 @@ import { fragment } from 'ember-data-model-fragments/attributes';
import replace, { nullValue } from 'consul-ui/decorators/replace';
export const PRIMARY_KEY = 'uid';
export const SLUG_KEY = 'Name';
export const SLUG_KEY = 'Name,PeerName';
export const Collection = class Collection {
@tracked items;

28
ui/packages/consul-ui/app/utils/create-fingerprinter.js
View File

@ -1,4 +1,5 @@
import { get } from '@ember/object';
import { isEmpty } from '@ember/utils';
export default function (foreignKey, nspaceKey, partitionKey, hash = JSON.stringify) {
return function (primaryKey, slugKey, foreignKeyValue, nspaceValue, partitionValue) {
@ -10,15 +11,24 @@ export default function (foreignKey, nspaceKey, partitionKey, hash = JSON.string
);
}
const slugKeys = slugKey.split(',');
const slugValues = slugKeys.map(function (slugKey) {
const slug = get(item, slugKey);
if (slug == null || slug.length < 1) {
throw new Error(
`Unable to create fingerprint, missing slug. Looking for value in \`${slugKey}\` got \`${slug}\``
);
}
return slug;
});
const slugValues = slugKeys
.map(function (slugKey) {
const slug = get(item, slugKey);
const isSlugEmpty = isEmpty(slug);
if (isSlugEmpty) {
// PeerName should be optional as part of id
if (slugKey === 'PeerName') {
return;
}
throw new Error(
`Unable to create fingerprint, missing slug. Looking for value in \`${slugKey}\` got \`${slug}\``
);
}
return slug;
})
.compact();
// This ensures that all data objects have a Namespace and a Partition
// value set, even in OSS.
if (typeof item[nspaceKey] === 'undefined') {