@opencrvs/toolkit 2.1.1-rc.52250d8 → 2.1.1

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.
@@ -130,11 +130,5 @@ export declare const derivedVariables: readonly [{
130
130
  readonly valueType: 'VARIABLE';
131
131
  readonly type: 'disabled';
132
132
  readonly scope: 'ENVIRONMENT';
133
- }, {
134
- readonly name: 'TWO_FA_ENABLED';
135
- readonly valueLabel: 'TWO_FA_ENABLED';
136
- readonly valueType: 'VARIABLE';
137
- readonly type: 'disabled';
138
- readonly scope: 'ENVIRONMENT';
139
133
  }];
140
134
  //# sourceMappingURL=derived-variables.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"derived-variables.d.ts","sourceRoot":"","sources":["../../src/environment/derived-variables.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"derived-variables.d.ts","sourceRoot":"","sources":["../../src/environment/derived-variables.ts"],"names":[],"mappings":"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"}
@@ -165,12 +165,5 @@ exports.derivedVariables = [
165
165
  valueType: 'VARIABLE',
166
166
  type: 'disabled',
167
167
  scope: 'ENVIRONMENT'
168
- },
169
- {
170
- name: 'TWO_FA_ENABLED',
171
- valueLabel: 'TWO_FA_ENABLED',
172
- valueType: 'VARIABLE',
173
- type: 'disabled',
174
- scope: 'ENVIRONMENT'
175
- },
168
+ }
176
169
  ];
@@ -138,7 +138,7 @@ export declare const diskQuestions: {
138
138
  type: 'text';
139
139
  message: string;
140
140
  valueType: 'VARIABLE';
141
- validate: (value: string) => "Enter a size in gigabytes, e.g. 200g" | true;
141
+ validate: typeof notEmpty;
142
142
  valueLabel: string;
143
143
  initial: string;
144
144
  scope: 'ENVIRONMENT';
@@ -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;;;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;;eAOD,UAAU;sBACH,MAAM;;;WAIjB,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"}
@@ -201,7 +201,7 @@ exports.infrastructureQuestions = [
201
201
  valueLabel: 'KUBE_API_ALLOWED_CIDRS',
202
202
  initial: process.env.KUBE_API_ALLOWED_CIDRS || '',
203
203
  scope: 'ENVIRONMENT'
204
- }
204
+ },
205
205
  ];
206
206
  exports.staticSSLCertQuestions = [
207
207
  {
@@ -270,14 +270,11 @@ exports.diskQuestions = [
270
270
  {
271
271
  name: 'diskSpace',
272
272
  type: 'text',
273
- message: [
274
- 'How much disk space should be reserved for OpenCRVS data on each node? (e.g. 200g)',
275
- 'A fixed-size encrypted volume of this size is created on every node and cannot be resized later.',
276
- kleur_1.default.red('DO NOT USE ALL DISK SPACE FOR OPENCRVS!'),
277
- 'Each node needs this much free space on its root partition, plus 50g or 10% of this size, whichever is larger.'
278
- ].join('\n'),
273
+ message: `What is the amount of diskspace that should be dedicated to OpenCRVS data and will become the size of an encrypted cryptfs data directory.
274
+ \n${kleur_1.default.red('DO NOT USE ALL DISKSPACE FOR OPENCRVS!')}
275
+ \nLeave at least 50g available for OS use.`,
279
276
  valueType: 'VARIABLE',
280
- validate: (value) => /^\d+g$/i.test(value.trim()) || 'Enter a size in gigabytes, e.g. 200g',
277
+ validate: notEmpty,
281
278
  valueLabel: 'DISK_SPACE',
282
279
  initial: process.env.DISK_SPACE || '200g',
283
280
  scope: 'ENVIRONMENT'
@@ -1 +1 @@
1
- {"version":3,"file":"setup-environment.d.ts","sourceRoot":"","sources":["../../src/environment/setup-environment.ts"],"names":[],"mappings":"AAwSA,wBAAsB,mBAAmB,kBA+nCxC"}
1
+ {"version":3,"file":"setup-environment.d.ts","sourceRoot":"","sources":["../../src/environment/setup-environment.ts"],"names":[],"mappings":"AAwSA,wBAAsB,mBAAmB,kBAgnCxC"}
@@ -239,6 +239,16 @@ function runSetupEnvironment() {
239
239
  ]
240
240
  });
241
241
  }
242
+ (0, logger_1.log)('\n', kleur_1.default.bold().underline('Two-factor authentication (2FA)'));
243
+ const two_fa_enabled = yield confirm({
244
+ message: 'Enable two-factor authentication (2FA)? This should be enabled for any environment that hosts PII data.',
245
+ default: process.env.TWO_FA_ENABLED
246
+ ? process.env.TWO_FA_ENABLED === 'true'
247
+ : environment_type === 'production'
248
+ });
249
+ if (!two_fa_enabled && ['production', 'staging'].includes(environment_type)) {
250
+ (0, logger_1.warn)('2FA is disabled on a production-like environment. Logins will accept the fixed test code 000000, exposing real citizen data. Only do this if you know what you are doing.');
251
+ }
242
252
  const environment_exists = existingEnvironments
243
253
  .map((e) => e.trim())
244
254
  .includes(environment);
@@ -267,18 +277,6 @@ function runSetupEnvironment() {
267
277
  .bold('WARNING! You are setting up a production environment.\n Make sure you have read the deployment guide carefully before proceeding.\n'));
268
278
  yield promptAndStoreAnswer(questions_1.githubOtherQuestions, existingValues);
269
279
  }
