@opencrvs/toolkit 2.1.1-rc.52250d8 → 2.2.0-rc.3af310b
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.
- package/build.sh +2 -12
- package/create-countryconfig/package.json +1 -1
- package/dist/application-config/index.js +36 -4
- package/dist/authentication/index.js +14 -2
- package/dist/cli.js +833 -2019
- package/dist/commons/api/router.d.ts +1374 -71
- package/dist/commons/conditionals/conditionals.d.ts +3 -3
- package/dist/commons/events/ActionConfig.d.ts +146 -20
- package/dist/commons/events/ActionDocument.d.ts +88 -0
- package/dist/commons/events/ActionInput.d.ts +52 -0
- package/dist/commons/events/ActionType.d.ts +11 -1
- package/dist/commons/events/AdvancedSearchConfig.d.ts +12 -0
- package/dist/commons/events/AuditLog.d.ts +4 -0
- package/dist/commons/events/CountryConfigQueryInput.d.ts +192 -18
- package/dist/commons/events/Draft.d.ts +2 -0
- package/dist/commons/events/EventConfig.d.ts +36 -6
- package/dist/commons/events/EventDocument.d.ts +88 -0
- package/dist/commons/events/EventIndex.d.ts +41 -4
- package/dist/commons/events/EventMetadata.d.ts +23 -1
- package/dist/commons/events/EventStatus.d.ts +1 -0
- package/dist/commons/events/FieldConfig.d.ts +10 -0
- package/dist/commons/events/Flag.d.ts +0 -6
- package/dist/commons/events/WorkqueueConfig.d.ts +224 -33
- package/dist/commons/events/eventConfigValidation.d.ts +26 -1
- package/dist/commons/events/notificationFormFallback.d.ts +10 -0
- package/dist/commons/events/scopes.d.ts +2 -0
- package/dist/commons/events/state/flags.d.ts +1 -1
- package/dist/commons/events/state/index.d.ts +10 -2
- package/dist/commons/events/state/utils.d.ts +11 -1
- package/dist/commons/events/test.utils.d.ts +31 -1
- package/dist/commons/events/utils.d.ts +53 -20
- package/dist/conditionals/index.js +14 -2
- package/dist/environment/derived-variables.d.ts +6 -0
- package/dist/environment/derived-variables.d.ts.map +1 -1
- package/dist/environment/derived-variables.js +7 -0
- package/dist/environment/dockerhub.d.ts +15 -0
- package/dist/environment/dockerhub.d.ts.map +1 -0
- package/dist/environment/dockerhub.js +104 -0
- package/dist/environment/questions.d.ts +1 -1
- package/dist/environment/questions.d.ts.map +1 -1
- package/dist/environment/questions.js +4 -7
- package/dist/environment/setup-environment.d.ts.map +1 -1
- package/dist/environment/setup-environment.js +41 -2
- package/dist/environment/templates.d.ts.map +1 -1
- package/dist/events/index.js +461 -83
- package/dist/migrations/index.d.ts +9 -0
- package/dist/migrations/index.d.ts.map +1 -0
- package/dist/migrations/index.js +847 -0
- package/dist/migrations/move-declaration-to-declare-action.d.ts +38 -0
- package/dist/migrations/move-declaration-to-declare-action.d.ts.map +1 -0
- package/dist/migrations/move-declaration-to-declare-action.js +377 -0
- package/dist/migrations/{v2.1 → persistent}/add-translations.d.ts +7 -1
- package/dist/migrations/persistent/add-translations.d.ts.map +1 -0
- package/dist/migrations/{v2.1 → persistent}/add-translations.js +14 -12
- package/dist/migrations/persistent/check-upgrade-path.d.ts +36 -0
- package/dist/migrations/persistent/check-upgrade-path.d.ts.map +1 -0
- package/dist/migrations/persistent/check-upgrade-path.js +105 -0
- package/dist/migrations/persistent/update-toolkit-dependency.d.ts +7 -0
- package/dist/migrations/persistent/update-toolkit-dependency.d.ts.map +1 -0
- package/dist/migrations/persistent/update-toolkit-dependency.js +77 -0
- package/dist/migrations/read-declaration-through-helper.d.ts +39 -0
- package/dist/migrations/read-declaration-through-helper.d.ts.map +1 -0
- package/dist/migrations/read-declaration-through-helper.js +257 -0
- package/dist/migrations/replace-incomplete-flag.d.ts +26 -0
- package/dist/migrations/replace-incomplete-flag.d.ts.map +1 -0
- package/dist/migrations/replace-incomplete-flag.js +126 -0
- package/dist/notification/index.js +401 -100
- package/dist/scopes/index.d.ts +29 -39
- package/dist/scopes/index.js +14 -2
- package/dist/templates/charts-values/dependencies/values.yaml +1 -1
- package/dist/templates/charts-values/opencrvs-services/values.yaml +1 -2
- package/dist/templates/charts-values/traefik/values.yaml +4 -3
- package/opencrvs-toolkit-2.2.0-rc.3af310b.tgz +0 -0
- package/package.json +1 -1
- package/tsconfig.build.tsbuildinfo +1 -1
- package/dist/migrations/v2.1/add-explicit-correction-flags.d.ts +0 -3
- package/dist/migrations/v2.1/add-explicit-correction-flags.d.ts.map +0 -1
- package/dist/migrations/v2.1/add-explicit-correction-flags.js +0 -234
- package/dist/migrations/v2.1/add-recovery-link-notifications.d.ts +0 -3
- package/dist/migrations/v2.1/add-recovery-link-notifications.d.ts.map +0 -1
- package/dist/migrations/v2.1/add-recovery-link-notifications.js +0 -511
- package/dist/migrations/v2.1/add-translations.d.ts.map +0 -1
- package/dist/migrations/v2.1/enable-telemetry.d.ts +0 -3
- package/dist/migrations/v2.1/enable-telemetry.d.ts.map +0 -1
- package/dist/migrations/v2.1/enable-telemetry.js +0 -455
- package/dist/migrations/v2.1/index.d.ts +0 -6
- package/dist/migrations/v2.1/index.d.ts.map +0 -1
- package/dist/migrations/v2.1/index.js +0 -2233
- package/dist/migrations/v2.1/migrate-infrastructure-to-assets.d.ts +0 -14
- package/dist/migrations/v2.1/migrate-infrastructure-to-assets.d.ts.map +0 -1
- package/dist/migrations/v2.1/migrate-infrastructure-to-assets.js +0 -348
- package/dist/migrations/v2.1/remove-metabase-package-installs.d.ts +0 -2
- package/dist/migrations/v2.1/remove-metabase-package-installs.d.ts.map +0 -1
- package/dist/migrations/v2.1/remove-metabase-package-installs.js +0 -161
- package/dist/migrations/v2.1/remove-sentry.d.ts +0 -3
- package/dist/migrations/v2.1/remove-sentry.d.ts.map +0 -1
- package/dist/migrations/v2.1/remove-sentry.js +0 -354
- package/dist/migrations/v2.1/remove-typings-from-dockerfile.d.ts +0 -3
- package/dist/migrations/v2.1/remove-typings-from-dockerfile.d.ts.map +0 -1
- package/dist/migrations/v2.1/remove-typings-from-dockerfile.js +0 -121
- package/dist/migrations/v2.1/rename-trigger-paths.d.ts +0 -3
- package/dist/migrations/v2.1/rename-trigger-paths.d.ts.map +0 -1
- package/dist/migrations/v2.1/rename-trigger-paths.js +0 -216
- package/dist/migrations/v2.1/template-files.d.ts +0 -8
- package/dist/migrations/v2.1/template-files.d.ts.map +0 -1
- package/dist/migrations/v2.1/template-files.js +0 -49
- package/dist/migrations/v2.1/upgrade-tilt.d.ts +0 -8
- package/dist/migrations/v2.1/upgrade-tilt.d.ts.map +0 -1
- package/dist/migrations/v2.1/upgrade-tilt.js +0 -139
- package/dist/templates/countryconfig-template/.tiltignore +0 -1
- package/dist/templates/countryconfig-template/Dockerfile.assets +0 -7
- package/dist/templates/countryconfig-template/Tiltfile +0 -112
- package/dist/templates/countryconfig-template/assets/README.md +0 -1
- package/dist/templates/countryconfig-template/assets/clear-all-data-dev.sh +0 -61
- package/dist/templates/countryconfig-template/assets/deployment/deploy.sh +0 -455
- package/dist/templates/countryconfig-template/assets/deployment/reindex.sh +0 -168
- package/dist/templates/countryconfig-template/assets/deployment/validate-required-variables-in-compose-files.ts +0 -67
- package/dist/templates/countryconfig-template/assets/elasticsearch/reindex.sh +0 -168
- package/dist/templates/countryconfig-template/assets/metabase/README.md +0 -34
- package/dist/templates/countryconfig-template/assets/metabase/environment-configuration.sql +0 -36
- package/dist/templates/countryconfig-template/assets/metabase/initialize-database.sh +0 -46
- package/dist/templates/countryconfig-template/assets/metabase/metabase.init.db.sql +0 -27737
- package/dist/templates/countryconfig-template/assets/metabase/open-shell.sh +0 -21
- package/dist/templates/countryconfig-template/assets/metabase/package.json +0 -13
- package/dist/templates/countryconfig-template/assets/metabase/run-dev.sh +0 -108
- package/dist/templates/countryconfig-template/assets/metabase/run.sh +0 -120
- package/dist/templates/countryconfig-template/assets/metabase/update-database.sh +0 -40
- package/dist/templates/countryconfig-template/assets/postgres/setup-analytics.sh +0 -135
- package/dist/templates/countryconfig-template/assets/postgres/setup-reference-data.sh +0 -108
- package/dist/templates/countryconfig-template/tilt/clear-all-data.ps1 +0 -50
- package/dist/templates/countryconfig-template/tilt/clear-all-data.sh +0 -35
- package/dist/templates/countryconfig-template/tilt/common.tilt +0 -145
- package/dist/templates/countryconfig-template/tilt/examples/dependencies/values.yaml +0 -15
- package/dist/templates/countryconfig-template/tilt/examples/opencrvs-services/values.yaml +0 -56
- package/dist/templates/countryconfig-template/tilt/examples/traefik/values-minikube.yaml +0 -21
- package/dist/templates/countryconfig-template/tilt/examples/traefik/values.yaml +0 -38
- package/dist/templates/countryconfig-template/tilt/helm/dependencies/values.yaml +0 -17
- package/dist/templates/countryconfig-template/tilt/helm/opencrvs-services/values.yaml +0 -16
- package/dist/templates/countryconfig-template/tilt/lib.tilt +0 -95
- package/dist/templates/countryconfig-template/tilt/opencrvs.tilt +0 -136
- package/opencrvs-toolkit-2.1.1-rc.52250d8.tgz +0 -0
|
@@ -1,354 +0,0 @@
|
|
|
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.main = main;
|
|
26
|
-
/**
|
|
27
|
-
* Codemod: remove the Sentry wiring from a country config.
|
|
28
|
-
*
|
|
29
|
-
* Sentry is gone from OpenCRVS core: nothing reads `SENTRY_DSN` or
|
|
30
|
-
* `window.config.SENTRY` any more, and neither `ClientConfig` nor
|
|
31
|
-
* `LoginConfig` in `../commons` declares a `SENTRY` field. A v2.0
|
|
32
|
-
* country config that still sets it no longer compiles against the v2.1
|
|
33
|
-
* toolkit, so this step drops:
|
|
34
|
-
* - the `SENTRY` key from `src/client-config.ts`, `src/client-config.prod.ts`,
|
|
35
|
-
* `src/login-config.ts` and `src/login-config.prod.ts`,
|
|
36
|
-
* - `SENTRY_DSN` from `src/environment.ts` and `src/constants.ts`,
|
|
37
|
-
* - the `hapi-sentry` plugin registration and the `onRequest` scope
|
|
38
|
-
* extension from `src/index.ts`, along with their imports,
|
|
39
|
-
* - `SENTRY` from `IApplicationConfig` in `src/utils/index.ts`,
|
|
40
|
-
* - `hapi-sentry` and any `@sentry/*` package from `package.json`, and
|
|
41
|
-
* - `typings/hapi-sentry.d.ts`, the ambient declaration the untyped plugin
|
|
42
|
-
* needed.
|
|
43
|
-
*
|
|
44
|
-
* Any `SENTRY_DSN` left in the environment is simply ignored from here on.
|
|
45
|
-
* Anything already absent is left alone, and every step is independent — one
|
|
46
|
-
* that cannot find the structure it edits warns and lets the rest run.
|
|
47
|
-
*/
|
|
48
|
-
const fs_1 = require("fs");
|
|
49
|
-
const path_1 = __importDefault(require("path"));
|
|
50
|
-
const ts_morph_1 = require("ts-morph");
|
|
51
|
-
const CONFIG_FILES = [
|
|
52
|
-
'src/client-config.ts',
|
|
53
|
-
'src/client-config.prod.ts',
|
|
54
|
-
'src/login-config.ts',
|
|
55
|
-
'src/login-config.prod.ts'
|
|
56
|
-
];
|
|
57
|
-
const ENVIRONMENT_FILE = 'src/environment.ts';
|
|
58
|
-
const CONSTANTS_FILE = 'src/constants.ts';
|
|
59
|
-
const INDEX_FILE = 'src/index.ts';
|
|
60
|
-
const UTILS_FILE = 'src/utils/index.ts';
|
|
61
|
-
const PACKAGE_JSON_FILE = 'package.json';
|
|
62
|
-
const TYPINGS_FILE = 'typings/hapi-sentry.d.ts';
|
|
63
|
-
const SENTRY_PLUGIN = 'hapi-sentry';
|
|
64
|
-
const skipped = [];
|
|
65
|
-
function warnSkipped(message) {
|
|
66
|
-
skipped.push(message);
|
|
67
|
-
console.warn(` ⚠️ ${message}`);
|
|
68
|
-
}
|
|
69
|
-
// ─── Shared helpers ──────────────────────────────────────────────────────────
|
|
70
|
-
/**
|
|
71
|
-
* True when `name` appears in the file outside of import declarations, i.e.
|
|
72
|
-
* when something still uses what was imported under that name.
|
|
73
|
-
*/
|
|
74
|
-
function isReferenced(sourceFile, name) {
|
|
75
|
-
return sourceFile
|
|
76
|
-
.getDescendantsOfKind(ts_morph_1.SyntaxKind.Identifier)
|
|
77
|
-
.some((identifier) => identifier.getText() === name &&
|
|
78
|
-
!identifier.getFirstAncestorByKind(ts_morph_1.SyntaxKind.ImportDeclaration));
|
|
79
|
-
}
|
|
80
|
-
/** Drop an import declaration once nothing it brings in is used any more. */
|
|
81
|
-
function removeIfUnused(sourceFile, importDeclaration) {
|
|
82
|
-
var _a, _b;
|
|
83
|
-
const names = [
|
|
84
|
-
(_a = importDeclaration.getDefaultImport()) === null || _a === void 0 ? void 0 : _a.getText(),
|
|
85
|
-
(_b = importDeclaration.getNamespaceImport()) === null || _b === void 0 ? void 0 : _b.getText(),
|
|
86
|
-
...importDeclaration.getNamedImports().map((named) => named.getName())
|
|
87
|
-
].filter((name) => Boolean(name));
|
|
88
|
-
if (names.length > 0 &&
|
|
89
|
-
names.every((name) => !isReferenced(sourceFile, name))) {
|
|
90
|
-
importDeclaration.remove();
|
|
91
|
-
return true;
|
|
92
|
-
}
|
|
93
|
-
return false;
|
|
94
|
-
}
|
|
95
|
-
/**
|
|
96
|
-
* Remove the named import `name` from the declaration importing
|
|
97
|
-
* `moduleSpecifier`, dropping the whole declaration when nothing is left.
|
|
98
|
-
*/
|
|
99
|
-
function removeNamedImport(sourceFile, moduleSpecifier, name) {
|
|
100
|
-
const importDeclaration = sourceFile
|
|
101
|
-
.getImportDeclarations()
|
|
102
|
-
.find((declaration) => declaration.getModuleSpecifierValue() === moduleSpecifier);
|
|
103
|
-
if (!importDeclaration)
|
|
104
|
-
return false;
|
|
105
|
-
const named = importDeclaration
|
|
106
|
-
.getNamedImports()
|
|
107
|
-
.find((namedImport) => namedImport.getName() === name);
|
|
108
|
-
if (!named)
|
|
109
|
-
return false;
|
|
110
|
-
named.remove();
|
|
111
|
-
if (importDeclaration.getNamedImports().length === 0 &&
|
|
112
|
-
!importDeclaration.getDefaultImport() &&
|
|
113
|
-
!importDeclaration.getNamespaceImport()) {
|
|
114
|
-
importDeclaration.remove();
|
|
115
|
-
}
|
|
116
|
-
return true;
|
|
117
|
-
}
|
|
118
|
-
// ─── The four config files ───────────────────────────────────────────────────
|
|
119
|
-
/**
|
|
120
|
-
* Drop `SENTRY: ...` from `defineClientConfig` / `defineLoginConfig`. The prod
|
|
121
|
-
* login config reads `env.SENTRY_DSN` and has no other use for `env`, so the
|
|
122
|
-
* now-dangling `./environment` import goes with it.
|
|
123
|
-
*/
|
|
124
|
-
function removeSentryFromConfigs(project, cwd) {
|
|
125
|
-
var _a, _b;
|
|
126
|
-
for (const file of CONFIG_FILES) {
|
|
127
|
-
const sourceFile = project.addSourceFileAtPathIfExists(path_1.default.join(cwd, file));
|
|
128
|
-
if (!sourceFile)
|
|
129
|
-
continue;
|
|
130
|
-
const property = sourceFile
|
|
131
|
-
.getDescendantsOfKind(ts_morph_1.SyntaxKind.PropertyAssignment)
|
|
132
|
-
.find((assignment) => assignment.getName() === 'SENTRY');
|
|
133
|
-
if (!property)
|
|
134
|
-
continue;
|
|
135
|
-
// What the value read — `env` for `env.SENTRY_DSN ?? ''`, nothing for a
|
|
136
|
-
// literal. Those are the only imports removing the key can strand.
|
|
137
|
-
const usedNames = new Set(property
|
|
138
|
-
.getDescendantsOfKind(ts_morph_1.SyntaxKind.Identifier)
|
|
139
|
-
.map((identifier) => identifier.getText()));
|
|
140
|
-
property.remove();
|
|
141
|
-
for (const importDeclaration of [...sourceFile.getImportDeclarations()]) {
|
|
142
|
-
const imported = [
|
|
143
|
-
(_a = importDeclaration.getDefaultImport()) === null || _a === void 0 ? void 0 : _a.getText(),
|
|
144
|
-
(_b = importDeclaration.getNamespaceImport()) === null || _b === void 0 ? void 0 : _b.getText(),
|
|
145
|
-
...importDeclaration.getNamedImports().map((named) => named.getName())
|
|
146
|
-
].filter((name) => Boolean(name));
|
|
147
|
-
if (imported.some((name) => usedNames.has(name))) {
|
|
148
|
-
removeIfUnused(sourceFile, importDeclaration);
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
console.log(` ✓ ${file}: SENTRY`);
|
|
152
|
-
}
|
|
153
|
-
}
|
|
154
|
-
// ─── environment.ts / constants.ts ───────────────────────────────────────────
|
|
155
|
-
function removeEnvironmentVariable(project, cwd) {
|
|
156
|
-
var _a;
|
|
157
|
-
const sourceFile = project.addSourceFileAtPathIfExists(path_1.default.join(cwd, ENVIRONMENT_FILE));
|
|
158
|
-
if (!sourceFile)
|
|
159
|
-
return;
|
|
160
|
-
const options = (_a = sourceFile
|
|
161
|
-
.getDescendantsOfKind(ts_morph_1.SyntaxKind.CallExpression)
|
|
162
|
-
.find((call) => call.getExpression().getText() === 'cleanEnv')) === null || _a === void 0 ? void 0 : _a.getArguments()[1];
|
|
163
|
-
if (!options || !ts_morph_1.Node.isObjectLiteralExpression(options)) {
|
|
164
|
-
warnSkipped(`Could not find the cleanEnv(...) config object in ${ENVIRONMENT_FILE}; remove SENTRY_DSN by hand`);
|
|
165
|
-
return;
|
|
166
|
-
}
|
|
167
|
-
const property = options.getProperty('SENTRY_DSN');
|
|
168
|
-
if (!property)
|
|
169
|
-
return;
|
|
170
|
-
property.remove();
|
|
171
|
-
console.log(` ✓ ${ENVIRONMENT_FILE}: SENTRY_DSN`);
|
|
172
|
-
}
|
|
173
|
-
/**
|
|
174
|
-
* Drop the constant re-exporting the DSN. Matched by name and by initializer,
|
|
175
|
-
* so a country that renamed `SENTRY_DSN` but still reads `env.SENTRY_DSN` is
|
|
176
|
-
* cleaned up too.
|
|
177
|
-
*/
|
|
178
|
-
function removeConstant(project, cwd) {
|
|
179
|
-
const sourceFile = project.addSourceFileAtPathIfExists(path_1.default.join(cwd, CONSTANTS_FILE));
|
|
180
|
-
if (!sourceFile)
|
|
181
|
-
return;
|
|
182
|
-
for (const statement of [...sourceFile.getVariableStatements()]) {
|
|
183
|
-
const declarations = statement.getDeclarations();
|
|
184
|
-
const matching = declarations.filter((declaration) => { var _a; var _b; return declaration.getName() === 'SENTRY_DSN' ||
|
|
185
|
-
/\benv\.SENTRY_DSN\b/.test((_b = (_a = declaration.getInitializer()) === null || _a === void 0 ? void 0 : _a.getText()) !== null && _b !== void 0 ? _b : ''); });
|
|
186
|
-
if (matching.length === 0)
|
|
187
|
-
continue;
|
|
188
|
-
const names = matching.map((declaration) => declaration.getName());
|
|
189
|
-
if (matching.length === declarations.length) {
|
|
190
|
-
statement.remove();
|
|
191
|
-
}
|
|
192
|
-
else {
|
|
193
|
-
for (const declaration of matching) {
|
|
194
|
-
declaration.remove();
|
|
195
|
-
}
|
|
196
|
-
}
|
|
197
|
-
console.log(` ✓ ${CONSTANTS_FILE}: ${names.join(', ')}`);
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
// ─── index.ts ────────────────────────────────────────────────────────────────
|
|
201
|
-
/**
|
|
202
|
-
* Unregister the plugin and the request hook it fed:
|
|
203
|
-
* - `if (SENTRY_DSN) { plugins.push({ plugin: Sentry, ... }) }`
|
|
204
|
-
* - `server.ext({ type: 'onRequest', method(request: ... sentryScope ...) })`
|
|
205
|
-
* and then the imports both relied on.
|
|
206
|
-
*/
|
|
207
|
-
function unwireIndex(project, cwd) {
|
|
208
|
-
var _a, _b;
|
|
209
|
-
var _c, _d;
|
|
210
|
-
const sourceFile = project.addSourceFileAtPathIfExists(path_1.default.join(cwd, INDEX_FILE));
|
|
211
|
-
if (!sourceFile)
|
|
212
|
-
return;
|
|
213
|
-
const pluginImport = sourceFile
|
|
214
|
-
.getImportDeclarations()
|
|
215
|
-
.find((declaration) => declaration.getModuleSpecifierValue() === SENTRY_PLUGIN);
|
|
216
|
-
// `import * as Sentry from 'hapi-sentry'` in the template, but the local
|
|
217
|
-
// name is the country's to choose.
|
|
218
|
-
const pluginName = (_d = (_c = (_a = pluginImport === null || pluginImport === void 0 ? void 0 : pluginImport.getNamespaceImport()) === null || _a === void 0 ? void 0 : _a.getText()) !== null && _c !== void 0 ? _c : (_b = pluginImport === null || pluginImport === void 0 ? void 0 : pluginImport.getDefaultImport()) === null || _b === void 0 ? void 0 : _b.getText()) !== null && _d !== void 0 ? _d : 'Sentry';
|
|
219
|
-
const registration = sourceFile
|
|
220
|
-
.getDescendantsOfKind(ts_morph_1.SyntaxKind.IfStatement)
|
|
221
|
-
.find((statement) => /\bSENTRY_DSN\b/.test(statement.getExpression().getText()) &&
|
|
222
|
-
new RegExp(`\\bplugin:\\s*${pluginName}\\b`).test(statement.getText()));
|
|
223
|
-
if (registration) {
|
|
224
|
-
registration.remove();
|
|
225
|
-
console.log(` ✓ ${INDEX_FILE}: hapi-sentry plugin registration`);
|
|
226
|
-
}
|
|
227
|
-
else if (sourceFile.getText().includes(SENTRY_PLUGIN)) {
|
|
228
|
-
warnSkipped(`Could not find the hapi-sentry plugin registration in ${INDEX_FILE}; remove it by hand`);
|
|
229
|
-
}
|
|
230
|
-
const scopeExtension = sourceFile
|
|
231
|
-
.getDescendantsOfKind(ts_morph_1.SyntaxKind.ExpressionStatement)
|
|
232
|
-
.find((statement) => statement.getText().includes('sentryScope') &&
|
|
233
|
-
statement.getText().startsWith('server.ext'));
|
|
234
|
-
if (scopeExtension) {
|
|
235
|
-
scopeExtension.remove();
|
|
236
|
-
console.log(` ✓ ${INDEX_FILE}: onRequest Sentry scope extension`);
|
|
237
|
-
}
|
|
238
|
-
else if (sourceFile.getText().includes('sentryScope')) {
|
|
239
|
-
warnSkipped(`Found 'sentryScope' in ${INDEX_FILE} outside a server.ext(...) call; remove it by hand`);
|
|
240
|
-
}
|
|
241
|
-
if (pluginImport && removeIfUnused(sourceFile, pluginImport)) {
|
|
242
|
-
console.log(` ✓ ${INDEX_FILE}: import '${SENTRY_PLUGIN}'`);
|
|
243
|
-
}
|
|
244
|
-
// The DSN is imported from the constants module, whose specifier countries
|
|
245
|
-
// write either as a path alias or relatively.
|
|
246
|
-
if (!isReferenced(sourceFile, 'SENTRY_DSN')) {
|
|
247
|
-
for (const declaration of [...sourceFile.getImportDeclarations()]) {
|
|
248
|
-
const specifier = declaration.getModuleSpecifierValue();
|
|
249
|
-
if (removeNamedImport(sourceFile, specifier, 'SENTRY_DSN')) {
|
|
250
|
-
console.log(` ✓ ${INDEX_FILE}: import SENTRY_DSN from '${specifier}'`);
|
|
251
|
-
break;
|
|
252
|
-
}
|
|
253
|
-
}
|
|
254
|
-
}
|
|
255
|
-
}
|
|
256
|
-
// ─── utils/index.ts ──────────────────────────────────────────────────────────
|
|
257
|
-
/** Drop `SENTRY` from the country config's own `IApplicationConfig`. */
|
|
258
|
-
function removeApplicationConfigField(project, cwd) {
|
|
259
|
-
var _a;
|
|
260
|
-
const sourceFile = project.addSourceFileAtPathIfExists(path_1.default.join(cwd, UTILS_FILE));
|
|
261
|
-
if (!sourceFile)
|
|
262
|
-
return;
|
|
263
|
-
const property = (_a = sourceFile
|
|
264
|
-
.getInterface('IApplicationConfig')) === null || _a === void 0 ? void 0 : _a.getProperty('SENTRY');
|
|
265
|
-
if (!property)
|
|
266
|
-
return;
|
|
267
|
-
property.remove();
|
|
268
|
-
console.log(` ✓ ${UTILS_FILE}: IApplicationConfig.SENTRY`);
|
|
269
|
-
}
|
|
270
|
-
function isSentryPackage(name) {
|
|
271
|
-
return name === SENTRY_PLUGIN || name.startsWith('@sentry/');
|
|
272
|
-
}
|
|
273
|
-
function removeDependencies(cwd) {
|
|
274
|
-
const packageJsonPath = path_1.default.join(cwd, PACKAGE_JSON_FILE);
|
|
275
|
-
if (!(0, fs_1.existsSync)(packageJsonPath))
|
|
276
|
-
return;
|
|
277
|
-
const raw = (0, fs_1.readFileSync)(packageJsonPath, 'utf8');
|
|
278
|
-
let parsed;
|
|
279
|
-
try {
|
|
280
|
-
parsed = JSON.parse(raw);
|
|
281
|
-
}
|
|
282
|
-
catch (error) {
|
|
283
|
-
warnSkipped(`${PACKAGE_JSON_FILE} could not be parsed (${error.message}); remove the Sentry dependencies by hand`);
|
|
284
|
-
return;
|
|
285
|
-
}
|
|
286
|
-
const removed = [];
|
|
287
|
-
for (const bucket of ['dependencies', 'devDependencies']) {
|
|
288
|
-
const dependencies = parsed[bucket];
|
|
289
|
-
if (!dependencies)
|
|
290
|
-
continue;
|
|
291
|
-
for (const name of Object.keys(dependencies)) {
|
|
292
|
-
if (isSentryPackage(name)) {
|
|
293
|
-
delete dependencies[name];
|
|
294
|
-
removed.push(name);
|
|
295
|
-
}
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
if (removed.length === 0)
|
|
299
|
-
return;
|
|
300
|
-
// Keep the file's trailing newline, if it had one.
|
|
301
|
-
const trailingNewline = raw.endsWith('\n') ? '\n' : '';
|
|
302
|
-
(0, fs_1.writeFileSync)(packageJsonPath, `${JSON.stringify(parsed, null, 2)}${trailingNewline}`);
|
|
303
|
-
console.log(` ✓ ${PACKAGE_JSON_FILE}: ${removed.join(', ')}`);
|
|
304
|
-
}
|
|
305
|
-
// ─── typings/hapi-sentry.d.ts ────────────────────────────────────────────────
|
|
306
|
-
/**
|
|
307
|
-
* `hapi-sentry` ships no types, so country configs declare the module
|
|
308
|
-
* themselves. Delete that declaration — but only when it is all the file says,
|
|
309
|
-
* in case a country has folded other ambient declarations into it.
|
|
310
|
-
*/
|
|
311
|
-
function removeTypings(cwd) {
|
|
312
|
-
const typingsPath = path_1.default.join(cwd, TYPINGS_FILE);
|
|
313
|
-
if (!(0, fs_1.existsSync)(typingsPath))
|
|
314
|
-
return;
|
|
315
|
-
const declarations = (0, fs_1.readFileSync)(typingsPath, 'utf8')
|
|
316
|
-
.replace(/\/\*[\s\S]*?\*\//g, '')
|
|
317
|
-
.replace(/^\s*\/\/.*$/gm, '')
|
|
318
|
-
.trim();
|
|
319
|
-
if (!/^declare module ['"]hapi-sentry['"];?$/.test(declarations)) {
|
|
320
|
-
warnSkipped(`${TYPINGS_FILE} declares more than the 'hapi-sentry' module; remove the declaration by hand`);
|
|
321
|
-
return;
|
|
322
|
-
}
|
|
323
|
-
(0, fs_1.rmSync)(typingsPath);
|
|
324
|
-
console.log(` ✓ ${TYPINGS_FILE}: deleted`);
|
|
325
|
-
}
|
|
326
|
-
// ─── Entry point ─────────────────────────────────────────────────────────────
|
|
327
|
-
function main() {
|
|
328
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
329
|
-
const cwd = process.cwd();
|
|
330
|
-
console.log('\nRemoving Sentry...\n');
|
|
331
|
-
const project = new ts_morph_1.Project({
|
|
332
|
-
// ts-morph indents with four spaces and double-quotes strings by default,
|
|
333
|
-
// both of which the country config's prettier run would undo.
|
|
334
|
-
manipulationSettings: {
|
|
335
|
-
indentationText: ts_morph_1.IndentationText.TwoSpaces,
|
|
336
|
-
quoteKind: ts_morph_1.QuoteKind.Single
|
|
337
|
-
}
|
|
338
|
-
});
|
|
339
|
-
removeSentryFromConfigs(project, cwd);
|
|
340
|
-
removeEnvironmentVariable(project, cwd);
|
|
341
|
-
removeConstant(project, cwd);
|
|
342
|
-
unwireIndex(project, cwd);
|
|
343
|
-
removeApplicationConfigField(project, cwd);
|
|
344
|
-
yield project.save();
|
|
345
|
-
removeDependencies(cwd);
|
|
346
|
-
removeTypings(cwd);
|
|
347
|
-
if (skipped.length > 0) {
|
|
348
|
-
console.warn(`\n⚠️ ${skipped.length} Sentry removal step(s) were skipped. Handle the following by hand:`);
|
|
349
|
-
for (const message of skipped) {
|
|
350
|
-
console.warn(` - ${message}`);
|
|
351
|
-
}
|
|
352
|
-
}
|
|
353
|
-
});
|
|
354
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"remove-typings-from-dockerfile.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.1/remove-typings-from-dockerfile.ts"],"names":[],"mappings":"AAgIA,iBAAe,IAAI,kBAElB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|
|
@@ -1,121 +0,0 @@
|
|
|
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.main = main;
|
|
26
|
-
/**
|
|
27
|
-
* Codemod: stop the country config's Dockerfile copying `typings/` into the
|
|
28
|
-
* image.
|
|
29
|
-
*
|
|
30
|
-
* A v2.0 Tiltfile sends `typings/` to the image build, and the Dockerfile ends
|
|
31
|
-
* with `COPY typings ./typings`. The Tiltfile that `upgrade-tilt` installs does
|
|
32
|
-
* not send it, and starts a yarn country config with `start:prod`, which runs
|
|
33
|
-
* `ts-node --transpile-only` and so never reads a declaration file. The
|
|
34
|
-
* Dockerfile left behind then fails under Tilt, on its last step:
|
|
35
|
-
*
|
|
36
|
-
* ERROR IN: [runner 6/6] COPY typings ./typings
|
|
37
|
-
*
|
|
38
|
-
* This step removes that instruction. `typings/` itself stays in the country
|
|
39
|
-
* config, where `tsconfig.json` still includes it when type-checking.
|
|
40
|
-
*
|
|
41
|
-
* Only a `COPY` that reads nothing but `typings` is removed. One that mixes it
|
|
42
|
-
* with other sources, or that is spread over several lines, is reported for the
|
|
43
|
-
* country to edit by hand. Anything already absent is left alone.
|
|
44
|
-
*/
|
|
45
|
-
const fs_1 = require("fs");
|
|
46
|
-
const path_1 = __importDefault(require("path"));
|
|
47
|
-
const DOCKERFILE = 'Dockerfile';
|
|
48
|
-
/** `typings`, `./typings`, `typings/`, or anything under it. */
|
|
49
|
-
const TYPINGS_PATH = /^(?:\.\/)?typings(?:\/.*)?$/;
|
|
50
|
-
/** A line ending in a backslash carries on into the next one. */
|
|
51
|
-
const continues = (line) => !/^\s*#/.test(line) && /\\[ \t]*\r?\n?$/.test(line);
|
|
52
|
-
/**
|
|
53
|
-
* What a line copies out of the build context, destination left out. Empty for
|
|
54
|
-
* anything but `COPY` and `ADD`, and for `--from`, which reads from another
|
|
55
|
-
* stage rather than from the build context.
|
|
56
|
-
*/
|
|
57
|
-
function contextSources(line, continued) {
|
|
58
|
-
const [instruction, ...args] = line.split(/[\s"',[\]]+/).filter(Boolean);
|
|
59
|
-
if (!/^(?:COPY|ADD)$/i.test(instruction) ||
|
|
60
|
-
args.some((arg) => arg.startsWith('--from'))) {
|
|
61
|
-
return [];
|
|
62
|
-
}
|
|
63
|
-
const paths = args.filter((arg) => arg !== '\\' && !arg.startsWith('--'));
|
|
64
|
-
// The destination is the last path, which a line that carries on has not
|
|
65
|
-
// reached yet: everything on it is a source.
|
|
66
|
-
return continued ? paths : paths.slice(0, -1);
|
|
67
|
-
}
|
|
68
|
-
/**
|
|
69
|
-
* The Dockerfile without its instructions that copy only from `typings/`, and
|
|
70
|
-
* the ones that copy from it but could not be taken out safely.
|
|
71
|
-
*/
|
|
72
|
-
function removeTypingsCopy(dockerfile) {
|
|
73
|
-
var _a;
|
|
74
|
-
const kept = [];
|
|
75
|
-
const removed = [];
|
|
76
|
-
const unresolved = [];
|
|
77
|
-
let previousCarriesOn = false;
|
|
78
|
-
// Each line keeps its own terminator, so the ones left are written back as
|
|
79
|
-
// they were, whether LF or CRLF.
|
|
80
|
-
const lines = (_a = dockerfile.match(/[^\n]*\n|[^\n]+$/g)) !== null && _a !== void 0 ? _a : [];
|
|
81
|
-
for (const line of lines) {
|
|
82
|
-
const startsInstruction = !previousCarriesOn;
|
|
83
|
-
const carriesOn = continues(line);
|
|
84
|
-
previousCarriesOn = carriesOn;
|
|
85
|
-
const sources = startsInstruction ? contextSources(line, carriesOn) : [];
|
|
86
|
-
if (!sources.some((source) => TYPINGS_PATH.test(source))) {
|
|
87
|
-
kept.push(line);
|
|
88
|
-
}
|
|
89
|
-
else if (sources.length === 1 && !carriesOn) {
|
|
90
|
-
removed.push(line.trim());
|
|
91
|
-
}
|
|
92
|
-
else {
|
|
93
|
-
kept.push(line);
|
|
94
|
-
unresolved.push(line.trim());
|
|
95
|
-
}
|
|
96
|
-
}
|
|
97
|
-
return { contents: kept.join(''), removed, unresolved };
|
|
98
|
-
}
|
|
99
|
-
function removeTypingsFromDockerfile(cwd) {
|
|
100
|
-
const dockerfilePath = path_1.default.join(cwd, DOCKERFILE);
|
|
101
|
-
if (!(0, fs_1.existsSync)(dockerfilePath))
|
|
102
|
-
return;
|
|
103
|
-
const { contents, removed, unresolved } = removeTypingsCopy((0, fs_1.readFileSync)(dockerfilePath, 'utf8'));
|
|
104
|
-
if (removed.length === 0 && unresolved.length === 0)
|
|
105
|
-
return;
|
|
106
|
-
console.log('\nUpdating the Dockerfile...\n');
|
|
107
|
-
if (removed.length > 0) {
|
|
108
|
-
(0, fs_1.writeFileSync)(dockerfilePath, contents);
|
|
109
|
-
}
|
|
110
|
-
for (const instruction of removed) {
|
|
111
|
-
console.log(` ✓ ${DOCKERFILE}: removed '${instruction}', the Tiltfile no longer sends typings/ to the image build`);
|
|
112
|
-
}
|
|
113
|
-
for (const instruction of unresolved) {
|
|
114
|
-
console.warn(` ⚠️ ${DOCKERFILE} still copies from typings/ ('${instruction}'), which the Tiltfile no longer sends to the image build; remove it by hand`);
|
|
115
|
-
}
|
|
116
|
-
}
|
|
117
|
-
function main() {
|
|
118
|
-
return __awaiter(this, void 0, void 0, function* () {
|
|
119
|
-
removeTypingsFromDockerfile(process.cwd());
|
|
120
|
-
});
|
|
121
|
-
}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"rename-trigger-paths.d.ts","sourceRoot":"","sources":["../../../src/migrations/v2.1/rename-trigger-paths.ts"],"names":[],"mappings":"AAiMA,iBAAe,IAAI,kBAiDlB;AAED,OAAO,EAAE,IAAI,EAAE,CAAA"}
|