@opencrvs/toolkit 2.1.0-rc.976ee09 → 2.1.0-rc.982e0ae

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 (103) hide show
  1. package/README.md +1 -0
  2. package/build.sh +9 -1
  3. package/create-countryconfig/index.js +284 -62
  4. package/create-countryconfig/node_modules/.bin/degit +21 -0
  5. package/create-countryconfig/package.json +4 -1
  6. package/dist/application-config/index.js +341 -274
  7. package/dist/authentication/index.d.ts +67 -0
  8. package/dist/authentication/index.d.ts.map +1 -0
  9. package/dist/authentication/index.js +750 -0
  10. package/dist/cli.js +1744 -104
  11. package/dist/commons/api/router.d.ts +691 -76
  12. package/dist/commons/conditionals/conditionals.d.ts +6 -6
  13. package/dist/commons/conditionals/validate.d.ts +16 -5
  14. package/dist/commons/events/ActionDocument.d.ts +5 -11
  15. package/dist/commons/events/ActionInput.d.ts +4 -4
  16. package/dist/commons/events/ActionStatus.d.ts +14 -0
  17. package/dist/commons/events/AdvancedSearchConfig.d.ts +24 -0
  18. package/dist/commons/events/AuditLog.d.ts +147 -0
  19. package/dist/commons/events/EventConfig.d.ts +3 -0
  20. package/dist/commons/events/EventDocument.d.ts +470 -2
  21. package/dist/commons/events/EventIndex.d.ts +3 -26
  22. package/dist/commons/events/EventMetadata.d.ts +1 -11
  23. package/dist/commons/events/EventStatus.d.ts +19 -0
  24. package/dist/commons/events/FieldConfig.d.ts +88 -53
  25. package/dist/commons/events/FieldTypeMapping.d.ts +27 -27
  26. package/dist/commons/events/FieldValue.d.ts +2 -2
  27. package/dist/commons/events/Flag.d.ts +42 -0
  28. package/dist/commons/events/PlainDate.d.ts +8 -0
  29. package/dist/commons/events/SummaryConfig.d.ts +249 -0
  30. package/dist/commons/events/WorkqueueConfig.d.ts +17 -14
  31. package/dist/commons/events/event.d.ts +12 -0
  32. package/dist/commons/events/index.d.ts +1 -0
  33. package/dist/commons/events/locationPayloads.d.ts +95 -0
  34. package/dist/commons/events/locations.d.ts +165 -26
  35. package/dist/commons/events/mocks.test.utils.d.ts +30 -0
  36. package/dist/commons/events/test.utils.d.ts +8 -4
  37. package/dist/commons/events/utils.d.ts +2 -2
  38. package/dist/commons/notification/UserNotifications.d.ts +28 -13
  39. package/dist/commons/notification/dispatch.d.ts +10 -0
  40. package/dist/commons/notification/index.d.ts +1 -0
  41. package/dist/conditionals/index.js +328 -58
  42. package/dist/csv.d.ts +25 -0
  43. package/dist/csv.d.ts.map +1 -0
  44. package/dist/csv.js +120 -0
  45. package/dist/environment/index.d.ts +1 -0
  46. package/dist/environment/index.d.ts.map +1 -1
  47. package/dist/environment/index.js +10 -0
  48. package/dist/environment/logger.d.ts +15 -3
  49. package/dist/environment/logger.d.ts.map +1 -1
  50. package/dist/environment/paths.d.ts +7 -0
  51. package/dist/environment/paths.d.ts.map +1 -0
  52. package/dist/environment/paths.js +72 -0
  53. package/dist/environment/questions.d.ts.map +1 -1
  54. package/dist/environment/questions.js +20 -14
  55. package/dist/environment/setup-environment.js +3 -2
  56. package/dist/environment/templates.d.ts.map +1 -1
  57. package/dist/environment/templates.js +2 -1
  58. package/dist/environment/update-workflows.d.ts.map +1 -1
  59. package/dist/environment/update-workflows.js +17 -5
  60. package/dist/environment/upgrade.d.ts +2 -0
  61. package/dist/environment/upgrade.d.ts.map +1 -0
  62. package/dist/environment/upgrade.js +82 -0
  63. package/dist/environment/users.js +11 -13
  64. package/dist/events/index.js +3688 -3293
  65. package/dist/migrations/v2.0/checkout-upstream-files.d.ts +2 -2
  66. package/dist/migrations/v2.0/checkout-upstream-files.d.ts.map +1 -1
  67. package/dist/migrations/v2.0/checkout-upstream-files.js +2 -2
  68. package/dist/migrations/v2.1/add-recovery-link-notifications.d.ts +3 -0
  69. package/dist/migrations/v2.1/add-recovery-link-notifications.d.ts.map +1 -0
  70. package/dist/migrations/v2.1/add-recovery-link-notifications.js +511 -0
  71. package/dist/migrations/v2.1/add-translations.d.ts +9 -0
  72. package/dist/migrations/v2.1/add-translations.d.ts.map +1 -0
  73. package/dist/migrations/v2.1/add-translations.js +213 -0
  74. package/dist/migrations/v2.1/enable-telemetry.d.ts +3 -0
  75. package/dist/migrations/v2.1/enable-telemetry.d.ts.map +1 -0
  76. package/dist/migrations/v2.1/enable-telemetry.js +438 -0
  77. package/dist/migrations/v2.1/index.d.ts.map +1 -1
  78. package/dist/migrations/v2.1/index.js +1058 -0
  79. package/dist/notification/index.js +1833 -1426
  80. package/dist/scopes/index.d.ts +327 -32
  81. package/dist/scopes/index.js +329 -58
  82. package/dist/telemetry/index.d.ts +45 -0
  83. package/dist/telemetry/index.d.ts.map +1 -0
  84. package/dist/telemetry/index.js +39 -0
  85. package/dist/templates/charts-values/opencrvs-services/values.yaml +4 -3
  86. package/dist/templates/charts-values/opentelemetry/values.yaml +95 -0
  87. package/dist/templates/charts-values/traefik/values.yaml +23 -9
  88. package/dist/templates/inventory/inventory.template.yml +1 -3
  89. package/dist/translations/check.d.ts +19 -0
  90. package/dist/translations/check.d.ts.map +1 -0
  91. package/dist/translations/check.js +127 -0
  92. package/dist/verify/endpoints.d.ts +2 -0
  93. package/dist/verify/endpoints.d.ts.map +1 -0
  94. package/dist/verify/endpoints.js +345 -0
  95. package/opencrvs-toolkit-2.1.0-rc.982e0ae.tgz +0 -0
  96. package/package.json +11 -5
  97. package/tsconfig.build.json +11 -0
  98. package/tsconfig.build.tsbuildinfo +1 -0
  99. package/tsconfig.json +3 -0
  100. package/dist/templates/inventory/production.example.yml +0 -77
  101. package/dist/templates/inventory/qa.example.yml +0 -48
  102. package/opencrvs-toolkit-2.1.0-rc.976ee09.tgz +0 -0
  103. package/tsconfig.tsbuildinfo +0 -1