270
- (0, logger_1.log)('\n', kleur_1.default.bold().underline('Two-factor authentication (2FA)'));
271
- const existingTwoFaEnabled = (0, utils_1.findExistingValue)('TWO_FA_ENABLED', 'VARIABLE', 'ENVIRONMENT', existingValues);
272
- const twoFaDefault = process.env.TWO_FA_ENABLED || (existingTwoFaEnabled === null || existingTwoFaEnabled === void 0 ? void 0 : existingTwoFaEnabled.value);
273
- const two_fa_enabled = yield confirm({
274
- message: 'Enable two-factor authentication (2FA)? This should be enabled for any environment that hosts PII data.',
275
- default: twoFaDefault
276
- ? twoFaDefault === 'true'
277
- : environment_type === 'production'
278
- });
279
- if (!two_fa_enabled && ['production', 'staging'].includes(environment_type)) {
280
- (0, logger_1.warn)('2FA is disabled on a production-like environment. Logins will accept the fixed test code 000000, exposing real citizen data. Only do this if you know what you are doing.');
281
- }
282
280
  (0, logger_1.log)('\n', kleur_1.default.bold().underline('Docker Hub'));
283
281
  yield promptAndStoreAnswer(questions_1.dockerhubQuestions, existingValues);
284
282
  (0, logger_1.log)('\n', kleur_1.default.bold().underline('Kubernetes & Runtime'));
@@ -470,14 +468,6 @@ function runSetupEnvironment() {
470
468
  value: findExistingOrDefine('NOTIFICATION_TRANSPORT', 'VARIABLE', 'ENVIRONMENT', 'email'),
471
469
  scope: 'ENVIRONMENT'
472
470
  });
473
- derivedUpdates.push({
474
- name: 'TWO_FA_ENABLED',
475
- type: 'VARIABLE',
476
- didExist: existingTwoFaEnabled,
477
- // Always stored, so the next run defaults to the current answer
478
- value: two_fa_enabled ? 'true' : 'false',
479
- scope: 'ENVIRONMENT'
480
- });
481
471
  derivedUpdates.push(...ssl_answers);
