Skip to content

Commit 29c78f7

Browse files
vasil-cfvasil-cf
committed
Merge remote-tracking branch 'origin/feat-add-telemetry-cr-29975' into feat-add-telemetry-cr-29975
2 parents 933677e + 9b7927a commit 29c78f7

File tree

5 files changed

+2
-55
lines changed

5 files changed

+2
-55
lines changed

‎lib/helpers.js‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
const { stat, writeFile, readFile } = require('node:fs/promises');
22
const path = require('path');
33
const { Logger } = require('@codefresh-io/cf-telemetry/logs');
4-
const getPromiseWithResolvers = require('core-js-pure/es/promise/with-resolvers');
54
const { BuildFinishedSignalFilename } = require('./enums');
65
const { SERVER_ADDRESS_PATH } = require('./const');
76

@@ -30,7 +29,7 @@ function _watchForBuildFinishedSignal(deferred) {
3029
}
3130

3231
function watchForBuildFinishedSignal() {
33-
const deferred = getPromiseWithResolvers();
32+
const deferred = Promise.withResolvers();
3433

3534
_watchForBuildFinishedSignal(deferred);
3635

@@ -70,11 +69,6 @@ const registerExitHandlers = () => {
7069
};
7170

7271
module.exports = {
73-
/**
74-
* Polyfill of `Promise.withResolvers`, TC39 Stage 4 proposal.
75-
* @see https://github.com/tc39/proposal-promise-with-resolvers
76-
*/
77-
getPromiseWithResolvers,
7872
watchForBuildFinishedSignal,
7973
saveServerAddress,
8074
getServerAddress,

‎lib/logger.js‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ const { ContainerStatus } = require('./enums');
1010
const { LoggerStrategy } = require('./enums');
1111
const { ContainerHandlingStatus } = require('./enums');
1212
const ContainerLogger = require('./ContainerLogger');
13-
const { getPromiseWithResolvers } = require('./helpers');
1413

1514
// eslint-disable-next-line import/no-unresolved,import/extensions
1615
const { HttpServer } = require('./http-server');
@@ -369,7 +368,7 @@ class Logger {
369368

370369
// do not call before build is finished
371370
_awaitAllStreamsClosed() {
372-
const deferred = getPromiseWithResolvers();
371+
const deferred = Promise.withResolvers();
373372
this._checkAllStreamsClosed(deferred);
374373
this.finishedContainersEmitter.on('end', this._checkAllStreamsClosed.bind(this, deferred));
375374
return deferred.promise;

‎package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"@codefresh-io/cf-telemetry": "^3.1.0",
1414
"@codefresh-io/task-logger": "^1.12.3",
1515
"cf-errors": "^0.1.17",
16-
"core-js-pure": "^3.37.1",
1716
"docker-events": "0.0.2",
1817
"dockerode": "^4.0.2",
1918
"fastify": "^4.28.1",

‎test/logger.unit.spec.js‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ const sinonChai = require('sinon-chai');
77
const { EventEmitter } = require('events');
88
const { ContainerStatus } = require('../lib/enums');
99
const { LoggerStrategy } = require('../lib/enums');
10-
const { getPromiseWithResolvers } = require('../lib/helpers');
1110

1211
const expect = chai.expect;
1312
chai.use(sinonChai);
@@ -49,7 +48,6 @@ describe('Logger tests', () => {
4948
'fastify': stubFastify,
5049
'./helpers': {
5150
saveServerAddress: stubSaveServerAddress,
52-
getPromiseWithResolvers,
5351
},
5452
});
5553

@@ -74,7 +72,6 @@ describe('Logger tests', () => {
7472
'fastify': stubFastify,
7573
'./helpers': {
7674
saveServerAddress: stubSaveServerAddress,
77-
getPromiseWithResolvers,
7875
},
7976
});
8077

@@ -118,7 +115,6 @@ describe('Logger tests', () => {
118115
'fastify': stubFastify,
119116
'./helpers': {
120117
saveServerAddress: stubSaveServerAddress,
121-
getPromiseWithResolvers,
122118
},
123119
});
124120

@@ -166,7 +162,6 @@ describe('Logger tests', () => {
166162
'fastify': stubFastify,
167163
'./helpers': {
168164
saveServerAddress: stubSaveServerAddress,
169-
getPromiseWithResolvers,
170165
},
171166
});
172167

@@ -212,7 +207,6 @@ describe('Logger tests', () => {
212207
'fastify': stubFastify,
213208
'./helpers': {
214209
saveServerAddress: stubSaveServerAddress,
215-
getPromiseWithResolvers,
216210
},
217211
});
218212

@@ -257,7 +251,6 @@ describe('Logger tests', () => {
257251
'fastify': stubFastify,
258252
'./helpers': {
259253
saveServerAddress: stubSaveServerAddress,
260-
getPromiseWithResolvers,
261254
},
262255
});
263256

@@ -307,7 +300,6 @@ describe('Logger tests', () => {
307300
'fastify': stubFastify,
308301
'./helpers': {
309302
saveServerAddress: stubSaveServerAddress,
310-
getPromiseWithResolvers,
311303
},
312304
});
313305

@@ -345,7 +337,6 @@ describe('Logger tests', () => {
345337
'fastify': stubFastify,
346338
'./helpers': {
347339
saveServerAddress: stubSaveServerAddress,
348-
getPromiseWithResolvers,
349340
},
350341
});
351342

@@ -373,7 +364,6 @@ describe('Logger tests', () => {
373364
'fastify': stubFastify,
374365
'./helpers': {
375366
saveServerAddress: stubSaveServerAddress,
376-
getPromiseWithResolvers,
377367
},
378368
});
379369

@@ -405,7 +395,6 @@ describe('Logger tests', () => {
405395
'fastify': stubFastify,
406396
'./helpers': {
407397
saveServerAddress: stubSaveServerAddress,
408-
getPromiseWithResolvers,
409398
},
410399
});
411400

@@ -443,7 +432,6 @@ describe('Logger tests', () => {
443432
'fastify': stubFastify,
444433
'./helpers': {
445434
saveServerAddress: stubSaveServerAddress,
446-
getPromiseWithResolvers,
447435
},
448436
});
449437

@@ -473,7 +461,6 @@ describe('Logger tests', () => {
473461
'fastify': stubFastify,
474462
'./helpers': {
475463
saveServerAddress: stubSaveServerAddress,
476-
getPromiseWithResolvers,
477464
},
478465
});
479466

@@ -498,7 +485,6 @@ describe('Logger tests', () => {
498485
'fastify': stubFastify,
499486
'./helpers': {
500487
saveServerAddress: stubSaveServerAddress,
501-
getPromiseWithResolvers,
502488
},
503489
});
504490

@@ -516,7 +502,6 @@ describe('Logger tests', () => {
516502
'fastify': stubFastify,
517503
'./helpers': {
518504
saveServerAddress: stubSaveServerAddress,
519-
getPromiseWithResolvers,
520505
},
521506
});
522507

@@ -543,7 +528,6 @@ describe('Logger tests', () => {
543528
'fastify': stubFastify,
544529
'./helpers': {
545530
saveServerAddress: stubSaveServerAddress,
546-
getPromiseWithResolvers,
547531
},
548532
});
549533

@@ -570,7 +554,6 @@ describe('Logger tests', () => {
570554
'fastify': stubFastify,
571555
'./helpers': {
572556
saveServerAddress: stubSaveServerAddress,
573-
getPromiseWithResolvers,
574557
},
575558
});
576559

@@ -597,7 +580,6 @@ describe('Logger tests', () => {
597580
'fastify': stubFastify,
598581
'./helpers': {
599582
saveServerAddress: stubSaveServerAddress,
600-
getPromiseWithResolvers,
601583
},
602584
});
603585

@@ -648,7 +630,6 @@ describe('Logger tests', () => {
648630
'fastify': stubFastify,
649631
'./helpers': {
650632
saveServerAddress: stubSaveServerAddress,
651-
getPromiseWithResolvers,
652633
},
653634
});
654635

@@ -703,7 +684,6 @@ describe('Logger tests', () => {
703684
'fastify': stubFastify,
704685
'./helpers': {
705686
saveServerAddress: stubSaveServerAddress,
706-
getPromiseWithResolvers,
707687
},
708688
});
709689

@@ -752,7 +732,6 @@ describe('Logger tests', () => {
752732
'fastify': stubFastify,
753733
'./helpers': {
754734
saveServerAddress: stubSaveServerAddress,
755-
getPromiseWithResolvers,
756735
},
757736
});
758737

@@ -803,7 +782,6 @@ describe('Logger tests', () => {
803782
'fastify': stubFastify,
804783
'./helpers': {
805784
saveServerAddress: stubSaveServerAddress,
806-
getPromiseWithResolvers,
807785
},
808786
});
809787

@@ -872,7 +850,6 @@ describe('Logger tests', () => {
872850
'fastify': stubFastify,
873851
'./helpers': {
874852
saveServerAddress: stubSaveServerAddress,
875-
getPromiseWithResolvers,
876853
},
877854
});
878855

@@ -938,7 +915,6 @@ describe('Logger tests', () => {
938915
'fastify': stubFastify,
939916
'./helpers': {
940917
saveServerAddress: stubSaveServerAddress,
941-
getPromiseWithResolvers,
942918
},
943919
});
944920

@@ -988,7 +964,6 @@ describe('Logger tests', () => {
988964
'fastify': stubFastify,
989965
'./helpers': {
990966
saveServerAddress: stubSaveServerAddress,
991-
getPromiseWithResolvers,
992967
},
993968
});
994969

@@ -1033,7 +1008,6 @@ describe('Logger tests', () => {
10331008
'fastify': stubFastify,
10341009
'./helpers': {
10351010
saveServerAddress: stubSaveServerAddress,
1036-
getPromiseWithResolvers,
10371011
},
10381012
});
10391013

@@ -1071,7 +1045,6 @@ describe('Logger tests', () => {
10711045
'fastify': stubFastify,
10721046
'./helpers': {
10731047
saveServerAddress: stubSaveServerAddress,
1074-
getPromiseWithResolvers,
10751048
},
10761049
});
10771050

@@ -1109,7 +1082,6 @@ describe('Logger tests', () => {
11091082
'fastify': stubFastify,
11101083
'./helpers': {
11111084
saveServerAddress: stubSaveServerAddress,
1112-
getPromiseWithResolvers,
11131085
},
11141086
});
11151087

@@ -1147,7 +1119,6 @@ describe('Logger tests', () => {
11471119
'fastify': stubFastify,
11481120
'./helpers': {
11491121
saveServerAddress: stubSaveServerAddress,
1150-
getPromiseWithResolvers,
11511122
},
11521123
});
11531124

@@ -1186,7 +1157,6 @@ describe('Logger tests', () => {
11861157
'fastify': stubFastify,
11871158
'./helpers': {
11881159
saveServerAddress: stubSaveServerAddress,
1189-
getPromiseWithResolvers,
11901160
},
11911161
});
11921162

@@ -1226,7 +1196,6 @@ describe('Logger tests', () => {
12261196
'fastify': stubFastify,
12271197
'./helpers': {
12281198
saveServerAddress: stubSaveServerAddress,
1229-
getPromiseWithResolvers,
12301199
},
12311200
});
12321201

@@ -1277,7 +1246,6 @@ describe('Logger tests', () => {
12771246
'fastify': stubFastify,
12781247
'./helpers': {
12791248
saveServerAddress: stubSaveServerAddress,
1280-
getPromiseWithResolvers,
12811249
},
12821250
});
12831251

@@ -1330,7 +1298,6 @@ describe('Logger tests', () => {
13301298
'fastify': stubFastify,
13311299
'./helpers': {
13321300
saveServerAddress: stubSaveServerAddress,
1333-
getPromiseWithResolvers,
13341301
},
13351302
});
13361303

@@ -1391,7 +1358,6 @@ describe('Logger tests', () => {
13911358
'fastify': stubFastify,
13921359
'./helpers': {
13931360
saveServerAddress: stubSaveServerAddress,
1394-
getPromiseWithResolvers,
13951361
},
13961362
});
13971363

@@ -1447,7 +1413,6 @@ describe('Logger tests', () => {
14471413
'fastify': stubFastify,
14481414
'./helpers': {
14491415
saveServerAddress: stubSaveServerAddress,
1450-
getPromiseWithResolvers,
14511416
},
14521417
});
14531418

@@ -1504,7 +1469,6 @@ describe('Logger tests', () => {
15041469
'fastify': stubFastify,
15051470
'./helpers': {
15061471
saveServerAddress: stubSaveServerAddress,
1507-
getPromiseWithResolvers,
15081472
},
15091473
});
15101474

@@ -1569,7 +1533,6 @@ describe('Logger tests', () => {
15691533
'fastify': stubFastify,
15701534
'./helpers': {
15711535
saveServerAddress: stubSaveServerAddress,
1572-
getPromiseWithResolvers,
15731536
},
15741537
});
15751538

@@ -1663,7 +1626,6 @@ describe('Logger tests', () => {
16631626
'fastify': stubFastify,
16641627
'./helpers': {
16651628
saveServerAddress: stubSaveServerAddress,
1666-
getPromiseWithResolvers,
16671629
},
16681630
});
16691631

@@ -1709,7 +1671,6 @@ describe('Logger tests', () => {
17091671
'@codefresh-io/task-logger': { TaskLogger: TaskLoggerFactory },
17101672
'./http-server': HttpServer,
17111673
'./helpers': {
1712-
getPromiseWithResolvers,
17131674
},
17141675
});
17151676

@@ -1756,7 +1717,6 @@ describe('Logger tests', () => {
17561717
'./http-server': HttpServer,
17571718
'./helpers': {
17581719
saveServerAddress: stubSaveServerAddress,
1759-
getPromiseWithResolvers,
17601720
},
17611721
});
17621722

‎yarn.lock‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3238,11 +3238,6 @@ cookie@^1.0.1:
32383238
resolved "https://registry.yarnpkg.com/cookie/-/cookie-1.0.2.tgz#27360701532116bd3f1f9416929d176afe1e4610"
32393239
integrity sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==
32403240

3241-
core-js-pure@^3.37.1:
3242-
version "3.37.1"
3243-
resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.37.1.tgz#2b4b34281f54db06c9a9a5bd60105046900553bd"
3244-
integrity sha512-J/r5JTHSmzTxbiYYrzXg9w1VpqrYt+gexenBE9pugeyhwPZTAEJddyiReJWsLO6uNQ8xJZFbod6XC7KKwatCiA==
3245-
32463241
core-js@^2.4.0, core-js@^2.5.0:
32473242
version "2.6.11"
32483243
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"

0 commit comments

Comments
 (0)