package/dist/csv.js ADDED
@@ -0,0 +1,120 @@
1
+ "use strict";
2
+ /*
3
+ * This Source Code Form is subject to the terms of the Mozilla Public
4
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
5
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
+ *
7
+ * OpenCRVS is also distributed under the terms of the Civil Registration
8
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
9
+ *
10
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
11
+ */
12
+ Object.defineProperty(exports, "__esModule", { value: true });
13
+ exports.parseCsvLine = parseCsvLine;
14
+ exports.toCsvLine = toCsvLine;
15
+ exports.idOf = idOf;
16
+ exports.readCsvFile = readCsvFile;
17
+ exports.writeCsvFile = writeCsvFile;
18
+ exports.addRows = addRows;
19
+ /**
20
+ * Just enough CSV for the translation files codemods edit. They are read and
21
+ * written a line at a time rather than through a parser, so that adding two
22
+ * rows to a file of sixteen hundred produces a diff of two lines instead of a
23
+ * re-quoted rewrite of the whole thing.
24
+ *
25
+ * Rows spanning multiple lines are not supported, and none of the translation
26
+ * files contain any.
27
+ */
28
+ const fs_1 = require("fs");
29
+ function parseCsvLine(line) {
30
+ const values = [];
31
+ let value = '';
32
+ let quoted = false;
33
+ for (let index = 0; index < line.length; index++) {
34
+ const character = line[index];
35
+ if (quoted) {
36
+ if (character !== '"') {
37
+ value += character;
38
+ }
39
+ else if (line[index + 1] === '"') {
40
+ value += '"';
41
+ index++;
42
+ }
43
+ else {
44
+ quoted = false;
45
+ }
46
+ continue;
47
+ }
48
+ if (character === '"') {
49
+ quoted = true;
50
+ }
51
+ else if (character === ',') {
52
+ values.push(value);
53
+ value = '';
54
+ }
55
+ else {
56
+ value += character;
57
+ }
58
+ }
59
+ values.push(value);
60
+ return values;
61
+ }
62
+ function toCsvLine(values) {
63
+ return values
64
+ .map((value) => /["\n,]/.test(value) ? `"${value.replace(/"/g, '""')}"` : value)
65
+ .join(',');
66
+ }
67
+ /**
68
+ * The id of a row, which is its first column. Translation ids never contain a
69
+ * comma or a quote, so this does not need the parser.
70
+ */
71
+ function idOf(line) {
72
+ const comma = line.indexOf(',');
73
+ // No comma: `slice(0, -1)` would eat the last character.
74
+ return comma === -1 ? line : line.slice(0, comma);
75
+ }
76
+ function readCsvFile(path) {
77
+ if (!(0, fs_1.existsSync)(path)) {
78
+ return undefined;
79
+ }
80
+ const contents = (0, fs_1.readFileSync)(path, 'utf8');
81
+ const newline = contents.includes('\r\n') ? '\r\n' : '\n';
82
+ const trailingNewline = /\r?\n$/.test(contents);
83
+ const lines = contents.replace(/\r?\n$/, '').split(/\r?\n/);
84
+ // Trailing blank line leaves an empty entry. It sorts before every id, so
85
+ // the file reads as unsorted.
86
+ const body = lines.slice(1).filter((line) => line !== '');
87
+ return { header: lines[0], body, newline, trailingNewline };
88
+ }
89
+ function writeCsvFile(path, file) {
90
+ (0, fs_1.writeFileSync)(path, [file.header, ...file.body].join(file.newline) +
91
+ (file.trailingNewline ? file.newline : ''));
92
+ }
93
+ /**
94
+ * Adds the rows the file does not already have an id for, in place. Rows go in
95
+ * sorted position when the file is sorted by id, and at the end when it is not,
96
+ * so a country config that keeps its own order keeps it.
97
+ *
98
+ * Returns the ids that were added.
99
+ */
100
+ function addRows(file, rows) {
101
+ const isSorted = file.body.every((line, index) => index === 0 || idOf(file.body[index - 1]) <= idOf(line));
102
+ const added = [];
103
+ for (const row of rows) {
104
+ const id = idOf(row);
105
+ if (file.body.some((line) => idOf(line) === id)) {
106
+ continue;
107
+ }
108
+ const insertAt = isSorted
109
+ ? file.body.findIndex((line) => idOf(line) > id)
110
+ : -1;
111
+ if (insertAt === -1) {
112
+ file.body.push(row);
113
+ }
114
+ else {
115
+ file.body.splice(insertAt, 0, row);
116
+ }
117
+ added.push(id);
118
+ }
119
+ return added;
120
+ }
@@ -1,4 +1,5 @@
1
1
  export declare function runEnvironmentInit(): Promise<void>;
2
+ export declare function runEnvironmentUpgrade(): Promise<void>;
2
3
  export declare function runEnvironmentUpdateWorkflows(): Promise<void>;
3
4
  export declare function runEnvironmentUsers(): Promise<void>;
4
5
  export declare function runEnvironmentSwarmToK8s(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/environment/index.ts"],"names":[],"mappings":"AAwCA,wBAAsB,kBAAkB,kBAGvC;AAED,wBAAsB,6BAA6B,kBAIlD;AAED,wBAAsB,mBAAmB,kBAIxC;AAED,wBAAsB,wBAAwB,kBAG7C"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/environment/index.ts"],"names":[],"mappings":"AAyCA,wBAAsB,kBAAkB,kBAIvC;AAED,wBAAsB,qBAAqB,kBAI1C;AAED,wBAAsB,6BAA6B,kBAIlD;AAED,wBAAsB,mBAAmB,kBAIxC;AAED,wBAAsB,wBAAwB,kBAG7C"}
@@ -20,11 +20,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
20
20
  };
21
21
  Object.defineProperty(exports, "__esModule", { value: true });
22
22
  exports.runEnvironmentInit = runEnvironmentInit;
23
+ exports.runEnvironmentUpgrade = runEnvironmentUpgrade;
23
24
  exports.runEnvironmentUpdateWorkflows = runEnvironmentUpdateWorkflows;
24
25
  exports.runEnvironmentUsers = runEnvironmentUsers;
25
26
  exports.runEnvironmentSwarmToK8s = runEnvironmentSwarmToK8s;
26
27
  const fs_1 = require("fs");
27
28
  const path_1 = require("path");
29
+ const paths_1 = require("./paths");
28
30
  const REQUIRED_REPOSITORY_DIRECTORIES = [
29
31
  '.github/workflows',
30
32
  'environments',
@@ -46,9 +48,17 @@ function validateRepositoryStructure(repositoryRoot = process.cwd()) {
46
48
  function runEnvironmentInit() {
47
49
  return __awaiter(this, void 0, void 0, function* () {
48
50
  validateRepositoryStructure();
51
+ (0, paths_1.assertNoOldInventoryLayout)();
49
52
  yield import('./setup-environment.js');
50
53
  });
51
54
  }
55
+ function runEnvironmentUpgrade() {
56
+ return __awaiter(this, void 0, void 0, function* () {
57
+ validateRepositoryStructure();
58
+ const { upgradeEnvironmentLayout } = yield import('./upgrade.js');
59
+ yield upgradeEnvironmentLayout();
60
+ });
61
+ }
52
62
  function runEnvironmentUpdateWorkflows() {
53
63
  return __awaiter(this, void 0, void 0, function* () {
54
64
  validateRepositoryStructure();
@@ -1,6 +1,18 @@
1
- export declare const log: (message?: any, ...optionalParams: any[]) => void;
2
- export declare const warn: (message?: any, ...optionalParams: any[]) => void;
1
+ export declare const log: {
2
+ (message?: any, ...optionalParams: any[]): void;
3
+ (message?: any, ...optionalParams: any[]): void;
4
+ (message?: any, ...optionalParams: any[]): void;
5
+ };
6
+ export declare const warn: {
7
+ (message?: any, ...optionalParams: any[]): void;
8
+ (message?: any, ...optionalParams: any[]): void;
9
+ (message?: any, ...optionalParams: any[]): void;
10
+ };
3
11
  export declare const success: (...args: any[]) => void;
4
- export declare const info: (message?: any, ...optionalParams: any[]) => void;
12
+ export declare const info: {
13
+ (message?: any, ...optionalParams: any[]): void;
14
+ (message?: any, ...optionalParams: any[]): void;
15
+ (message?: any, ...optionalParams: any[]): void;
16
+ };
5
17
  export declare const error: (...args: any[]) => void;
6
18
  //# sourceMappingURL=logger.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/environment/logger.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,GAAG,mDAAc,CAAA;AAC9B,eAAO,MAAM,IAAI,mDAAe,CAAA;AAChC,eAAO,MAAM,OAAO,YAAa,GAAG,EAAE,SACI,CAAA;AAC1C,eAAO,MAAM,IAAI,mDAAe,CAAA;AAChC,eAAO,MAAM,KAAK,YAAa,GAAG,EAAE,SAA2C,CAAA"}
1
+ {"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../src/environment/logger.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,GAAG;;;;CAAc,CAAA;AAC9B,eAAO,MAAM,IAAI;;;;CAAe,CAAA;AAChC,eAAO,MAAM,OAAO,YAAa,GAAG,EAAE,SACI,CAAA;AAC1C,eAAO,MAAM,IAAI;;;;CAAe,CAAA;AAChC,eAAO,MAAM,KAAK,YAAa,GAAG,EAAE,SAA2C,CAAA"}
@@ -0,0 +1,7 @@
1
+ export declare const OLD_INVENTORY_DIR: string;
2
+ export declare const INVENTORY_FILE_NAME = "inventory.yml";
3
+ export declare function getEnvironmentInventoryPath(environment: string): string;
4
+ export declare function findOldInventoryFiles(): string[];
5
+ export declare function getEnvironmentNameFromOldInventoryPath(filePath: string): string;
6
+ export declare function assertNoOldInventoryLayout(): void;
7
+ //# sourceMappingURL=paths.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/environment/paths.ts"],"names":[],"mappings":"AAcA,eAAO,MAAM,iBAAiB,QAI7B,CAAA;AAED,eAAO,MAAM,mBAAmB,kBAAkB,CAAA;AAElD,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,MAAM,UAE9D;AAED,wBAAgB,qBAAqB,aAEpC;AAED,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,MAAM,UAEtE;AAED,wBAAgB,0BAA0B,SAWzC"}
@@ -0,0 +1,72 @@
1
+ "use strict";
2
+ /*
3
+ * This Source Code Form is subject to the terms of the Mozilla Public
4
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
5
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
+ *
7
+ * OpenCRVS is also distributed under the terms of the Civil Registration
8
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
9
+ *
10
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
11
+ */
12
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
13
+ if (k2 === undefined) k2 = k;
14
+ var desc = Object.getOwnPropertyDescriptor(m, k);
15
+ if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
16
+ desc = { enumerable: true, get: function() { return m[k]; } };
17
+ }
18
+ Object.defineProperty(o, k2, desc);
19
+ }) : (function(o, m, k, k2) {
20
+ if (k2 === undefined) k2 = k;
21
+ o[k2] = m[k];
22
+ }));
23
+ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
24
+ Object.defineProperty(o, "default", { enumerable: true, value: v });
25
+ }) : function(o, v) {
26
+ o["default"] = v;
27
+ });
28
+ var __importStar = (this && this.__importStar) || (function () {
29
+ var ownKeys = function(o) {
30
+ ownKeys = Object.getOwnPropertyNames || function (o) {
31
+ var ar = [];
32
+ for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
33
+ return ar;
34
+ };
35
+ return ownKeys(o);
36
+ };
37
+ return function (mod) {
38
+ if (mod && mod.__esModule) return mod;
39
+ var result = {};
40
+ if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
41
+ __setModuleDefault(result, mod);
42
+ return result;
43
+ };
44
+ })();
45
+ Object.defineProperty(exports, "__esModule", { value: true });
46
+ exports.INVENTORY_FILE_NAME = exports.OLD_INVENTORY_DIR = void 0;
47
+ exports.getEnvironmentInventoryPath = getEnvironmentInventoryPath;
48
+ exports.findOldInventoryFiles = findOldInventoryFiles;
49
+ exports.getEnvironmentNameFromOldInventoryPath = getEnvironmentNameFromOldInventoryPath;
50
+ exports.assertNoOldInventoryLayout = assertNoOldInventoryLayout;
51
+ const path_1 = require("path");
52
+ const glob = __importStar(require("glob"));
53
+ exports.OLD_INVENTORY_DIR = (0, path_1.join)('infrastructure', 'server-setup', 'inventory');
54
+ exports.INVENTORY_FILE_NAME = 'inventory.yml';
55
+ function getEnvironmentInventoryPath(environment) {
56
+ return (0, path_1.join)('environments', environment, exports.INVENTORY_FILE_NAME);
57
+ }
58
+ function findOldInventoryFiles() {
59
+ return glob.sync((0, path_1.join)(exports.OLD_INVENTORY_DIR, '*.yml')).sort();
60
+ }
61
+ function getEnvironmentNameFromOldInventoryPath(filePath) {
62
+ return (0, path_1.basename)(filePath, '.yml');
63
+ }
64
+ function assertNoOldInventoryLayout() {
65
+ if (findOldInventoryFiles().length === 0) {
66
+ return;
67
+ }
68
+ throw new Error([
69
+ `Old inventory layout detected at ${exports.OLD_INVENTORY_DIR}.`,
70
+ 'Please run `yarn environment:upgrade` before running `yarn environment:init`.'
71
+ ].join(' '));
72
+ }
@@ -1 +1 @@
1
- {"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../src/environment/questions.ts"],"names":[],"mappings":"AAeA,QAAA,MAAM,QAAQ,UAAW,MAAM,GAAG,MAAM,kCAC4B,CAAA;AAepE,iBAAS,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAgBnD;AAED,eAAO,MAAM,kBAAkB;;UAGrB,MAAM;;eAED,QAAQ;;;;WAIZ,YAAY;GAiCtB,CAAA;AAED,eAAO,MAAM,eAAe;;UAGlB,MAAM;;;;WAIL,YAAY;GAUtB,CAAA;AACD,eAAO,MAAM,oBAAoB;;UAGvB,MAAM;;;eAGD,UAAU;;WAEd,YAAY;;;;;UAIb,QAAQ;;;;;;eAaH,UAAU;;;;WAId,aAAa;IAEvB,CAAA;AACD,eAAO,MAAM,mBAAmB;;UAGtB,MAAM;;;;eAID,QAAQ;WACZ,YAAY;;GAGtB,CAAA;AAED,eAAO,MAAM,gBAAgB;;UAGnB,MAAM;;eAGD,UAAU;;;WAGd,YAAY;GAEtB,CAAA;AAED,eAAO,MAAM,uBAAuB;;UAG1B,MAAM;;eAED,UAAU;;;;WAId,aAAa;;;;UAId,MAAM;;eAED,UAAU;;;WAId,aAAa;;;UAId,MAAM;;eAED,UAAU;;;;WAId,aAAa;IAYvB,CAAA;AAED,eAAO,MAAM,sBAAsB;;UAGzB,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;GAYvB,CAAA;AAED,eAAO,MAAM,eAAe;;;;UAGlB,MAAM;;eAED,UAAU;;;WAId,aAAa;;;;UAId,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;;;UAId,QAAQ;;;;;;eAYH,UAAU;;;;WAId,aAAa;IAEvB,CAAA;AAED,eAAO,MAAM,aAAa;;UAGhB,MAAM;;eAID,UAAU;;;;WAId,aAAa;GAEvB,CAAA;AAED,eAAO,MAAM,8BAA8B;;UAGjC,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;GAYvB,CAAA;AAED,eAAO,MAAM,cAAc;;;UAGjB,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;;;UAkCd,QAAQ;;;;;;eAYH,QAAQ;;;;WAIZ,aAAa;IAuBvB,CAAA;AAED,eAAO,MAAM,eAAe;;UAGlB,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;GAEvB,CAAA;AAED,eAAO,MAAM,sBAAsB;eAEpB,QAAQ;;UAEb,MAAM;;;WAIL,aAAa;;GAYvB,CAAA"}
1
+ {"version":3,"file":"questions.d.ts","sourceRoot":"","sources":["../../src/environment/questions.ts"],"names":[],"mappings":"AAeA,QAAA,MAAM,QAAQ,UAAW,MAAM,GAAG,MAAM,kCAC4B,CAAA;AAepE,iBAAS,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAgBnD;AAED,eAAO,MAAM,kBAAkB;;UAGrB,MAAM;;eAED,QAAQ;;;;WAIZ,YAAY;GAiCtB,CAAA;AAED,eAAO,MAAM,eAAe;;UAGlB,MAAM;;;;WAIL,YAAY;GAUtB,CAAA;AACD,eAAO,MAAM,oBAAoB;;UAGvB,MAAM;;;eAGD,UAAU;;WAEd,YAAY;;;;;UAIb,QAAQ;;;;;;eAaH,UAAU;;;;WAId,aAAa;IAEvB,CAAA;AACD,eAAO,MAAM,mBAAmB;;UAGtB,MAAM;;;;eAID,QAAQ;WACZ,YAAY;;GAGtB,CAAA;AAED,eAAO,MAAM,gBAAgB;;UAGnB,MAAM;;eAGD,UAAU;;;WAGd,YAAY;GAEtB,CAAA;AAED,eAAO,MAAM,uBAAuB;;UAG1B,MAAM;;eAED,UAAU;;;;WAId,aAAa;;;;UAId,MAAM;;eAED,UAAU;;;WAGd,aAAa;;;UAsBd,MAAM;;eAED,UAAU;;;;WAId,aAAa;IAEvB,CAAA;AAED,eAAO,MAAM,sBAAsB;;UAGzB,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;GAYvB,CAAA;AAED,eAAO,MAAM,eAAe;;;;UAGlB,MAAM;;eAED,UAAU;;;WAGd,aAAa;;;;UAId,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;;;UAId,QAAQ;;;;;;eAYH,UAAU;;;;WAId,aAAa;IAEvB,CAAA;AAED,eAAO,MAAM,aAAa;;UAGhB,MAAM;;eAID,UAAU;;;;WAId,aAAa;GAEvB,CAAA;AAED,eAAO,MAAM,8BAA8B;;UAGjC,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;GAYvB,CAAA;AAED,eAAO,MAAM,cAAc;;;UAGjB,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;;;UAkCd,QAAQ;;;;;;eAYH,QAAQ;;;;WAIZ,aAAa;IAuBvB,CAAA;AAED,eAAO,MAAM,eAAe;;UAGlB,MAAM;;eAED,QAAQ;;;;WAIZ,aAAa;GAEvB,CAAA;AAED,eAAO,MAAM,sBAAsB;eAEpB,QAAQ;;UAEb,MAAM;;;WAIL,aAAa;;GAYvB,CAAA"}
@@ -166,11 +166,28 @@ exports.infrastructureQuestions = [
166
166
  scope: 'ENVIRONMENT'
167
167
  },
168
168
  {
169
- name: 'kubeAPIHost',
169
+ name: 'kubeMasterNode',
170
170
  type: 'text',
171
- message: `Kubernetes API endpoint (default: auto-detect)`,
171
+ message: `Kubernetes master node hostnames or IP (default: auto-detect)`,
172
+ valueType: 'VARIABLE',
173
+ valueLabel: 'KUBE_MASTER_NODE',
174
+ initial: process.env.KUBE_MASTER_NODE,
175
+ scope: 'ENVIRONMENT'
176
+ },
177
+ {
178
+ name: 'kubeWorkerNodes',
179
+ type: 'text',
180
+ message: `Kubernetes worker node hostnames or IPs (comma-separated, default: no worker nodes)`,
181
+ valueType: 'VARIABLE',
182
+ valueLabel: 'KUBE_WORKER_NODES',
183
+ initial: process.env.KUBE_WORKER_NODES || '',
184
+ scope: 'ENVIRONMENT'
185
+ },
186
+ {
187
+ name: 'kubeApiHost',
188
+ type: 'text',
189
+ message: `Kubernetes API endpoint IP (default: KUBE_MASTER_NODE)`,
172
190
  valueType: 'VARIABLE',
173
- // validate: notEmpty,
174
191
  valueLabel: 'KUBE_API_HOST',
175
192
  initial: process.env.KUBE_API_HOST,
176
193
  scope: 'ENVIRONMENT'
@@ -185,16 +202,6 @@ exports.infrastructureQuestions = [
185
202
  initial: process.env.KUBE_API_ALLOWED_CIDRS || '',
186
203
  scope: 'ENVIRONMENT'
187
204
  },
188
- {
189
- name: 'kubeWorkerNodes',
190
- type: 'text',
191
- message: `Kubernetes worker node hostnames or IPs (comma-separated, default: no worker nodes)`,
192
- valueType: 'VARIABLE',
193
- // validate: notEmpty,
194
- valueLabel: 'KUBE_WORKER_NODES',
195
- initial: process.env.KUBE_WORKER_NODES || '',
196
- scope: 'ENVIRONMENT'
197
- }
198
205
  ];
199
206
  exports.staticSSLCertQuestions = [
200
207
  {
@@ -224,7 +231,6 @@ exports.backupQuestions = [
224
231
  type: 'text',
225
232
  message: `Please enter backup server host/IP address, (default: no backup):`,
226
233
  valueType: 'VARIABLE',
227
- // validate: notEmpty,
228
234
  valueLabel: 'BACKUP_HOST',
229
235
  initial: process.env.BACKUP_HOST || '',
230
236
  scope: 'ENVIRONMENT'
@@ -59,6 +59,7 @@ const questions_1 = require("./questions");
59
59
  const editor_questions_1 = require("./editor-questions");
60
60
  const questions_helper_1 = require("./questions-helper");
61
61
  const manage_users_1 = require("./manage-users");
62
+ const paths_1 = require("./paths");
62
63
  function questionToPrompt(_a) {
63
64
  var { valueType, valueLabel, scope } = _a, promptOptions = __rest(_a, ["valueType", "valueLabel", "scope"]);
64
65
  return promptOptions;
@@ -271,7 +272,7 @@ ALL_QUESTIONS.push(...questions_1.githubTokenQuestion, ...questions_1.githubOthe
271
272
  ? infrastructure.kubeWorkerNodes.split(',').map((ip) => ip.trim())
272
273
  : [];
273
274
  (0, logger_1.log)('\n', kleur_1.default.bold().underline('SSH Users'), '\n');
274
- const users = yield (0, manage_users_1.manageUsers)(`infrastructure/server-setup/inventory/${environment}.yml`);
275
+ const users = yield (0, manage_users_1.manageUsers)((0, paths_1.getEnvironmentInventoryPath)(environment));
275
276
  (0, logger_1.log)('\n', kleur_1.default.bold().underline('Traefik SSL Certificate'), '\n');
276
277
  const sslCertExists = (0, utils_1.findExistingValue)('SSL_CRT', 'SECRET', 'ENVIRONMENT', existingValues);
277
278
  let ssl_answers = [];
@@ -716,7 +717,7 @@ ALL_QUESTIONS.push(...questions_1.githubTokenQuestion, ...questions_1.githubOthe
716
717
  (0, logger_1.log)('\n', kleur_1.default.bold().underline('Running configuration files updates'));
717
718
  (0, templates_1.generateInventory)(environment, {
718
719
  kube_worker_nodes: kubeWorkerNodes,
719
- kube_api_host: infrastructure.kubeAPIHost || '',
720
+ kube_api_host: infrastructure.kubeApiHost || '',
720
721
  backup_host: backupHost || '',
721
722
  users: users
722
723
  });
@@ -1 +1 @@
1
- {"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/environment/templates.ts"],"names":[],"mappings":"AAsBA,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAKvC;AAID,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAYpD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAWpD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CASnD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,EAAE,CAStD;AAGD;;;;GAIG;AACH;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QA0CzC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QA4BzE"}
1
+ {"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../src/environment/templates.ts"],"names":[],"mappings":"AAuBA,wBAAgB,QAAQ,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAKvC;AAID,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,GAAG,GAAG,GAAG,CAYpD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CAWpD;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,CASnD;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,GAAG,GAAG,MAAM,EAAE,CAStD;AAGD;;;;GAIG;AACH;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QA0CzC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,QAsBzE"}
@@ -34,6 +34,7 @@ exports.generateInventory = generateInventory;
34
34
  const fs_1 = __importDefault(require("fs"));
35
35
  const path_1 = __importDefault(require("path"));
36
36
  const logger_1 = require("./logger");
37
+ const paths_1 = require("./paths");
37
38
  const handlebars_1 = __importDefault(require("handlebars"));
38
39
  // Register a helper to increment numbers
39
40
  handlebars_1.default.registerHelper('data_label_idx', function (value) {
@@ -149,7 +150,7 @@ function copyChartsValues(env, values) {
149
150
  function generateInventory(env, values) {
150
151
  // Template and output paths
151
152
  const templatePath = path_1.default.join(__dirname, 'templates', 'inventory', 'inventory.template.yml');
152
- const outputPath = path_1.default.join(process.cwd(), 'infrastructure', 'server-setup', 'inventory', `${env}.yml`);
153
+ const outputPath = path_1.default.resolve(process.cwd(), (0, paths_1.getEnvironmentInventoryPath)(env));
153
154
  const templateFile = fs_1.default.readFileSync(templatePath, 'utf-8');
154
155
  const template = handlebars_1.default.compile(templateFile);
155
156
  values['single_node'] =
@@ -1 +1 @@
1
- {"version":3,"file":"update-workflows.d.ts","sourceRoot":"","sources":["../../src/environment/update-workflows.ts"],"names":[],"mappings":"AAgHA,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,CAgDhE"}
1
+ {"version":3,"file":"update-workflows.d.ts","sourceRoot":"","sources":["../../src/environment/update-workflows.ts"],"names":[],"mappings":"AA+HA,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,CAgDhE"}
@@ -60,12 +60,21 @@ const path_1 = require("path");
60
60
  const glob = __importStar(require("glob"));
61
61
  const yaml = __importStar(require("js-yaml"));
62
62
  const logger_1 = require("./logger");
63
+ const paths_1 = require("./paths");
64
+ function isDirectory(path) {
65
+ try {
66
+ return (0, fs_1.statSync)(path).isDirectory();
67
+ }
68
+ catch (_a) {
69
+ return false;
70
+ }
71
+ }
63
72
  function extractInfrastructureNames() {
64
73
  return __awaiter(this, void 0, void 0, function* () {
65
- const files = glob.sync('infrastructure/server-setup/inventory/*.yml');
66
- const infraEnvironments = files.map((file) => (0, path_1.basename)(file, '.yml'));
74
+ const files = glob.sync((0, path_1.join)('environments', '*', paths_1.INVENTORY_FILE_NAME));
75
+ const infraEnvironments = files.map((file) => (0, path_1.basename)((0, path_1.dirname)(file)));
67
76
  if (infraEnvironments.length === 0) {
68
- console.log('⚠️ Warning: No environment directories found in infrastructure/server-setup/inventory/');
77
+ console.log(`⚠️ Warning: No environment inventory files found at environments/*/${paths_1.INVENTORY_FILE_NAME}`);
69
78
  return [];
70
79
  }
71
80
  (0, logger_1.log)('🔍 Found infrastructure configurations:', infraEnvironments.join(', '));
@@ -77,8 +86,11 @@ function extractEnvironmentNames() {
77
86
  const entries = yield (0, promises_1.readdir)('environments');
78
87
  // Filter only directories
79
88
  const environments = entries.filter((entry) => {
80
- const fullPath = (0, path_1.join)('environments', entry);
81
- return (0, fs_1.statSync)(fullPath).isDirectory();
89
+ const environmentPath = (0, path_1.join)('environments', entry);
90
+ const opencrvsServicesPath = (0, path_1.join)(environmentPath, 'opencrvs-services');
91
+ return (isDirectory(environmentPath) &&
92
+ (0, fs_1.existsSync)(opencrvsServicesPath) &&
93
+ isDirectory(opencrvsServicesPath));
82
94
  });
83
95
  if (environments.length === 0) {
84
96
  console.log('⚠️ Warning: No environment directories found in environments/');
@@ -0,0 +1,2 @@
1
+ export declare function upgradeEnvironmentLayout(): Promise<void>;
2
+ //# sourceMappingURL=upgrade.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upgrade.d.ts","sourceRoot":"","sources":["../../src/environment/upgrade.ts"],"names":[],"mappings":"AAkFA,wBAAsB,wBAAwB,kBAY7C"}
@@ -0,0 +1,82 @@
1
+ "use strict";
2
+ /*
3
+ * This Source Code Form is subject to the terms of the Mozilla Public
4
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
5
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
6
+ *
7
+ * OpenCRVS is also distributed under the terms of the Civil Registration
8
+ * & Healthcare Disclaimer located at http://opencrvs.org/license.
9
+ *
10
+ * Copyright (C) The OpenCRVS Authors located at https://github.com/opencrvs/opencrvs-core/blob/master/AUTHORS.
11
+ */
12
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
13
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
14
+ return new (P || (P = Promise))(function (resolve, reject) {
15
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
16
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
17
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
18
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
19
+ });
20
+ };
21
+ var __importDefault = (this && this.__importDefault) || function (mod) {
22
+ return (mod && mod.__esModule) ? mod : { "default": mod };
23
+ };
24
+ Object.defineProperty(exports, "__esModule", { value: true });
25
+ exports.upgradeEnvironmentLayout = upgradeEnvironmentLayout;
26
+ const fs_1 = require("fs");
27
+ const path_1 = require("path");
28
+ const kleur_1 = __importDefault(require("kleur"));
29
+ const logger_1 = require("./logger");
30
+ const paths_1 = require("./paths");
31
+ const update_workflows_1 = require("./update-workflows");
32
+ function moveFileIfDestinationMissing(sourcePath, destinationPath) {
33
+ if (!(0, fs_1.existsSync)(sourcePath)) {
34
+ return false;
35
+ }
36
+ if ((0, fs_1.existsSync)(destinationPath)) {
37
+ (0, logger_1.warn)(`⚠️ Skipped ${sourcePath}; destination already exists at ${destinationPath}`);
38
+ return false;
39
+ }
40
+ (0, fs_1.mkdirSync)((0, path_1.dirname)(destinationPath), { recursive: true });
41
+ (0, fs_1.renameSync)(sourcePath, destinationPath);
42
+ (0, logger_1.log)(` ✓ Moved ${sourcePath} -> ${destinationPath}`);
43
+ return true;
44
+ }
45
+ function migrateInventoryFiles() {
46
+ const oldInventoryFiles = (0, paths_1.findOldInventoryFiles)();
47
+ if (oldInventoryFiles.length === 0) {
48
+ (0, logger_1.log)(`ℹ️ No old inventory files found at ${paths_1.OLD_INVENTORY_DIR}`);
49
+ return false;
50
+ }
51
+ (0, logger_1.log)(kleur_1.default.bold('\nMigrating Ansible inventory files'));
52
+ let didMoveInventory = false;
53
+ for (const oldInventoryFile of oldInventoryFiles) {
54
+ const environment = (0, paths_1.getEnvironmentNameFromOldInventoryPath)(oldInventoryFile);
55
+ didMoveInventory =
56
+ moveFileIfDestinationMissing(oldInventoryFile, (0, paths_1.getEnvironmentInventoryPath)(environment)) || didMoveInventory;
57
+ }
58
+ try {
59
+ if ((0, fs_1.existsSync)(paths_1.OLD_INVENTORY_DIR) &&
60
+ (0, fs_1.readdirSync)(paths_1.OLD_INVENTORY_DIR).length === 0) {
61
+ (0, fs_1.rmdirSync)(paths_1.OLD_INVENTORY_DIR);
62
+ (0, logger_1.log)(` ✓ Removed empty ${paths_1.OLD_INVENTORY_DIR}`);
63
+ }
64
+ }
65
+ catch (_a) {
66
+ (0, logger_1.warn)(`⚠️ Could not remove ${paths_1.OLD_INVENTORY_DIR}; please review it manually`);
67
+ }
68
+ return didMoveInventory;
69
+ }
70
+ function upgradeEnvironmentLayout() {
71
+ return __awaiter(this, void 0, void 0, function* () {
72
+ const didMoveInventory = migrateInventoryFiles();
73
+ yield (0, update_workflows_1.updateWorkflowEnvironments)();
74
+ if (didMoveInventory) {
75
+ (0, logger_1.success)('\n✅ Environment layout upgrade completed successfully.');
76
+ }
77
+ else {
78
+ (0, logger_1.success)('\n✅ Environment layout already uses the current structure.');
79
+ }
80
+ (0, logger_1.log)('\nCommit changes into git after upgrade');
81
+ });
82
+ }
@@ -62,6 +62,7 @@ const path = __importStar(require("path"));
62
62
  const kleur_1 = __importDefault(require("kleur"));
63
63
  const manage_users_1 = require("./manage-users");
64
64
  const logger_1 = require("./logger");
65
+ const paths_1 = require("./paths");
65
66
  function select(options) {
66
67
  return __awaiter(this, void 0, void 0, function* () {
67
68
  const inquirer = yield import('@inquirer/prompts');
@@ -76,32 +77,29 @@ function select(options) {
76
77
  * * @returns {string} Inventory file
77
78
  */
78
79
  function selectInventoryFile() {
79
- return __awaiter(this, arguments, void 0, function* (dirPath = './infrastructure/server-setup/inventory/') {
80
+ return __awaiter(this, arguments, void 0, function* (dirPath = './environments') {
80
81
  // Check if directory exists
81
82
  if (!fs.existsSync(dirPath)) {
82
83
  (0, logger_1.warn)(`⚠️ No environment configuration directory found at ${dirPath}`);
83
84
  (0, logger_1.warn)('Hint: If this is a new infrastructure repository, run `opencrvs environment init` first.');
84
85
  return null;
85
86
  }
86
- // Read and filter files
87
- const files = fs
87
+ const environments = fs
88
88
  .readdirSync(dirPath)
89
- .filter((file) => {
90
- const filePath = path.join(dirPath, file);
91
- const isFile = fs.statSync(filePath).isFile();
92
- const ext = path.extname(file).slice(1).toLowerCase();
93
- return isFile && (ext === 'yml' || ext === 'yaml');
89
+ .filter((entry) => {
90
+ const filePath = path.join(dirPath, entry);
91
+ return (fs.statSync(filePath).isDirectory() &&
92
+ fs.existsSync((0, paths_1.getEnvironmentInventoryPath)(entry)));
94
93
  })
95
94
  .sort();
96
- if (files.length === 0) {
95
+ if (environments.length === 0) {
97
96
  (0, logger_1.warn)(`⚠️ No environment configuration files found at ${dirPath}`);
98
97
  (0, logger_1.warn)('Hint: If this is a new infrastructure repository, run `opencrvs environment init` first.');
99
98
  return null;
100
99
  }
101
- // Create choices - remove extension from display
102
- const choices = files.map((file) => ({
103
- name: path.basename(file, path.extname(file)),
104
- value: path.join(dirPath, file)
100
+ const choices = environments.map((environment) => ({
101
+ name: environment,
102
+ value: (0, paths_1.getEnvironmentInventoryPath)(environment)
105
103
  }));
106
104
  const selectedFile = yield select({
107
105
  message: 'Select environment (inventory file) to load users:',