482
472
  if (configureBackup) {
483
473
  derivedUpdates.push({
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.1/index.ts"],"names":[],"mappings":"AAqBA;;;GAGG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBAcpD"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.1/index.ts"],"names":[],"mappings":"AAoBA;;;GAGG;AACH,wBAAsB,UAAU,CAAC,WAAW,EAAE,OAAO,iBAYpD"}
@@ -257,20 +257,20 @@ function idOf(line) {
257
257
  const comma = line.indexOf(",");
258
258
  return comma === -1 ? line : line.slice(0, comma);
259
259
  }
260
- function readCsvFile(path11) {
261
- if (!(0, import_fs.existsSync)(path11)) {
260
+ function readCsvFile(path10) {
261
+ if (!(0, import_fs.existsSync)(path10)) {
262
262
  return void 0;
263
263
  }
264
- const contents = (0, import_fs.readFileSync)(path11, "utf8");
264
+ const contents = (0, import_fs.readFileSync)(path10, "utf8");
265
265
  const newline = contents.includes("\r\n") ? "\r\n" : "\n";
266
266
  const trailingNewline = /\r?\n$/.test(contents);
267
267
  const lines = contents.replace(/\r?\n$/, "").split(/\r?\n/);
268
268
  const body = lines.slice(1).filter((line) => line !== "");
269
269
  return { header: lines[0], body, newline, trailingNewline };
270
270
  }
271
- function writeCsvFile(path11, file) {
271
+ function writeCsvFile(path10, file) {
272
272
  (0, import_fs.writeFileSync)(
273
- path11,
273
+ path10,
274
274
  [file.header, ...file.body].join(file.newline) + (file.trailingNewline ? file.newline : "")
275
275
  );
276
276
  }
@@ -1911,71 +1911,9 @@ async function main7() {
1911
1911
  }
1912
1912
  }
1913
1913
 
1914
- // src/migrations/v2.1/remove-typings-from-dockerfile.ts
1915
- var import_fs8 = require("fs");
1916
- var import_path9 = __toESM(require("path"));
1917
- var DOCKERFILE = "Dockerfile";
1918
- var TYPINGS_PATH = /^(?:\.\/)?typings(?:\/.*)?$/;
1919
- var continues = (line) => !/^\s*#/.test(line) && /\\[ \t]*\r?\n?$/.test(line);
1920
- function contextSources(line, continued) {
1921
- const [instruction, ...args] = line.split(/[\s"',[\]]+/).filter(Boolean);
1922
- if (!/^(?:COPY|ADD)$/i.test(instruction) || args.some((arg) => arg.startsWith("--from"))) {
1923
- return [];
1924
- }
1925
- const paths = args.filter((arg) => arg !== "\\" && !arg.startsWith("--"));
1926
- return continued ? paths : paths.slice(0, -1);
1927
- }
1928
- function removeTypingsCopy(dockerfile) {
1929
- const kept = [];
1930
- const removed = [];
1931
- const unresolved = [];
1932
- let previousCarriesOn = false;
1933
- const lines = dockerfile.match(/[^\n]*\n|[^\n]+$/g) ?? [];
1934
- for (const line of lines) {
1935
- const startsInstruction = !previousCarriesOn;
1936
- const carriesOn = continues(line);
1937
- previousCarriesOn = carriesOn;
1938
- const sources = startsInstruction ? contextSources(line, carriesOn) : [];
1939
- if (!sources.some((source) => TYPINGS_PATH.test(source))) {
1940
- kept.push(line);
1941
- } else if (sources.length === 1 && !carriesOn) {
1942
- removed.push(line.trim());
1943
- } else {
1944
- kept.push(line);
1945
- unresolved.push(line.trim());
1946
- }
1947
- }
1948
- return { contents: kept.join(""), removed, unresolved };
1949
- }
1950
- function removeTypingsFromDockerfile(cwd) {
1951
- const dockerfilePath = import_path9.default.join(cwd, DOCKERFILE);
1952
- if (!(0, import_fs8.existsSync)(dockerfilePath)) return;
1953
- const { contents, removed, unresolved } = removeTypingsCopy(
1954
- (0, import_fs8.readFileSync)(dockerfilePath, "utf8")
1955
- );
1956
- if (removed.length === 0 && unresolved.length === 0) return;
1957
- console.log("\nUpdating the Dockerfile...\n");
1958
- if (removed.length > 0) {
1959
- (0, import_fs8.writeFileSync)(dockerfilePath, contents);
1960
- }
1961
- for (const instruction of removed) {
1962
- console.log(
1963
- ` \u2713 ${DOCKERFILE}: removed '${instruction}', the Tiltfile no longer sends typings/ to the image build`
1964
- );
1965
- }
1966
- for (const instruction of unresolved) {
1967
- console.warn(
1968
- ` \u26A0\uFE0F ${DOCKERFILE} still copies from typings/ ('${instruction}'), which the Tiltfile no longer sends to the image build; remove it by hand`
1969
- );
1970
- }
1971
- }
1972
- async function main8() {
1973
- removeTypingsFromDockerfile(process.cwd());
1974
- }
1975
-
1976
1914
  // src/migrations/v2.1/rename-trigger-paths.ts
1977
1915
  var import_ts_morph5 = require("ts-morph");
1978
- var import_path10 = __toESM(require("path"));
1916
+ var import_path9 = __toESM(require("path"));
1979
1917
  var PATH_PREFIX_RENAMES = {
1980
1918
  "/triggers/user/": "/trigger/user/",
1981
1919
  "/triggers/system/": "/trigger/system/"
@@ -2033,7 +1971,7 @@ function processFile2(filePath, project) {
2033
1971
  const sourceFile = project.getSourceFile(filePath);
2034
1972
  if (!sourceFile) return 0;
2035
1973
  let renamedCount = 0;
2036
- const relPath = import_path10.default.relative(process.cwd(), filePath);
1974
+ const relPath = import_path9.default.relative(process.cwd(), filePath);
2037
1975
  const candidates = sourceFile.getDescendantsOfKind(
2038
1976
  import_ts_morph5.SyntaxKind.ObjectLiteralExpression
2039
1977
  );
@@ -2050,7 +1988,7 @@ function processFile2(filePath, project) {
2050
1988
  function warnAboutStalePaths(sourceFiles) {
2051
1989
  const stale = [];
2052
1990
  for (const sourceFile of sourceFiles) {
2053
- const relPath = import_path10.default.relative(process.cwd(), sourceFile.getFilePath());
1991
+ const relPath = import_path9.default.relative(process.cwd(), sourceFile.getFilePath());
2054
1992
  const lines = sourceFile.getFullText().split("\n");
2055
1993
  lines.forEach((line, index) => {
2056
1994
  if (line.includes(STALE_PREFIX)) {
@@ -2065,8 +2003,8 @@ WARNING: ${stale.length} remaining '${STALE_PREFIX}' reference(s) need to be ren
2065
2003
  );
2066
2004
  console.log(stale.join("\n"));
2067
2005
  }
2068
- async function main9() {
2069
- const srcDir = import_path10.default.join(process.cwd(), "src");
2006
+ async function main8() {
2007
+ const srcDir = import_path9.default.join(process.cwd(), "src");
2070
2008
  console.log(`Scanning for Hapi route configs in: ${srcDir}
2071
2009
  `);
2072
2010
  console.log("Active path renames:");
@@ -2075,7 +2013,7 @@ async function main9() {
2075
2013
  }
2076
2014
  console.log();
2077
2015
  const project = new import_ts_morph5.Project({
2078
- tsConfigFilePath: import_path10.default.resolve(srcDir, "../tsconfig.json"),
2016
+ tsConfigFilePath: import_path9.default.resolve(srcDir, "../tsconfig.json"),
2079
2017
  skipAddingFilesFromTsConfig: false
2080
2018
  });
2081
2019
  const sourceFiles = project.getSourceFiles().filter((sf) => {
@@ -2102,7 +2040,7 @@ Saving ${modifiedFiles.length} modified file(s)...`);
2102
2040
  for (const filePath of modifiedFiles) {
2103
2041
  const sourceFile = project.getSourceFileOrThrow(filePath);
2104
2042
  await sourceFile.save();
2105
- console.log(` Saved: ${import_path10.default.relative(process.cwd(), filePath)}`);
2043
+ console.log(` Saved: ${import_path9.default.relative(process.cwd(), filePath)}`);
2106
2044
  }
2107
2045
  console.log(`
2108
2046
  Done. Renamed ${totalRenamed} route path(s).`);
@@ -2111,21 +2049,21 @@ Done. Renamed ${totalRenamed} route path(s).`);
2111
2049
  }
2112
2050
 
2113
2051
  // src/migrations/v2.1/upgrade-tilt.ts
2114
- var import_fs9 = require("fs");
2115
- var import_path11 = __toESM(require("path"));
2052
+ var import_fs8 = require("fs");
2053
+ var import_path10 = __toESM(require("path"));
2116
2054
  var COUNTRY_OWNED_DIR = "tilt/helm/";
2117
2055
  var CHARTS_CHECKOUT_DIR = ".opencrvs-core-charts";
2118
2056
  var IMAGE_NAME_PATTERN = /^countryconfig_image_name\s*=\s*(["'])(.*?)\1/m;
2119
2057
  function writeIfChanged(cwd, relativePath, contents, mode) {
2120
- const target = import_path11.default.join(cwd, relativePath);
2121
- const existed = (0, import_fs9.existsSync)(target);
2122
- if (existed && (0, import_fs9.readFileSync)(target, "utf8") === contents) {
2058
+ const target = import_path10.default.join(cwd, relativePath);
2059
+ const existed = (0, import_fs8.existsSync)(target);
2060
+ if (existed && (0, import_fs8.readFileSync)(target, "utf8") === contents) {
2123
2061
  return "unchanged";
2124
2062
  }
2125
- (0, import_fs9.mkdirSync)(import_path11.default.dirname(target), { recursive: true });
2126
- (0, import_fs9.writeFileSync)(target, contents);
2063
+ (0, import_fs8.mkdirSync)(import_path10.default.dirname(target), { recursive: true });
2064
+ (0, import_fs8.writeFileSync)(target, contents);
2127
2065
  if (mode !== void 0) {
2128
- (0, import_fs9.chmodSync)(target, mode & 511);
2066
+ (0, import_fs8.chmodSync)(target, mode & 511);
2129
2067
  }
2130
2068
  return existed ? "updated" : "created";
2131
2069
  }
@@ -2155,29 +2093,29 @@ function withIgnoreEntry(contents, line) {
2155
2093
  `;
2156
2094
  }
2157
2095
  function ensureIgnored(cwd, file, line) {
2158
- const target = import_path11.default.join(cwd, file);
2159
- const contents = (0, import_fs9.existsSync)(target) ? (0, import_fs9.readFileSync)(target, "utf8") : "";
2096
+ const target = import_path10.default.join(cwd, file);
2097
+ const contents = (0, import_fs8.existsSync)(target) ? (0, import_fs8.readFileSync)(target, "utf8") : "";
2160
2098
  report(file, writeIfChanged(cwd, file, withIgnoreEntry(contents, line)));
2161
2099
  }
2162
2100
  function upgradeTilt(cwd, templateDir) {
2163
- const tiltfilePath = import_path11.default.join(cwd, "Tiltfile");
2164
- const existingTiltfile = (0, import_fs9.existsSync)(tiltfilePath) ? (0, import_fs9.readFileSync)(tiltfilePath, "utf8") : void 0;
2101
+ const tiltfilePath = import_path10.default.join(cwd, "Tiltfile");
2102
+ const existingTiltfile = (0, import_fs8.existsSync)(tiltfilePath) ? (0, import_fs8.readFileSync)(tiltfilePath, "utf8") : void 0;
2165
2103
  report(
2166
2104
  "Tiltfile",
2167
2105
  writeIfChanged(
2168
2106
  cwd,
2169
2107
  "Tiltfile",
2170
2108
  renderTiltfile(
2171
- (0, import_fs9.readFileSync)(import_path11.default.join(templateDir, "Tiltfile"), "utf8"),
2109
+ (0, import_fs8.readFileSync)(import_path10.default.join(templateDir, "Tiltfile"), "utf8"),
2172
2110
  existingTiltfile
2173
2111
  )
2174
2112
  )
2175
2113
  );
2176
2114
  const templateFiles = listFiles(templateDir, "tilt");
2177
2115
  for (const file of templateFiles) {
2178
- const source = import_path11.default.join(templateDir, file);
2116
+ const source = import_path10.default.join(templateDir, file);
2179
2117
  const countryOwned = file.startsWith(COUNTRY_OWNED_DIR);
2180
- if (countryOwned && (0, import_fs9.existsSync)(import_path11.default.join(cwd, file))) {
2118
+ if (countryOwned && (0, import_fs8.existsSync)(import_path10.default.join(cwd, file))) {
2181
2119
  continue;
2182
2120
  }
2183
2121
  report(
@@ -2185,8 +2123,8 @@ function upgradeTilt(cwd, templateDir) {
2185
2123
  writeIfChanged(
2186
2124
  cwd,
2187
2125
  file,
2188
- (0, import_fs9.readFileSync)(source, "utf8"),
2189
- (0, import_fs9.statSync)(source).mode
2126
+ (0, import_fs8.readFileSync)(source, "utf8"),
2127
+ (0, import_fs8.statSync)(source).mode
2190
2128
  )
2191
2129
  );
2192
2130
  }
@@ -2206,7 +2144,7 @@ function upgradeTilt(cwd, templateDir) {
2206
2144
  );
2207
2145
  }
2208
2146
  }
2209
- async function main10() {
2147
+ async function main9() {
2210
2148
  console.log("Upgrading the local Tilt setup...\n");
2211
2149
  upgradeTilt(process.cwd(), findTemplateDir());
2212
2150
  console.log(
@@ -2217,14 +2155,13 @@ async function main10() {
2217
2155
  // src/migrations/v2.1/index.ts
2218
2156
  async function runUpgrade(dockerSwarm) {
2219
2157
  await main();
2220
- await main9();
2158
+ await main8();
2221
2159
  await main2();
2222
2160
  await main3();
2223
2161
  await main7();
2224
2162
  await main6();
2225
2163
  await main5(dockerSwarm);
2226
- await main10();
2227
- await main8();
2164
+ await main9();
2228
2165
  await main4();
2229
2166
  }
2230
2167
  // Annotate the CommonJS export names for ESM import in node:
Binary file
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opencrvs/toolkit",
3
- "version": "2.1.1-rc.52250d8",
3
+ "version": "2.1.1",
4
4
  "description": "OpenCRVS toolkit for building country configurations",
5
5
  "license": "MPL-2.0",
6
6
  "bin": {