@opencrvs/toolkit 2.1.0-rc.c498f10 → 2.1.0-rc.c8d2a48

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.
@@ -11,12 +11,46 @@ export declare const LocationTypeV1: z.ZodEnum<{
11
11
  HEALTH_FACILITY: "HEALTH_FACILITY";
12
12
  }>;
13
13
  export type LocationTypeV1 = z.infer<typeof LocationTypeV1>;
14
+ export declare const LocationStatus: z.ZodEnum<{
15
+ active: "active";
16
+ inactive: "inactive";
17
+ }>;
18
+ export type LocationStatus = z.infer<typeof LocationStatus>;
19
+ /**
20
+ * A single element of the append-only `versions` history of a location or
21
+ * administrative area. Versions are sorted ascending by `effectiveFrom`
22
+ * ('0001-01-01' is used as the beginning-of-time sentinel).
23
+ */
24
+ export declare const LocationVersion: z.ZodObject<{
25
+ versionId: z.core.$ZodBranded<z.ZodUUID, "UUID", "out">;
26
+ effectiveFrom: z.ZodISODate;
27
+ name: z.ZodString;
28
+ externalId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
29
+ status: z.ZodEnum<{
30
+ active: "active";
31
+ inactive: "inactive";
32
+ }>;
33
+ }, z.core.$strip>;
34
+ export type LocationVersion = z.infer<typeof LocationVersion>;
14
35
  export declare const AdministrativeArea: z.ZodObject<{
15
36
  id: z.core.$ZodBranded<z.ZodUUID, "UUID", "out">;
16
37
  name: z.ZodString;
17
38
  externalId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
18
39
  parentId: z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
19
- validUntil: z.ZodNullable<z.ZodISODateTime>;
40
+ status: z.ZodEnum<{
41
+ active: "active";
42
+ inactive: "inactive";
43
+ }>;
44
+ versions: z.ZodArray<z.ZodObject<{
45
+ versionId: z.core.$ZodBranded<z.ZodUUID, "UUID", "out">;
46
+ effectiveFrom: z.ZodISODate;
47
+ name: z.ZodString;
48
+ externalId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
49
+ status: z.ZodEnum<{
50
+ active: "active";
51
+ inactive: "inactive";
52
+ }>;
53
+ }, z.core.$strip>>;
20
54
  }, z.core.$strip>;
21
55
  export type AdministrativeArea = z.infer<typeof AdministrativeArea>;
