@elastic/synthetics 1.0.0-beta.30 → 1.0.0-beta.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (99) hide show
  1. package/dist/cli.js +51 -26
  2. package/dist/cli.js.map +1 -1
  3. package/dist/common_types.d.ts +4 -1
  4. package/dist/common_types.d.ts.map +1 -1
  5. package/dist/core/expect.d.ts +25 -25
  6. package/dist/core/expect.d.ts.map +1 -1
  7. package/dist/core/expect.js.map +1 -1
  8. package/dist/core/gatherer.d.ts.map +1 -1
  9. package/dist/core/gatherer.js +3 -1
  10. package/dist/core/gatherer.js.map +1 -1
  11. package/dist/core/runner.d.ts.map +1 -1
  12. package/dist/core/runner.js +4 -3
  13. package/dist/core/runner.js.map +1 -1
  14. package/dist/dsl/index.js +5 -1
  15. package/dist/dsl/index.js.map +1 -1
  16. package/dist/dsl/journey.d.ts +2 -1
  17. package/dist/dsl/journey.d.ts.map +1 -1
  18. package/dist/dsl/journey.js +5 -1
  19. package/dist/dsl/journey.js.map +1 -1
  20. package/dist/dsl/monitor.d.ts +2 -1
  21. package/dist/dsl/monitor.d.ts.map +1 -1
  22. package/dist/dsl/monitor.js +2 -2
  23. package/dist/dsl/monitor.js.map +1 -1
  24. package/dist/generator/index.d.ts +11 -3
  25. package/dist/generator/index.d.ts.map +1 -1
  26. package/dist/generator/index.js +98 -27
  27. package/dist/generator/index.js.map +1 -1
  28. package/dist/generator/utils.d.ts +2 -1
  29. package/dist/generator/utils.d.ts.map +1 -1
  30. package/dist/generator/utils.js +27 -4
  31. package/dist/generator/utils.js.map +1 -1
  32. package/dist/helpers.d.ts +10 -5
  33. package/dist/helpers.d.ts.map +1 -1
  34. package/dist/helpers.js +41 -10
  35. package/dist/helpers.js.map +1 -1
  36. package/dist/index.d.ts +1 -1
  37. package/dist/index.d.ts.map +1 -1
  38. package/dist/loader.js +11 -3
  39. package/dist/loader.js.map +1 -1
  40. package/dist/locations/index.d.ts +45 -0
  41. package/dist/locations/index.d.ts.map +1 -0
  42. package/dist/locations/index.js +90 -0
  43. package/dist/locations/index.js.map +1 -0
  44. package/dist/{dsl/locations.d.ts → locations/public-locations.d.ts} +1 -1
  45. package/dist/locations/public-locations.d.ts.map +1 -0
  46. package/dist/{dsl/locations.js → locations/public-locations.js} +1 -1
  47. package/dist/locations/public-locations.js.map +1 -0
  48. package/dist/options.d.ts +7 -0
  49. package/dist/options.d.ts.map +1 -1
  50. package/dist/options.js +21 -1
  51. package/dist/options.js.map +1 -1
  52. package/dist/plugins/index.js +5 -1
  53. package/dist/plugins/index.js.map +1 -1
  54. package/dist/push/bundler.d.ts.map +1 -1
  55. package/dist/push/bundler.js +12 -3
  56. package/dist/push/bundler.js.map +1 -1
  57. package/dist/push/index.d.ts +12 -1
  58. package/dist/push/index.d.ts.map +1 -1
  59. package/dist/push/index.js +137 -8
  60. package/dist/push/index.js.map +1 -1
  61. package/dist/push/monitor.d.ts +7 -0
  62. package/dist/push/monitor.d.ts.map +1 -1
  63. package/dist/push/monitor.js +23 -7
  64. package/dist/push/monitor.js.map +1 -1
  65. package/dist/push/plugin.d.ts.map +1 -1
  66. package/dist/push/plugin.js +11 -2
  67. package/dist/push/plugin.js.map +1 -1
  68. package/dist/push/request.d.ts +8 -7
  69. package/dist/push/request.d.ts.map +1 -1
  70. package/dist/push/request.js +22 -22
  71. package/dist/push/request.js.map +1 -1
  72. package/dist/tsconfig.tsbuildinfo +1 -1
  73. package/package.json +9 -9
  74. package/src/cli.ts +79 -59
  75. package/src/common_types.ts +4 -0
  76. package/src/core/expect.ts +58 -24
  77. package/src/core/gatherer.ts +9 -2
  78. package/src/core/runner.ts +5 -6
  79. package/src/dsl/journey.ts +8 -1
  80. package/src/dsl/monitor.ts +2 -1
  81. package/src/generator/index.ts +138 -34
  82. package/src/generator/utils.ts +29 -3
  83. package/src/helpers.ts +40 -12
  84. package/src/index.ts +1 -0
  85. package/src/loader.ts +11 -2
  86. package/src/locations/index.ts +108 -0
  87. package/src/{dsl/locations.ts → locations/public-locations.ts} +0 -0
  88. package/src/options.ts +38 -0
  89. package/src/push/bundler.ts +7 -2
  90. package/src/push/index.ts +177 -10
  91. package/src/push/monitor.ts +38 -9
  92. package/src/push/plugin.ts +6 -1
  93. package/src/push/request.ts +27 -34
  94. package/templates/journeys/advanced-example-helpers.ts +9 -9
  95. package/templates/journeys/advanced-example.journey.ts +6 -6
  96. package/templates/journeys/example.journey.ts +1 -1
  97. package/templates/synthetics.config.ts +2 -1
  98. package/dist/dsl/locations.d.ts.map +0 -1
  99. package/dist/dsl/locations.js.map +0 -1
