Skip to content

Commit 0c96024

Browse files
tsultanov00tsultanov00
committed
fetch latest enterprise appliance IPs from msd
Signed-off-by: Timur Sultanov <timur.sultanov@yahooinc.com>
1 parent 7db8783 commit 0c96024

7 files changed

Lines changed: 923 additions & 3555 deletions

File tree

‎ui/package-lock.json‎

Lines changed: 860 additions & 3532 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ui/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
"chromedriver": "131",
126126
"dotenv": "16.0.2",
127127
"expect": "29.0.3",
128-
"expect-webdriverio": "5.0.5",
128+
"expect-webdriverio": "^5.3.4",
129129
"follow-redirects": "1.15.6",
130130
"identity-obj-proxy": "3.0.0",
131131
"jest": "29.7.0",

‎ui/src/api.js‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,11 +1923,26 @@ const Api = (req) => {
19231923
});
19241924
},
19251925

1926-
getInstances(domainName, serviceName, category) {
1926+
getInstances(domainName, serviceName, category, _csrf) {
1927+
const body = {
1928+
domainServices: [
1929+
{
1930+
domainName: domainName,
1931+
serviceNames: [serviceName],
1932+
},
1933+
],
1934+
resolveStaticWorkloads: true,
1935+
fetchDynamicTypeWorkloads: true,
1936+
};
19271937
return new Promise((resolve, reject) => {
19281938
fetchr
19291939
.read('instances')
1930-
.params({ domainName, serviceName, category })
1940+
.params({ category, body })
1941+
.clientConfig({
1942+
headers: {
1943+
'x-csrf-token': _csrf,
1944+
},
1945+
})
19311946
.end((err, workloadList) => {
19321947
if (err) {
19331948
reject(err);

‎ui/src/pages/domain/[domain]/service/[service]/instance/dynamic.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,13 @@ class DynamicInstancePage extends React.Component {
116116
}
117117

118118
componentDidMount() {
119-
const { domainName, serviceName } = this.props;
119+
const { domainName, serviceName, _csrf } = this.props;
120120
Promise.all([
121121
this.props.getServiceHeaderAndInstances(
122122
domainName,
123123
serviceName,
124-
SERVICE_TYPE_DYNAMIC
124+
SERVICE_TYPE_DYNAMIC,
125+
_csrf
125126
),
126127
]).catch((err) => {
127128
let response = RequestUtils.errorCheckHelper(err);
@@ -256,9 +257,14 @@ const mapStateToProps = (state, props) => {
256257
};
257258

258259
const mapDispatchToProps = (dispatch) => ({
259-
getServiceHeaderAndInstances: (domainName, serviceName, category) =>
260+
getServiceHeaderAndInstances: (domainName, serviceName, category, _csrf) =>
260261
dispatch(
261-
getServiceHeaderAndInstances(domainName, serviceName, category)
262+
getServiceHeaderAndInstances(
263+
domainName,
264+
serviceName,
265+
category,
266+
_csrf
267+
)
262268
),
263269
});
264270

‎ui/src/pages/domain/[domain]/service/[service]/instance/static.js‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,13 @@ class StaticInstancePage extends React.Component {
116116
}
117117

118118
componentDidMount() {
119-
const { domainName, serviceName } = this.props;
119+
const { domainName, serviceName, _csrf } = this.props;
120120
Promise.all([
121121
this.props.getServiceHeaderAndInstances(
122122
domainName,
123123
serviceName,
124-
SERVICE_TYPE_STATIC
124+
SERVICE_TYPE_STATIC,
125+
_csrf
125126
),
126127
]).catch((err) => {
127128
let response = RequestUtils.errorCheckHelper(err);
@@ -256,9 +257,14 @@ const mapStateToProps = (state, props) => {
256257
};
257258

258259
const mapDispatchToProps = (dispatch) => ({
259-
getServiceHeaderAndInstances: (domainName, serviceName, category) =>
260+
getServiceHeaderAndInstances: (domainName, serviceName, category, _csrf) =>
260261
dispatch(
261-
getServiceHeaderAndInstances(domainName, serviceName, category)
262+
getServiceHeaderAndInstances(
263+
domainName,
264+
serviceName,
265+
category,
266+
_csrf
267+
)
262268
),
263269
});
264270

‎ui/src/redux/thunks/services.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,20 @@ export const allowProviderTemplate =
270270
};
271271

272272
export const getServiceHeaderAndInstances =
273-
(domainName, serviceName, category) => async (dispatch, getState) => {
273+
(domainName, serviceName, category, _csrf) =>
274+
async (dispatch, getState) => {
274275
serviceName = serviceName.toLowerCase();
275276
await dispatch(getServices(domainName));
276-
await dispatch(getServiceInstances(domainName, serviceName, category));
277+
await dispatch(
278+
getServiceInstances(domainName, serviceName, category, _csrf)
279+
);
277280
await dispatch(getServiceHeaderDetails(domainName, serviceName));
278281
await dispatch(getFeatureFlag());
279282
};
280283

281284
export const getServiceInstances =
282-
(domainName, serviceName, category) => async (dispatch, getState) => {
285+
(domainName, serviceName, category, _csrf) =>
286+
async (dispatch, getState) => {
283287
serviceName = serviceName.toLowerCase();
284288
let currService = thunkSelectService(
285289
getState(),
@@ -295,7 +299,8 @@ export const getServiceInstances =
295299
let instances = await API().getInstances(
296300
domainName,
297301
serviceName,
298-
category
302+
category,
303+
_csrf
299304
);
300305
dispatch(
301306
loadInstancesToStore(
@@ -347,7 +352,8 @@ export const addServiceHost =
347352
const staticInstances = await API().getInstances(
348353
domainName,
349354
serviceName,
350-
'static'
355+
'static',
356+
_csrf
351357
);
352358
dispatch(
353359
loadInstancesToStore(
@@ -373,7 +379,7 @@ export const deleteInstance =
373379
_csrf
374380
) =>
375381
async (dispatch, getState) => {
376-
await dispatch(getServiceInstances(domain, service, category));
382+
await dispatch(getServiceInstances(domain, service, category, _csrf));
377383
let instancesData = selectInstancesWorkLoadData(
378384
getState(),
379385
domain,

‎ui/src/server/handlers/api.js‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3044,21 +3044,28 @@ Fetchr.registerService({
30443044

30453045
Fetchr.registerService({
30463046
name: 'instances',
3047+
post_for_read: true,
30473048
read(req, resource, params, config, callback) {
3048-
req.clients.msd.getWorkloadsByService(
3049-
{ domainName: params.domainName, serviceName: params.serviceName },
3049+
req.clients.msd.getWorkloadsByDomainAndService(
3050+
{ request: params.body },
30503051
(err, data) => {
30513052
if (data) {
30523053
if (
3053-
data.dynamicWorkloadList &&
3054+
data.workloads.dynamicWorkloadList &&
30543055
params.category !== 'static'
30553056
) {
3056-
return callback(null, data.dynamicWorkloadList);
3057+
return callback(
3058+
null,
3059+
data.workloads.dynamicWorkloadList
3060+
);
30573061
} else if (
3058-
data.staticWorkloadList &&
3062+
data.workloads.staticWorkloadList &&
30593063
params.category === 'static'
30603064
) {
3061-
return callback(null, data.staticWorkloadList);
3065+
return callback(
3066+
null,
3067+
data.workloads.staticWorkloadList
3068+
);
30623069
} else {
30633070
return callback(null, []);
30643071
}

0 commit comments

Comments
 (0)