22
56
  export declare const Location: z.ZodObject<{
@@ -24,10 +58,59 @@ export declare const Location: z.ZodObject<{
24
58
  name: z.ZodString;
25
59
  externalId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
26
60
  administrativeAreaId: z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
27
- validUntil: z.ZodNullable<z.ZodISODateTime>;
28
61
  locationType: z.ZodNullable<z.ZodString>;
62
+ status: z.ZodEnum<{
63
+ active: "active";
64
+ inactive: "inactive";
65
+ }>;
66
+ versions: z.ZodArray<z.ZodObject<{
67
+ versionId: z.core.$ZodBranded<z.ZodUUID, "UUID", "out">;
68
+ effectiveFrom: z.ZodISODate;
69
+ name: z.ZodString;
70
+ externalId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
71
+ status: z.ZodEnum<{
72
+ active: "active";
73
+ inactive: "inactive";
74
+ }>;
75
+ }, z.core.$strip>>;
29
76
  }, z.core.$strip>;
30
77
  export type Location = z.infer<typeof Location>;
78
+ /**
79
+ * Input payload for the locations `set` mutation. Carries only the seedable
80
+ * identity and hierarchy fields — version history is managed by the server.
81
+ */
82
+ export declare const SetLocationPayload: z.ZodObject<{
83
+ id: z.core.$ZodBranded<z.ZodUUID, "UUID", "out">;
84
+ name: z.ZodString;
85
+ externalId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
86
+ administrativeAreaId: z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
87
+ locationType: z.ZodNullable<z.ZodString>;
88
+ }, z.core.$strip>;
89
+ export type SetLocationPayload = z.infer<typeof SetLocationPayload>;
90
+ /**
91
+ * Input payload for the administrative areas `set` mutation. Carries only the
92
+ * seedable identity and hierarchy fields — version history is managed by the
93
+ * server.
94
+ */
95
+ export declare const SetAdministrativeAreaPayload: z.ZodObject<{
96
+ id: z.core.$ZodBranded<z.ZodUUID, "UUID", "out">;
97
+ name: z.ZodString;
98
+ externalId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
99
+ parentId: z.ZodNullable<z.core.$ZodBranded<z.ZodUUID, "UUID", "out">>;
100
+ }, z.core.$strip>;
101
+ export type SetAdministrativeAreaPayload = z.infer<typeof SetAdministrativeAreaPayload>;
102
+ /**
103
+ * Resolves the version in effect at the given anchor date.
104
+ *
105
+ * Returns the element with the greatest `effectiveFrom` that is less than or
106
+ * equal to `anchor`, falling back to the earliest element when the anchor
107
+ * precedes all versions. Assumes `versions` is sorted ascending by
108
+ * `effectiveFrom`. Both `effectiveFrom` and `anchor` are 'YYYY-MM-DD' strings,
109
+ * so plain string comparison is correct.
110
+ */
111
+ export declare function resolveVersion<T extends {
112
+ effectiveFrom: string;
113
+ }>(versions: T[], anchor: string): T;
31
114
  type WrapArrayPreserveNullish<V> = V extends readonly any[] ? V : NonNullable<V>[] | Extract<V, null | undefined>;
32
115
  /**
33
116
  * For type T, convert fields K to arrays. If field is string, convert to string[].
@@ -79,7 +162,14 @@ export declare function getAdministrativeAreaHierarchy(administrativeAreaId: str
79
162
  name: string;
80
163
  externalId?: string | null | undefined;
81
164
  parentId: (string & z.$brand<"UUID">) | null;
82
- validUntil: string | null;
165
+ status: "active" | "inactive";
166
+ versions: {
167
+ versionId: string & z.$brand<"UUID">;
168
+ effectiveFrom: string;
169
+ name: string;
170
+ externalId?: string | null | undefined;
171
+ status: "active" | "inactive";
172
+ }[];
83
173
  }[];
84
174
  /**
85
175
  * Resolves a location or administrative area UUID into a root-first hierarchy of UUIDs.
@@ -6,14 +6,28 @@ export declare const V2_DEFAULT_MOCK_LOCATIONS_MAP: Map<string & import("zod").$
6
6
  name: string;
7
7
  externalId?: string | null | undefined;
8
8
  administrativeAreaId: (string & import("zod").$brand<"UUID">) | null;
9
- validUntil: string | null;
10
9
  locationType: string | null;
10
+ status: "active" | "inactive";
11
+ versions: {
12
+ versionId: string & import("zod").$brand<"UUID">;
13
+ effectiveFrom: string;
14
+ name: string;
15
+ externalId?: string | null | undefined;
16
+ status: "active" | "inactive";
17
+ }[];
11
18
  }>;
12
19
  export declare const V2_DEFAULT_MOCK_ADMINISTRATIVE_AREAS_MAP: Map<string & import("zod").$brand<"UUID">, {
13
20
  id: string & import("zod").$brand<"UUID">;
14
21
  name: string;
15
22
  externalId?: string | null | undefined;
16
23
  parentId: (string & import("zod").$brand<"UUID">) | null;
17
- validUntil: string | null;
24
+ status: "active" | "inactive";
25
+ versions: {
26
+ versionId: string & import("zod").$brand<"UUID">;
27
+ effectiveFrom: string;
28
+ name: string;
29
+ externalId?: string | null | undefined;
30
+ status: "active" | "inactive";
31
+ }[];
18
32
  }>;
19
33
  //# sourceMappingURL=mocks.test.utils.d.ts.map
@@ -9,7 +9,7 @@ import { EventIndex } from './EventIndex';
9
9
  import { EventInput } from './EventInput';
10
10
  import { TranslationConfig } from './TranslationConfig';
11
11
  import { FieldConfig } from './FieldConfig';
12
- import { Location, AdministrativeArea } from './locations';
12
+ import { SetLocationPayload, SetAdministrativeAreaPayload } from './locations';
13
13
  import { WorkqueueConfig } from './WorkqueueConfig';
14
14
  import * as z from 'zod/v4';
15
15
  import { DocumentPath } from '../documents';
@@ -48,16 +48,16 @@ export declare function fieldConfigsToActionPayload(fields: FieldConfig[], rng:
48
48
  * Given hierarchy, ensures that related fields (e.g. location and administrative area) have valid values based on the hierarchy.
49
49
  */
50
50
  administrativeHierarchy?: {
51
- administrativeAreas: AdministrativeArea[];
52
- locations: Location[];
51
+ administrativeAreas: SetAdministrativeAreaPayload[];
52
+ locations: SetLocationPayload[];
53
53
  }): ActionUpdate;
54
54
  export declare function generateActionDeclarationInput(configuration: EventConfig, action: ActionType, rng: () => number, overrides?: ActionUpdate,
55
55
  /**
56
56
  * Given hierarchy, ensures that related fields (e.g. location and administrative area) have valid values based on the hierarchy.
57
57
  */
58
58
  administrativeHierarchy?: {
59
- administrativeAreas: AdministrativeArea[];
60
- locations: Location[];
59
+ administrativeAreas: SetAdministrativeAreaPayload[];
60
+ locations: SetLocationPayload[];
61
61
  }): ActionUpdate;
62
62
  export declare function generateActionDuplicateDeclarationInput(...args: Parameters<typeof generateActionDeclarationInput>): ReturnType<typeof generateActionDeclarationInput>;