package/dist/loader.js CHANGED
@@ -78,9 +78,17 @@ async function loadTestFiles(options, args) {
78
78
  }
79
79
  exports.loadTestFiles = loadTestFiles;
80
80
  const loadInlineScript = source => {
81
- const scriptFn = new Function('step', 'page', 'context', 'browser', 'params', 'expect', source);
82
- (0, core_1.journey)('inline', ({ page, context, browser, params }) => {
83
- scriptFn.apply(null, [core_1.step, page, context, browser, params, expect_1.expect]);
81
+ const scriptFn = new Function('step', 'page', 'context', 'browser', 'params', 'expect', 'request', source);
82
+ (0, core_1.journey)('inline', ({ page, context, browser, params, request }) => {
83
+ scriptFn.apply(null, [
84
+ core_1.step,
85
+ page,
86
+ context,
87
+ browser,
88
+ params,
89
+ expect_1.expect,
90
+ request,
91
+ ]);
84
92
  });
85
93
  };
86
94
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,qCAAqC;AACrC,+BAA+B;AAE/B,iCAAuC;AACvC,0CAAoC;AACpC,0CAAuC;AACvC,uCAKmB;AAEnB,MAAM,WAAW,GAAG,IAAA,aAAG,GAAE,CAAC;AAEnB,KAAK,UAAU,aAAa,CAAC,OAAgB,EAAE,IAAc;IAClE;;;;;;;;OAQG;IACH,iEAAiE;IACjE,OAAO,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC;QAC1B,aAAa,EAAE,IAAI;QACnB,eAAe,EAAE;YACf,eAAe,EAAE,IAAI;YACrB,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,QAAQ;SACjB;KACF,CAAC,CAAC;IAEH;;OAEG;IACH,MAAM,OAAO,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACjE,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE;QAC1B,IAAI,IAAA,wBAAc,EAAC,IAAI,CAAC,EAAE;YACxB,OAAO,CAAC,IAAI,CAAC,CAAC;SACf;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,GAAG,CAAC,CAAC;SACjD;KACF;IAED,IAAI,OAAO,CAAC,MAAM,EAAE;QAClB,MAAM,MAAM,GAAG,MAAM,SAAS,EAAE,CAAC;QACjC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QACzB,OAAO;KACR;IACD;;;OAGG;IACH,MAAM,KAAK,GACT,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC3E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3D,aAAa,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC;AA7CD,sCA6CC;AAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,EAAE;IAChC,MAAM,QAAQ,GAAG,IAAI,QAAQ,CAC3B,MAAM,EACN,MAAM,EACN,SAAS,EACT,SAAS,EACT,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,MAAM,CACP,CAAC;IACF,IAAA,cAAO,EAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE;QAChE,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE;YACnB,WAAI;YACJ,IAAI;YACJ,OAAO;YACP,OAAO;YACP,MAAM;YACN,eAAM;YACN,OAAO;SACR,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;GAEG;AACH,KAAK,UAAU,SAAS;IACtB,MAAM,MAAM,GAAG,EAAE,CAAC;IAClB,eAAK,CAAC,MAAM,EAAE,CAAC;IACf,eAAK,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;IAC3B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,eAAK,EAAE;QAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACpB;IACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,aAAa,CAAC,MAAwB;IAC7C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,OAAO,CAAC,KAAK,CAAC,CAAC;KAChB;AACH,CAAC;AAED;;;GAGG;AACH,KAAK,UAAU,aAAa,CAAC,MAAgB,EAAE,WAAoB;IACjE,MAAM,MAAM,GAAG,IAAI,GAAG,EAAU,CAAC;IACjC,MAAM,QAAQ,GAAG,OAAO,CAAC,EAAE;QACzB,IAAA,YAAG,EAAC,oBAAoB,OAAO,EAAE,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC;IACF;;;OAGG;IACH,MAAM,OAAO,GAAG,WAAW;QACzB,CAAC,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC;QAC9B,CAAC,CAAC,+BAA+B,CAAC;IACpC;;OAEG;IACH,MAAM,OAAO,GAAG,eAAe,CAAC;IAEhC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;QAC1B,MAAM,OAAO,GAAG,IAAA,cAAO,EAAC,WAAW,EAAE,KAAK,CAAC,CAAC;QAC5C;;;WAGG;QACH,IAAA,iCAAuB,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QAC9C,IAAI,IAAA,qBAAW,EAAC,OAAO,CAAC,EAAE;YACxB,MAAM,IAAA,kBAAQ,EAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACnC,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBAC3C,QAAQ,CAAC,GAAG,CAAC,CAAC;iBACf;YACH,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,QAAQ,CAAC,OAAO,CAAC,CAAC;SACnB;KACF;IACD,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;AACzB,CAAC"}
@@ -0,0 +1,45 @@
1
+ /**
2
+ * MIT License
3
+ *
4
+ * Copyright (c) 2020-present, Elastic NV
5
+ *
6
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
7
+ * of this software and associated documentation files (the "Software"), to deal
8
+ * in the Software without restriction, including without limitation the rights
9
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10
+ * copies of the Software, and to permit persons to whom the Software is
11
+ * furnished to do so, subject to the following conditions:
12
+ *
13
+ * The above copyright notice and this permission notice shall be included in
14
+ * all copies or substantial portions of the Software.
15
+ *
16
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
17
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22
+ * THE SOFTWARE.
23
+ *
24
+ */
25
+ export declare type LocationCmdOptions = {
26
+ auth: string;
27
+ url: string;
28
+ };
29
+ declare type LocationMetadata = {
30
+ id: string;
31
+ label: string;
32
+ isServiceManaged: boolean;
33
+ };
34
+ export declare type LocationAPIResponse = {
35
+ locations: Array<LocationMetadata>;
36
+ };
37
+ export declare function getLocations(options: LocationCmdOptions): Promise<LocationMetadata[]>;
38
+ export declare function formatLocations(locations: Array<LocationMetadata>): string[];
39
+ export declare function groupLocations(locations: Array<string>): {
40
+ locations: any[];
41
+ privateLocations: any[];
42
+ };
43
+ export declare function renderLocations(locations: Array<string>): void;
44
+ export {};
45
+ //# sourceMappingURL=index.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/locations/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAUH,oBAAY,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,aAAK,gBAAgB,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,oBAAY,mBAAmB,GAAG;IAChC,SAAS,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;CACpC,CAAC;AAIF,wBAAsB,YAAY,CAAC,OAAO,EAAE,kBAAkB,+BAgB7D;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,gBAAgB,CAAC,YAajE;AAED,wBAAgB,cAAc,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;;;EAUtD;AAED,wBAAgB,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,QAYvD"}
@@ -0,0 +1,90 @@
1
+ "use strict";
2
+ /**
3
+ * MIT License
4
+ *
5
+ * Copyright (c) 2020-present, Elastic NV
6
+ *
7
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
8
+ * of this software and associated documentation files (the "Software"), to deal
9
+ * in the Software without restriction, including without limitation the rights
10
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11
+ * copies of the Software, and to permit persons to whom the Software is
12
+ * furnished to do so, subject to the following conditions:
13
+ *
14
+ * The above copyright notice and this permission notice shall be included in
15
+ * all copies or substantial portions of the Software.
16
+ *
17
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23
+ * THE SOFTWARE.
24
+ *
25
+ */
26
+ Object.defineProperty(exports, "__esModule", { value: true });
27
+ exports.renderLocations = exports.groupLocations = exports.formatLocations = exports.getLocations = void 0;
28
+ const request_1 = require("../push/request");
29
+ const helpers_1 = require("../helpers");
30
+ const PRIVATE_KEYWORD = '(private)';
31
+ async function getLocations(options) {
32
+ const url = (0, helpers_1.removeTrailingSlash)(options.url) + '/internal/uptime/service/locations';
33
+ const { body, statusCode } = await (0, request_1.sendRequest)({
34
+ url,
35
+ method: 'GET',
36
+ auth: options.auth,
37
+ });
38
+ if (statusCode === 404) {
39
+ throw (0, request_1.formatNotFoundError)(await body.text());
40
+ }
41
+ if (!(0, request_1.ok)(statusCode)) {
42
+ const { error, message } = await body.json();
43
+ throw (0, request_1.formatAPIError)(statusCode, error, message);
44
+ }
45
+ return (await body.json()).locations;
46
+ }
47
+ exports.getLocations = getLocations;
48
+ function formatLocations(locations) {
49
+ const formatted = [];
50
+ for (const location of locations) {
51
+ let name = location.label;
52
+ if (location.isServiceManaged) {
53
+ [, name] = name.includes('-') ? name.split('-') : [, name];
54
+ name = name.toLowerCase().trim().split(' ').join('_');
55
+ }
56
+ else {
57
+ name = `${name}${PRIVATE_KEYWORD}`;
58
+ }
59
+ formatted.push(name);
60
+ }
61
+ return formatted;
62
+ }
63
+ exports.formatLocations = formatLocations;
64
+ function groupLocations(locations) {
65
+ const grouped = { locations: [], privateLocations: [] };
66
+ for (const loc of locations) {
67
+ if (loc.includes(PRIVATE_KEYWORD)) {
68
+ grouped.privateLocations.push(loc.replace(PRIVATE_KEYWORD, ''));
69
+ }
70
+ else {
71
+ grouped.locations.push(loc);
72
+ }
73
+ }
74
+ return grouped;
75
+ }
76
+ exports.groupLocations = groupLocations;
77
+ function renderLocations(locations) {
78
+ let outer = 'Available locations: \n';
79
+ let inner = '';
80
+ for (const location of locations) {
81
+ inner += `* ${location}\n`;
82
+ }
83
+ outer += (0, helpers_1.indent)(inner);
84
+ outer += `\nSet default location for monitors via
85
+ - Synthetics config file 'monitors.locations' | 'monitors.privateLocations' field
86
+ - Monitor API 'monitor.use({ locations: ["japan"], privateLocations: ["custom-location"] }')`;
87
+ (0, helpers_1.write)(outer);
88
+ }
89
+ exports.renderLocations = renderLocations;
90
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/locations/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,6CAKyB;AACzB,wCAAgE;AAiBhE,MAAM,eAAe,GAAG,WAAW,CAAC;AAE7B,KAAK,UAAU,YAAY,CAAC,OAA2B;IAC5D,MAAM,GAAG,GACP,IAAA,6BAAmB,EAAC,OAAO,CAAC,GAAG,CAAC,GAAG,oCAAoC,CAAC;IAC1E,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,qBAAW,EAAC;QAC7C,GAAG;QACH,MAAM,EAAE,KAAK;QACb,IAAI,EAAE,OAAO,CAAC,IAAI;KACnB,CAAC,CAAC;IACH,IAAI,UAAU,KAAK,GAAG,EAAE;QACtB,MAAM,IAAA,6BAAmB,EAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;KAC9C;IACD,IAAI,CAAC,IAAA,YAAE,EAAC,UAAU,CAAC,EAAE;QACnB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7C,MAAM,IAAA,wBAAc,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;KAClD;IACD,OAAQ,CAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAyB,CAAC,SAAS,CAAC;AAChE,CAAC;AAhBD,oCAgBC;AAED,SAAgB,eAAe,CAAC,SAAkC;IAChE,MAAM,SAAS,GAAkB,EAAE,CAAC;IACpC,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC1B,IAAI,QAAQ,CAAC,gBAAgB,EAAE;YAC7B,CAAC,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;YAC3D,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACvD;aAAM;YACL,IAAI,GAAG,GAAG,IAAI,GAAG,eAAe,EAAE,CAAC;SACpC;QACD,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACtB;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAbD,0CAaC;AAED,SAAgB,cAAc,CAAC,SAAwB;IACrD,MAAM,OAAO,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EAAE,CAAC;IACxD,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;QAC3B,IAAI,GAAG,CAAC,QAAQ,CAAC,eAAe,CAAC,EAAE;YACjC,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,CAAC;SACjE;aAAM;YACL,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAC7B;KACF;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAVD,wCAUC;AAED,SAAgB,eAAe,CAAC,SAAwB;IACtD,IAAI,KAAK,GAAG,yBAAyB,CAAC;IACtC,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,KAAK,IAAI,KAAK,QAAQ,IAAI,CAAC;KAC5B;IACD,KAAK,IAAI,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAC;IACvB,KAAK,IAAI;;+FAEoF,CAAC;IAE9F,IAAA,eAAK,EAAC,KAAK,CAAC,CAAC;AACf,CAAC;AAZD,0CAYC"}
@@ -34,4 +34,4 @@ export declare const LocationsMap: {
34
34
  us_east: string;
35
35
  us_west: string;
36
36
  };
37
- //# sourceMappingURL=locations.d.ts.map
37
+ //# sourceMappingURL=public-locations.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"public-locations.d.ts","sourceRoot":"","sources":["../../src/locations/public-locations.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAGH,eAAO,MAAM,YAAY;;;;;;;;;;;CAWxB,CAAC"}
@@ -38,4 +38,4 @@ exports.LocationsMap = {
38
38
  us_east: 'us-east4-a',
39
39
  us_west: 'us-west1-a',
40
40
  };
41
- //# sourceMappingURL=locations.js.map
41
+ //# sourceMappingURL=public-locations.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"public-locations.js","sourceRoot":"","sources":["../../src/locations/public-locations.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,sDAAsD;AACzC,QAAA,YAAY,GAAG;IAC1B,KAAK,EAAE,mBAAmB;IAC1B,KAAK,EAAE,eAAe;IACtB,SAAS,EAAE,mBAAmB;IAC9B,cAAc,EAAE,wBAAwB;IACxC,cAAc,EAAE,gBAAgB;IAChC,OAAO,EAAE,gBAAgB;IACzB,WAAW,EAAE,2BAA2B;IACxC,MAAM,EAAE,sBAAsB;IAC9B,OAAO,EAAE,YAAY;IACrB,OAAO,EAAE,YAAY;CACtB,CAAC"}
package/dist/options.d.ts CHANGED
@@ -31,4 +31,11 @@ export declare function normalizeOptions(cliArgs: CliArgs): RunOptions;
31
31
  * - Processess new format otherwise `{download: 5, upload: 3, latency: 20}`
32
32
  */
33
33
  export declare function parseThrottling(value: string, prev?: string): any;
34
+ export declare function getCommonCommandOpts(): {
35
+ params: import("commander").Option;
36
+ playwrightOpts: import("commander").Option;
37
+ pattern: import("commander").Option;
38
+ tags: import("commander").Option;
39
+ match: import("commander").Option;
40
+ };
34
41
  //# sourceMappingURL=options.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAKH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAW7E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAqG7D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,OAwB3D"}
1
+ {"version":3,"file":"options.d.ts","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAMH,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAqB,MAAM,gBAAgB,CAAC;AAW7E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,UAAU,CAuG7D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,OAwB3D;AAED,wBAAgB,oBAAoB;;;;;;EAiCnC"}
package/dist/options.js CHANGED
@@ -27,8 +27,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
27
27
  return (mod && mod.__esModule) ? mod : { "default": mod };
28
28
  };
29
29
  Object.defineProperty(exports, "__esModule", { value: true });
30
- exports.parseThrottling = exports.normalizeOptions = void 0;
30
+ exports.getCommonCommandOpts = exports.parseThrottling = exports.normalizeOptions = void 0;
31
31
  const deepmerge_1 = __importDefault(require("deepmerge"));
32
+ const commander_1 = require("commander");
32
33
  const config_1 = require("./config");
33
34
  const helpers_1 = require("./helpers");
34
35
  /**
@@ -125,6 +126,8 @@ function normalizeOptions(cliArgs) {
125
126
  }
126
127
  options.schedule = cliArgs.schedule ?? monitor?.schedule;
127
128
  options.locations = cliArgs.locations ?? monitor?.locations;
129
+ options.privateLocations =
130
+ cliArgs.privateLocations ?? monitor?.privateLocations;
128
131
  return options;
129
132
  }
130
133
  exports.normalizeOptions = normalizeOptions;
@@ -159,4 +162,21 @@ function parseThrottling(value, prev) {
159
162
  return JSON.parse(value || prev);
160
163
  }
161
164
  exports.parseThrottling = parseThrottling;
165
+ function getCommonCommandOpts() {
166
+ const params = (0, commander_1.createOption)('-p, --params <jsonstring>', 'JSON object that gets injected to all journeys');
167
+ params.argParser(JSON.parse);
168
+ const playwrightOpts = (0, commander_1.createOption)('--playwright-options <jsonstring>', 'JSON object to pass in custom Playwright options for the agent. Options passed will be merged with Playwright options defined in your synthetics.config.js file.');
169
+ playwrightOpts.argParser(JSON.parse);
170
+ const pattern = (0, commander_1.createOption)('--pattern <pattern>', 'RegExp file patterns to search inside directory');
171
+ const tags = (0, commander_1.createOption)('--tags <name...>', 'run only journeys with a tag that matches the glob');
172
+ const match = (0, commander_1.createOption)('--match <name>', 'run only journeys with a name or tag that matches the glob');
173
+ return {
174
+ params,
175
+ playwrightOpts,
176
+ pattern,
177
+ tags,
178
+ match,
179
+ };
180
+ }
181
+ exports.getCommonCommandOpts = getCommonCommandOpts;
162
182
  //# sourceMappingURL=options.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"options.js","sourceRoot":"","sources":["../src/options.ts"],"names":[],"mappings":"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"}
@@ -25,7 +25,11 @@
25
25
  */
26
26
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
27
27
  if (k2 === undefined) k2 = k;
28
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
28
+ var desc = Object.getOwnPropertyDescriptor(m, k);
29
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
30
+ desc = { enumerable: true, get: function() { return m[k]; } };
31
+ }
32
+ Object.defineProperty(o, k2, desc);
29
33
  }) : (function(o, m, k, k2) {
30
34
  if (k2 === undefined) k2 = k;
31
35
  o[k2] = m[k];
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;;;;;;;AAEH,mDAAiC;AACjC,4CAA0B;AAC1B,gDAA8B;AAC9B,4CAA0B;AAC1B,oDAAkC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/plugins/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;;;;;;;;;;;;;;AAEH,mDAAiC;AACjC,4CAA0B;AAC1B,gDAA8B;AAC9B,4CAA0B;AAC1B,oDAAkC"}
@@ -1 +1 @@
1
- {"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../src/push/bundler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAaH,qBAAa,OAAO;IAClB,SAAS,sBAA6B;;IAGhC,OAAO,CAAC,OAAO,EAAE,MAAM;IAqBvB,GAAG,CAAC,UAAU,EAAE,MAAM;IAiBtB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAQnC,MAAM,CAAC,UAAU,EAAE,MAAM;IAIzB,OAAO,CAAC,UAAU,EAAE,MAAM;CAIjC"}
1
+ {"version":3,"file":"bundler.d.ts","sourceRoot":"","sources":["../../src/push/bundler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAaH,qBAAa,OAAO;IAClB,SAAS,sBAA6B;;IAGhC,OAAO,CAAC,OAAO,EAAE,MAAM;IAqBvB,GAAG,CAAC,UAAU,EAAE,MAAM;IAsBtB,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAQnC,MAAM,CAAC,UAAU,EAAE,MAAM;IAIzB,OAAO,CAAC,UAAU,EAAE,MAAM;CAIjC"}
@@ -25,7 +25,11 @@
25
25
  */
26
26
  var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
27
27
  if (k2 === undefined) k2 = k;
28
- Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
28
+ var desc = Object.getOwnPropertyDescriptor(m, k);
29
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
30
+ desc = { enumerable: true, get: function() { return m[k]; } };
31
+ }
32
+ Object.defineProperty(o, k2, desc);
29
33
  }) : (function(o, m, k, k2) {
30
34
  if (k2 === undefined) k2 = k;
31
35
  o[k2] = m[k];
@@ -85,12 +89,17 @@ class Bundler {
85
89
  const archive = (0, archiver_1.default)('zip', {
86
90
  zlib: { level: 9 },
87
91
  });
88
- archive.on('error', err => reject(err));
92
+ archive.on('error', reject);
89
93
  output.on('close', fulfill);
90
94
  archive.pipe(output);
91
95
  for (const [path, content] of this.moduleMap.entries()) {
92
96
  const relativePath = relativeToCwd(path);
93
- archive.append(content, { name: relativePath });
97
+ // Date is fixed to Unix epoch so the file metadata is
98
+ // not modified everytime when files are bundled
99
+ archive.append(content, {
100
+ name: relativePath,
101
+ date: new Date('1970-01-01'),
102
+ });
94
103
  }
95
104
  archive.finalize();
96
105
  });
@@ -1 +1 @@
1
- {"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../src/push/bundler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bundler.js","sourceRoot":"","sources":["../../src/push/bundler.ts"],"names":[],"mappings":"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"}
@@ -22,7 +22,18 @@
22
22
  * THE SOFTWARE.
23
23
  *
24
24
  */
25
+ import { MonitorSchema } from './monitor';
26
+ import { ProjectSettings } from '../generator';
25
27
  import { Monitor } from '../dsl/monitor';
26
- import { PushOptions } from '../common_types';
28
+ import type { PushOptions } from '../common_types';
27
29
  export declare function push(monitors: Monitor[], options: PushOptions): Promise<void>;
30
+ export declare function pushMonitors({ schemas, keepStale, options, }: {
31
+ schemas: MonitorSchema[];
32
+ keepStale: boolean;
33
+ options: PushOptions;
34
+ }): Promise<void>;
35
+ export declare function formatDuplicateError(monitors: Set<Monitor>): string;
36
+ export declare function loadSettings(): Promise<ProjectSettings>;
37
+ export declare function validateSettings(opts: PushOptions): void;
38
+ export declare function catchIncorrectSettings(settings: ProjectSettings, options: PushOptions): Promise<void>;
28
39
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AASH,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAI9C,wBAAsB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,iBAqBnE"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAcH,OAAO,EAAsC,aAAa,EAAE,MAAM,WAAW,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAYzC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnD,wBAAsB,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,iBAoBnE;AAED,wBAAsB,YAAY,CAAC,EACjC,OAAO,EACP,SAAS,EACT,OAAO,GACR,EAAE;IACD,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,OAAO,CAAC;IACnB,OAAO,EAAE,WAAW,CAAC;CACtB,iBAuCA;AAgBD,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,GAAG,CAAC,OAAO,CAAC,UAU1D;AAKD,wBAAsB,YAAY,6BASjC;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,WAAW,QAuBjD;AAaD,wBAAsB,sBAAsB,CAC1C,QAAQ,EAAE,eAAe,EACzB,OAAO,EAAE,WAAW,iBAuBrB"}
@@ -24,16 +24,37 @@
24
24
  *