63
63
  export declare function eventPayloadGenerator(rng: () => number, configuration?: EventConfig): {
@@ -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();
@@ -0,0 +1,11 @@
1
+ export declare const OLD_INVENTORY_DIR: string;
2
+ export declare const INVENTORY_FILE_NAME = "inventory.yml";
3
+ export declare function getEnvironmentDir(environment: string): string;
4
+ export declare function getEnvironmentInventoryPath(environment: string): string;
5
+ export declare function getOldInventoryPath(environment: string): string;
6
+ export declare function findOldInventoryFiles(): string[];
7
+ export declare function getEnvironmentNameFromOldInventoryPath(filePath: string): string;
8
+ export declare function hasOldInventoryLayout(): boolean;
9
+ export declare function assertNoOldInventoryLayout(): void;
10
+ export declare function hasEnvironmentInventory(environment: string): boolean;
11
+ //# sourceMappingURL=paths.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"paths.d.ts","sourceRoot":"","sources":["../../src/environment/paths.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,iBAAiB,QAI7B,CAAA;AAED,eAAO,MAAM,mBAAmB,kBAAkB,CAAA;AAElD,wBAAgB,iBAAiB,CAAC,WAAW,EAAE,MAAM,UAEpD;AAED,wBAAgB,2BAA2B,CAAC,WAAW,EAAE,MAAM,UAE9D;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,UAEtD;AAED,wBAAgB,qBAAqB,aAEpC;AAED,wBAAgB,sCAAsC,CAAC,QAAQ,EAAE,MAAM,UAEtE;AAED,wBAAgB,qBAAqB,YAEpC;AAED,wBAAgB,0BAA0B,SAWzC;AAED,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,MAAM,WAE1D"}
@@ -0,0 +1,89 @@
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.getEnvironmentDir = getEnvironmentDir;
48
+ exports.getEnvironmentInventoryPath = getEnvironmentInventoryPath;
49
+ exports.getOldInventoryPath = getOldInventoryPath;
50
+ exports.findOldInventoryFiles = findOldInventoryFiles;
51
+ exports.getEnvironmentNameFromOldInventoryPath = getEnvironmentNameFromOldInventoryPath;
52
+ exports.hasOldInventoryLayout = hasOldInventoryLayout;
53
+ exports.assertNoOldInventoryLayout = assertNoOldInventoryLayout;
54
+ exports.hasEnvironmentInventory = hasEnvironmentInventory;
55
+ const fs_1 = require("fs");
56
+ const path_1 = require("path");
57
+ const glob = __importStar(require("glob"));
58
+ exports.OLD_INVENTORY_DIR = (0, path_1.join)('infrastructure', 'server-setup', 'inventory');
59
+ exports.INVENTORY_FILE_NAME = 'inventory.yml';
60
+ function getEnvironmentDir(environment) {
61
+ return (0, path_1.join)('environments', environment);
62
+ }
63
+ function getEnvironmentInventoryPath(environment) {
64
+ return (0, path_1.join)(getEnvironmentDir(environment), exports.INVENTORY_FILE_NAME);
65
+ }
66
+ function getOldInventoryPath(environment) {
67
+ return (0, path_1.join)(exports.OLD_INVENTORY_DIR, `${environment}.yml`);
68
+ }
69
+ function findOldInventoryFiles() {
70
+ return glob.sync((0, path_1.join)(exports.OLD_INVENTORY_DIR, '*.yml')).sort();
71
+ }
72
+ function getEnvironmentNameFromOldInventoryPath(filePath) {
73
+ return (0, path_1.basename)(filePath, '.yml');
74
+ }
75
+ function hasOldInventoryLayout() {
76
+ return findOldInventoryFiles().length > 0;
77
+ }
78
+ function assertNoOldInventoryLayout() {
79
+ if (!hasOldInventoryLayout()) {
80
+ return;
81
+ }
82
+ throw new Error([
83
+ `Old inventory layout detected at ${exports.OLD_INVENTORY_DIR}.`,
84
+ 'Please run `yarn environment:upgrade` before running `yarn environment:init`.'
85
+ ].join(' '));
86
+ }
87
+ function hasEnvironmentInventory(environment) {
88
+ return (0, fs_1.existsSync)(getEnvironmentInventoryPath(environment));
89
+ }
@@ -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 = [];
@@ -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":"AAiHA,wBAAsB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC,CAgDhE"}
@@ -60,12 +60,13 @@ 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");
63
64
  function extractInfrastructureNames() {
64
65
  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'));
66
+ const files = glob.sync((0, path_1.join)('environments', '*', paths_1.INVENTORY_FILE_NAME));
67
+ const infraEnvironments = files.map((file) => (0, path_1.basename)((0, path_1.dirname)(file)));
67
68
  if (infraEnvironments.length === 0) {
68
- console.log('⚠️ Warning: No environment directories found in infrastructure/server-setup/inventory/');
69
+ console.log(`⚠️ Warning: No environment inventory files found at environments/*/${paths_1.INVENTORY_FILE_NAME}`);
69
70
  return [];
70
71
  }
71
72
  (0, logger_1.log)('🔍 Found infrastructure configurations:', infraEnvironments.join(', '));
@@ -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,kBAW7C"}
@@ -0,0 +1,80 @@
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
+ return;
77
+ }
78
+ (0, logger_1.success)('\n✅ Environment layout already uses the current structure.');
79
+ });
80
+ }
@@ -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:',