25
25
  */
26
26
  Object.defineProperty(exports, "__esModule", { value: true });
27
- exports.push = void 0;
27
+ exports.catchIncorrectSettings = exports.validateSettings = exports.loadSettings = exports.formatDuplicateError = exports.pushMonitors = exports.push = void 0;
28
+ const path_1 = require("path");
29
+ const fs_1 = require("fs");
30
+ const promises_1 = require("fs/promises");
31
+ const enquirer_1 = require("enquirer");
32
+ const colors_1 = require("kleur/colors");
28
33
  const request_1 = require("./request");
29
34
  const monitor_1 = require("./monitor");
30
35
  const helpers_1 = require("../helpers");
31
36
  async function push(monitors, options) {
37
+ if (monitors.length === 0) {
38
+ throw 'No Monitors found';
39
+ }
40
+ const duplicates = trackDuplicates(monitors);
41
+ if (duplicates.size > 0) {
42
+ throw (0, helpers_1.error)(formatDuplicateError(duplicates));
43
+ }
32
44
  (0, helpers_1.progress)(`preparing all monitors`);
33
45
  const schemas = await (0, monitor_1.buildMonitorSchema)(monitors);
46
+ (0, helpers_1.progress)(`creating all monitors`);
47
+ for (const schema of schemas) {
48
+ await pushMonitors({ schemas: [schema], keepStale: true, options });
49
+ }
50
+ (0, helpers_1.progress)(`deleting all stale monitors`);
51
+ await pushMonitors({ schemas, keepStale: false, options });
52
+ (0, helpers_1.done)('Pushed');
53
+ }
54
+ exports.push = push;
55
+ async function pushMonitors({ schemas, keepStale, options, }) {
34
56
  try {
35
- (0, helpers_1.progress)(`creating all monitors`);
36
- const { body, statusCode } = await (0, request_1.createMonitors)(schemas, options);
57
+ const { body, statusCode } = await (0, monitor_1.createMonitors)(schemas, options, keepStale);
37
58
  if (statusCode === 404) {
38
59
  throw (0, request_1.formatNotFoundError)(await body.text());
39
60
  }
@@ -41,15 +62,123 @@ async function push(monitors, options) {
41
62
  const { error, message } = await body.json();
42
63
  throw (0, request_1.formatAPIError)(statusCode, error, message);
43
64
  }
44
- const { failedMonitors } = await body.json();
45
- if (failedMonitors.length > 0) {
46
- throw (0, request_1.formatFailedMonitors)(failedMonitors);
65
+ body.setEncoding('utf-8');
66
+ for await (const data of body) {
67
+ // Its kind of hacky for now where Kibana streams the response by
68
+ // writing the data as NDJSON events (data can be interleaved), we
69
+ // distinguish the final data by checking if the event was a progress vs complete event
70
+ const chunks = (0, helpers_1.safeNDJSONParse)(data);
71
+ for (const chunk of chunks) {
72
+ if (typeof chunk === 'string') {
73
+ // TODO: add progress back for all states once we get the fix
74
+ // on kibana side
75
+ keepStale && (0, helpers_1.apiProgress)(chunk);
76
+ continue;
77
+ }
78
+ const { failedMonitors, failedStaleMonitors } = chunk;
79
+ if (failedMonitors && failedMonitors.length > 0) {
80
+ throw (0, request_1.formatFailedMonitors)(failedMonitors);
81
+ }
82
+ if (failedStaleMonitors.length > 0) {
83
+ (0, helpers_1.write)((0, colors_1.yellow)((0, request_1.formatStaleMonitors)(failedStaleMonitors)));
84
+ }
85
+ }
47
86
  }
48
- (0, helpers_1.done)('Pushed');
49
87
  }
50
88
  catch (e) {
51
89
  (0, helpers_1.error)(e);
52
90
  }
53
91
  }
54
- exports.push = push;
92
+ exports.pushMonitors = pushMonitors;
93
+ function trackDuplicates(monitors) {
94
+ const monitorMap = new Map();
95
+ const duplicates = new Set();
96
+ for (const monitor of monitors) {
97
+ const id = monitor.config.id;
98
+ if (monitorMap.has(id)) {
99
+ duplicates.add(monitorMap.get(id));
100
+ duplicates.add(monitor);
101
+ }
102
+ monitorMap.set(id, monitor);
103
+ }
104
+ return duplicates;
105
+ }
106
+ function formatDuplicateError(monitors) {
107
+ let outer = (0, colors_1.bold)(`Aborted: Duplicate monitors found\n`);
108
+ let inner = '';
109
+ for (const monitor of monitors) {
110
+ const { config, source } = monitor;
111
+ inner += `* ${config.id} - ${source.file}:${source.line}:${source.column}\n`;
112
+ }
113
+ outer += (0, helpers_1.indent)(inner);
114
+ return outer;
115
+ }
116
+ exports.formatDuplicateError = formatDuplicateError;
117
+ const PROJECT_SETTINGS_PATH = (0, path_1.join)(helpers_1.SYNTHETICS_PATH, 'project.json');
118
+ const INSTALLATION_HELP = `Run 'npx @elastic/synthetics init' to create project with default settings.`;
119
+ async function loadSettings() {
120
+ if (!(0, fs_1.existsSync)(PROJECT_SETTINGS_PATH)) {
121
+ throw (0, helpers_1.error)(`Aborted. Synthetics project not set up.
122
+
123
+ ${INSTALLATION_HELP}`);
124
+ }
125
+ const contents = await (0, promises_1.readFile)(PROJECT_SETTINGS_PATH, 'utf-8');
126
+ return JSON.parse(contents);
127
+ }
128
+ exports.loadSettings = loadSettings;
129
+ function validateSettings(opts) {
130
+ const INVALID = 'Aborted. Invalid synthetics project settings.';
131
+ let reason = '';
132
+ if (!opts.project) {
133
+ reason = 'Set project id via CLI as `--project <id>`';
134
+ }
135
+ else if (!opts.locations && !opts.privateLocations) {
136
+ reason = `Set default location for all monitors via
137
+ - CLI as '--locations <values...> or --privateLocations <values...>'
138
+ - Synthetics config file 'monitors.locations' | 'monitors.privateLocations' field`;
139
+ }
140
+ else if (!opts.schedule) {
141
+ reason = `Set default schedule in minutes for all monitors via
142
+ - CLI as '--schedule <mins>'
143
+ - Synthetics config file 'monitors.schedule' field`;
144
+ }
145
+ if (!reason)
146
+ return;
147
+ throw (0, helpers_1.error)(`${INVALID}
148
+
149
+ ${reason}
150
+
151
+ ${INSTALLATION_HELP}`);
152
+ }
153
+ exports.validateSettings = validateSettings;
154
+ async function overrideSettings(project) {
155
+ const settings = JSON.parse(await (0, promises_1.readFile)(PROJECT_SETTINGS_PATH, 'utf-8'));
156
+ settings.project = project;
157
+ await (0, promises_1.writeFile)(PROJECT_SETTINGS_PATH, JSON.stringify(settings, null, 2), 'utf-8');
158
+ }
159
+ async function catchIncorrectSettings(settings, options) {
160
+ let override = !settings.project;
161
+ if (settings.project && settings.project !== options.project) {
162
+ if (typeof process.env.TEST_OVERRIDE != null) {
163
+ override = Boolean(process.env.TEST_OVERRIDE);
164
+ }
165
+ else {
166
+ // Add an extra line to make it easier to read the prompt
167
+ (0, helpers_1.write)('');
168
+ ({ override } = await (0, enquirer_1.prompt)({
169
+ type: 'confirm',
170
+ name: 'override',
171
+ message: `Monitors were pushed under the '${settings.project}' project. Are you sure you want to push them under the new '${options.project}' (note that this will duplicate the monitors, the old ones being orphaned)`,
172
+ initial: false,
173
+ }));
174
+ }
175
+ if (!override) {
176
+ throw (0, helpers_1.aborted)('Push command Aborted');
177
+ }
178
+ }
179
+ if (override) {
180
+ await overrideSettings(options.project);
181
+ }
182
+ }
183
+ exports.catchIncorrectSettings = catchIncorrectSettings;
55
184
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;;;AAEH,uCAMmB;AAGnB,uCAA+C;AAC/C,wCAAmD;AAE5C,KAAK,UAAU,IAAI,CAAC,QAAmB,EAAE,OAAoB;IAClE,IAAA,kBAAQ,EAAC,wBAAwB,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,MAAM,IAAA,4BAAkB,EAAC,QAAQ,CAAC,CAAC;IACnD,IAAI;QACF,IAAA,kBAAQ,EAAC,uBAAuB,CAAC,CAAC;QAClC,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,wBAAc,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACpE,IAAI,UAAU,KAAK,GAAG,EAAE;YACtB,MAAM,IAAA,6BAAmB,EAAC,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;SAC9C;QACD,IAAI,CAAC,IAAA,YAAE,EAAC,UAAU,CAAC,EAAE;YACnB,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;YAC7C,MAAM,IAAA,wBAAc,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;SAClD;QACD,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7C,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,MAAM,IAAA,8BAAoB,EAAC,cAAc,CAAC,CAAC;SAC5C;QACD,IAAA,cAAI,EAAC,QAAQ,CAAC,CAAC;KAChB;IAAC,OAAO,CAAC,EAAE;QACV,IAAA,eAAK,EAAC,CAAC,CAAC,CAAC;KACV;AACH,CAAC;AArBD,oBAqBC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/push/index.ts"],"names":[],"mappings":"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"}
@@ -23,10 +23,17 @@
23
23
  *
24
24
  */
25
25
  import { Monitor, MonitorConfig } from '../dsl/monitor';
26
+ import { PushOptions } from '../common_types';
26
27
  export declare type MonitorSchema = Omit<MonitorConfig, 'locations'> & {
27
28
  content: string;
28
29
  locations: string[];
29
30
  filter: Monitor['filter'];
30
31
  };
32
+ export declare type APISchema = {
33
+ project: string;
34
+ keep_stale: boolean;
35
+ monitors: MonitorSchema[];
36
+ };
31
37
  export declare function buildMonitorSchema(monitors: Monitor[]): Promise<MonitorSchema[]>;
38
+ export declare function createMonitors(monitors: MonitorSchema[], options: PushOptions, keepStale: boolean): Promise<import("undici/types/dispatcher").ResponseData>;
32
39
  //# sourceMappingURL=monitor.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAOH,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAExD,oBAAY,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3B,CAAC;AAMF,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,4BAyB3D"}
1
+ {"version":3,"file":"monitor.d.ts","sourceRoot":"","sources":["../../src/push/monitor.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AAQH,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,oBAAY,aAAa,GAAG,IAAI,CAAC,aAAa,EAAE,WAAW,CAAC,GAAG;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,EAAE,CAAC;IACpB,MAAM,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC3B,CAAC;AAEF,oBAAY,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B,CAAC;AAOF,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,OAAO,EAAE,4BAwB3D;AAED,wBAAsB,cAAc,CAClC,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,WAAW,EACpB,SAAS,EAAE,OAAO,2DAgBnB"}