@checkdigit/eslint-plugin 7.15.0-PR.134-f5fe → 7.15.0-PR.134-3323
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.
|
@@ -5,28 +5,12 @@ async function isAwsSdkV3Used() {
|
|
|
5
5
|
if (cachedIsAwsSdkV3Used !== void 0) {
|
|
6
6
|
return cachedIsAwsSdkV3Used;
|
|
7
7
|
}
|
|
8
|
-
|
|
9
|
-
process.loadEnvFile();
|
|
10
|
-
} catch {
|
|
11
|
-
return false;
|
|
12
|
-
}
|
|
13
|
-
const isService = process.env["SERVICE_NAME"] !== void 0;
|
|
14
|
-
if (!isService) {
|
|
15
|
-
return false;
|
|
16
|
-
}
|
|
17
|
-
let packageJson;
|
|
18
|
-
try {
|
|
19
|
-
packageJson = JSON.parse(await fs.readFile("package.json", "utf-8"));
|
|
20
|
-
} catch {
|
|
21
|
-
return false;
|
|
22
|
-
}
|
|
8
|
+
const packageJson = JSON.parse(await fs.readFile("package.json", "utf8"));
|
|
23
9
|
const dependencies = packageJson.dependencies ?? {};
|
|
24
|
-
|
|
25
|
-
const isAwsSdkV2Used = Object.keys(dependencies).some((dependency) => dependency === "@checkdigit/aws") || packageJson.service?.awsSdkV2 === true;
|
|
26
|
-
cachedIsAwsSdkV3Used = !isAwsSdkV2Used && hasAwsSdkV3Dependency;
|
|
10
|
+
cachedIsAwsSdkV3Used = Object.keys(dependencies).some((dependency) => dependency.startsWith("@aws-sdk/"));
|
|
27
11
|
return cachedIsAwsSdkV3Used;
|
|
28
12
|
}
|
|
29
13
|
export {
|
|
30
14
|
isAwsSdkV3Used as default
|
|
31
15
|
};
|
|
32
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
16
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL2lzLWF3cy1zZGstdjMtdXNlZC50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFFQSxTQUFTLFlBQVksVUFBVTtBQVMvQixJQUFJO0FBRUosZUFBTyxpQkFBMEQ7QUFDL0QsTUFBSSx5QkFBeUIsUUFBVztBQUN0QyxXQUFPO0FBQUEsRUFDVDtBQUVBLFFBQU0sY0FBYyxLQUFLLE1BQU0sTUFBTSxHQUFHLFNBQVMsZ0JBQWdCLE1BQU0sQ0FBQztBQUN4RSxRQUFNLGVBQWUsWUFBWSxnQkFBZ0IsQ0FBQztBQUVsRCx5QkFBdUIsT0FBTyxLQUFLLFlBQVksRUFBRSxLQUFLLENBQUMsZUFBZSxXQUFXLFdBQVcsV0FBVyxDQUFDO0FBQ3hHLFNBQU87QUFDVDsiLAogICJuYW1lcyI6IFtdCn0K
|
|
@@ -11,10 +11,9 @@ function isAwsSdkClientModule(importDeclaration) {
|
|
|
11
11
|
function isCheckdigitAwsModule(importDeclaration) {
|
|
12
12
|
return importDeclaration.source.value === "@checkdigit/aws";
|
|
13
13
|
}
|
|
14
|
-
function isAwsClient(awsClientName,
|
|
15
|
-
return awsClientName.endsWith("Client") && (
|
|
14
|
+
function isAwsClient(awsClientName, importedAwsClients) {
|
|
15
|
+
return awsClientName.endsWith("Client") && (importedAwsClients === void 0 || importedAwsClients.has(awsClientName));
|
|
16
16
|
}
|
|
17
|
-
var importedAwsClients = /* @__PURE__ */ new Set();
|
|
18
17
|
var rule = createRule({
|
|
19
18
|
name: ruleId,
|
|
20
19
|
meta: {
|
|
@@ -23,7 +22,7 @@ var rule = createRule({
|
|
|
23
22
|
description: "Require applying @checkdigit/aws-config with qualifier/environment instead of creating new AWS client instance directly. Also disallow importing from deprecated @checkdigit/aws module."
|
|
24
23
|
},
|
|
25
24
|
messages: {
|
|
26
|
-
[MESSAGE_ID_REQUIRE_AWS_CONFIG]: "Please apply @checkdigit/aws-config with qualifier/environment instead of creating new instance of {{awsClientName}} directly.",
|
|
25
|
+
[MESSAGE_ID_REQUIRE_AWS_CONFIG]: "Please apply @checkdigit/aws-config with qualifier/environment instead of creating a new instance of {{awsClientName}} directly.",
|
|
27
26
|
[MESSAGE_ID_NO_CHECKDIGIT_AWS]: 'No longer import from deprecated module "@checkdigit/aws". Please migrate to the official AWS SDK v3 modules.'
|
|
28
27
|
},
|
|
29
28
|
schema: []
|
|
@@ -31,6 +30,7 @@ var rule = createRule({
|
|
|
31
30
|
defaultOptions: [],
|
|
32
31
|
create(context) {
|
|
33
32
|
const { isAwsSdkV3Used } = context.settings;
|
|
33
|
+
const importedAwsClients = /* @__PURE__ */ new Set();
|
|
34
34
|
return {
|
|
35
35
|
ImportDeclaration(node) {
|
|
36
36
|
if (isAwsSdkV3Used !== true) {
|
|
@@ -82,4 +82,4 @@ export {
|
|
|
82
82
|
require_aws_config_default as default,
|
|
83
83
|
ruleId
|
|
84
84
|
};
|
|
85
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
85
|
+
//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsiLi4vc3JjL3JlcXVpcmUtYXdzLWNvbmZpZy50cyJdLAogICJtYXBwaW5ncyI6ICI7QUFRQSxTQUFTLGdCQUFnQixtQkFBNkI7QUFDdEQsT0FBTyx5QkFBeUI7QUFFekIsSUFBTSxTQUFTO0FBQ2YsSUFBTSxnQ0FBZ0M7QUFDdEMsSUFBTSwrQkFBK0I7QUFDNUMsSUFBTSxhQUFhLFlBQVksWUFBWSxDQUFDLFNBQVMsb0JBQW9CLElBQUksQ0FBQztBQUU5RSxTQUFTLHFCQUFxQixtQkFBd0Q7QUFDcEYsU0FBTyxrQkFBa0IsT0FBTyxNQUFNLFdBQVcsa0JBQWtCO0FBQ3JFO0FBRUEsU0FBUyxzQkFBc0IsbUJBQXdEO0FBQ3JGLFNBQU8sa0JBQWtCLE9BQU8sVUFBVTtBQUM1QztBQUVBLFNBQVMsWUFBWSxlQUF1QixvQkFBMkM7QUFHckYsU0FDRSxjQUFjLFNBQVMsUUFBUSxNQUFNLHVCQUF1QixVQUFhLG1CQUFtQixJQUFJLGFBQWE7QUFFakg7QUFFQSxJQUFNLE9BQ0osV0FBVztBQUFBLEVBQ1QsTUFBTTtBQUFBLEVBQ04sTUFBTTtBQUFBLElBQ0osTUFBTTtBQUFBLElBQ04sTUFBTTtBQUFBLE1BQ0osYUFDRTtBQUFBLElBQ0o7QUFBQSxJQUNBLFVBQVU7QUFBQSxNQUNSLENBQUMsNkJBQTZCLEdBQzVCO0FBQUEsTUFDRixDQUFDLDRCQUE0QixHQUMzQjtBQUFBLElBQ0o7QUFBQSxJQUNBLFFBQVEsQ0FBQztBQUFBLEVBQ1g7QUFBQSxFQUNBLGdCQUFnQixDQUFDO0FBQUEsRUFDakIsT0FBTyxTQUFTO0FBQ2QsVUFBTSxFQUFFLGVBQWUsSUFBSSxRQUFRO0FBQ25DLFVBQU0scUJBQXFCLG9CQUFJLElBQVk7QUFFM0MsV0FBTztBQUFBLE1BQ0wsa0JBQWtCLE1BQU07QUFDdEIsWUFBSSxtQkFBbUIsTUFBTTtBQUMzQjtBQUFBLFFBQ0Y7QUFFQSxZQUFJLHNCQUFzQixJQUFJLEdBQUc7QUFDL0Isa0JBQVEsT0FBTztBQUFBLFlBQ2I7QUFBQSxZQUNBLFdBQVc7QUFBQSxVQUNiLENBQUM7QUFDRDtBQUFBLFFBQ0Y7QUFFQSxZQUFJLHFCQUFxQixJQUFJLEdBQUc7QUFDOUIscUJBQVcsYUFBYSxLQUFLLFlBQVk7QUFDdkMsZ0JBQUksVUFBVSxTQUFTLGVBQWUsbUJBQW1CLFlBQVksVUFBVSxNQUFNLElBQUksR0FBRztBQUMxRixpQ0FBbUIsSUFBSSxVQUFVLE1BQU0sSUFBSTtBQUFBLFlBQzdDO0FBQUEsVUFDRjtBQUFBLFFBQ0Y7QUFBQSxNQUNGO0FBQUEsTUFFQSxjQUFjLE1BQU07QUFDbEIsWUFBSSxtQkFBbUIsTUFBTTtBQUMzQjtBQUFBLFFBQ0Y7QUFFQSxZQUFJLEtBQUssT0FBTyxTQUFTLGVBQWUsY0FBYyxZQUFZLEtBQUssT0FBTyxNQUFNLGtCQUFrQixHQUFHO0FBQ3ZHLGtCQUFRLE9BQU87QUFBQSxZQUNiO0FBQUEsWUFDQSxXQUFXO0FBQUEsWUFDWCxNQUFNLEVBQUUsZUFBZSxLQUFLLE9BQU8sS0FBSztBQUFBLFVBQzFDLENBQUM7QUFBQSxRQUNILFdBQVcsS0FBSyxPQUFPLFNBQVMsZUFBZSxrQkFBa0I7QUFFL0QsZ0JBQU0sV0FBVyxLQUFLLE9BQU87QUFDN0IsY0FBSSxTQUFTLFNBQVMsZUFBZSxjQUFjLFlBQVksU0FBUyxNQUFNLGtCQUFrQixHQUFHO0FBQ2pHLG9CQUFRLE9BQU87QUFBQSxjQUNiO0FBQUEsY0FDQSxXQUFXO0FBQUEsY0FDWCxNQUFNLEVBQUUsZUFBZSxTQUFTLEtBQUs7QUFBQSxZQUN2QyxDQUFDO0FBQUEsVUFDSDtBQUFBLFFBQ0Y7QUFBQSxNQUNGO0FBQUEsSUFDRjtBQUFBLEVBQ0Y7QUFDRixDQUFDO0FBRUgsSUFBTyw2QkFBUTsiLAogICJuYW1lcyI6IFtdCn0K
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"name":"@checkdigit/eslint-plugin","version":"7.15.0-PR.134-
|
|
1
|
+
{"name":"@checkdigit/eslint-plugin","version":"7.15.0-PR.134-3323","description":"Check Digit eslint plugins","keywords":["eslint","eslintplugin"],"homepage":"https://github.com/checkdigit/eslint-plugin#readme","bugs":{"url":"https://github.com/checkdigit/eslint-plugin/issues"},"repository":{"type":"git","url":"https://github.com/checkdigit/eslint-plugin"},"license":"MIT","author":"Check Digit, LLC","sideEffects":false,"type":"module","exports":{".":{"types":"./dist-types/index.d.ts","import":"./dist-mjs/index.mjs","default":"./dist-mjs/index.mjs"}},"files":["src","dist-types","dist-mjs","!src/**/test/**","!src/**/*.test.ts","!src/**/*.spec.ts","!dist-types/**/test/**","!dist-types/**/*.test.d.ts","!dist-types/**/*.spec.d.ts","!dist-mjs/**/test/**","!dist-mjs/**/*.test.mjs","!dist-mjs/**/*.spec.mjs","SECURITY.md"],"scripts":{"build:dist-mjs":"rimraf dist-mjs && npx builder --type=module --sourceMap --outDir=dist-mjs && node dist-mjs/index.mjs","build:dist-types":"rimraf dist-types && npx builder --type=types --outDir=dist-types","ci:compile":"tsc --noEmit","ci:coverage":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=true","ci:lint":"npm run lint","ci:style":"npm run prettier","ci:test":"NODE_OPTIONS=\"--disable-warning ExperimentalWarning --experimental-vm-modules\" jest --coverage=false","lint":"eslint --max-warnings 0 .","lint:fix":"eslint --max-warnings 0 --fix .","prepare":"","prepublishOnly":"npm run build:dist-types && npm run build:dist-mjs","prettier":"prettier --ignore-path .gitignore --list-different .","prettier:fix":"prettier --ignore-path .gitignore --write .","test":"npm run ci:compile && npm run ci:test && npm run ci:lint && npm run ci:style"},"prettier":"@checkdigit/prettier-config","jest":{"preset":"@checkdigit/jest-config"},"dependencies":{"@typescript-eslint/type-utils":"^8.45.0","@typescript-eslint/utils":"^8.45.0","http-status-codes":"^2.3.0","ts-api-utils":"^2.1.0"},"devDependencies":{"@checkdigit/jest-config":"^6.0.2","@checkdigit/prettier-config":"^6.1.0","@checkdigit/typescript-config":"^9.3.1","@eslint/js":"^9.36.0","@types/eslint":"^9.6.1","@types/eslint-config-prettier":"^6.11.3","@typescript-eslint/parser":"^8.45.0","@typescript-eslint/rule-tester":"^8.45.0","eslint":"^9.36.0","eslint-config-prettier":"^10.1.8","eslint-import-resolver-typescript":"^4.4.4","eslint-plugin-eslint-plugin":"^6.4.0","eslint-plugin-import":"^2.32.0","eslint-plugin-no-only-tests":"^3.3.0","eslint-plugin-no-secrets":"^2.2.1","eslint-plugin-node":"^11.1.0","eslint-plugin-sonarjs":"1.0.4","rimraf":"^6.0.1","typescript-eslint":"^8.45.0"},"peerDependencies":{"eslint":">=9 <10"},"engines":{"node":">=22.15"}}
|
|
@@ -16,31 +16,9 @@ export default async function isAwsSdkV3Used(): Promise<boolean> {
|
|
|
16
16
|
return cachedIsAwsSdkV3Used;
|
|
17
17
|
}
|
|
18
18
|
|
|
19
|
-
|
|
20
|
-
process.loadEnvFile();
|
|
21
|
-
} catch {
|
|
22
|
-
return false;
|
|
23
|
-
}
|
|
24
|
-
|
|
25
|
-
const isService = process.env['SERVICE_NAME'] !== undefined;
|
|
26
|
-
if (!isService) {
|
|
27
|
-
return false;
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
let packageJson;
|
|
31
|
-
try {
|
|
32
|
-
packageJson = JSON.parse(await fs.readFile('package.json', 'utf-8')) as PackageJson;
|
|
33
|
-
} catch {
|
|
34
|
-
return false;
|
|
35
|
-
}
|
|
19
|
+
const packageJson = JSON.parse(await fs.readFile('package.json', 'utf8')) as PackageJson;
|
|
36
20
|
const dependencies = packageJson.dependencies ?? {};
|
|
37
|
-
|
|
38
|
-
const hasAwsSdkV3Dependency = Object.keys(dependencies).some((dependency) => dependency.startsWith('@aws-sdk/'));
|
|
39
|
-
const isAwsSdkV2Used =
|
|
40
|
-
Object.keys(dependencies).some((dependency) => dependency === '@checkdigit/aws') ||
|
|
41
|
-
packageJson.service?.awsSdkV2 === true;
|
|
42
|
-
|
|
43
21
|
// eslint-disable-next-line require-atomic-updates
|
|
44
|
-
cachedIsAwsSdkV3Used =
|
|
22
|
+
cachedIsAwsSdkV3Used = Object.keys(dependencies).some((dependency) => dependency.startsWith('@aws-sdk/'));
|
|
45
23
|
return cachedIsAwsSdkV3Used;
|
|
46
24
|
}
|
|
@@ -30,8 +30,6 @@ function isAwsClient(awsClientName: string, importedAwsClients?: Set<string>): b
|
|
|
30
30
|
);
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
-
const importedAwsClients = new Set<string>();
|
|
34
|
-
|
|
35
33
|
const rule: ESLintUtils.RuleModule<typeof MESSAGE_ID_REQUIRE_AWS_CONFIG | typeof MESSAGE_ID_NO_CHECKDIGIT_AWS> =
|
|
36
34
|
createRule({
|
|
37
35
|
name: ruleId,
|
|
@@ -43,7 +41,7 @@ const rule: ESLintUtils.RuleModule<typeof MESSAGE_ID_REQUIRE_AWS_CONFIG | typeof
|
|
|
43
41
|
},
|
|
44
42
|
messages: {
|
|
45
43
|
[MESSAGE_ID_REQUIRE_AWS_CONFIG]:
|
|
46
|
-
'Please apply @checkdigit/aws-config with qualifier/environment instead of creating new instance of {{awsClientName}} directly.',
|
|
44
|
+
'Please apply @checkdigit/aws-config with qualifier/environment instead of creating a new instance of {{awsClientName}} directly.',
|
|
47
45
|
[MESSAGE_ID_NO_CHECKDIGIT_AWS]:
|
|
48
46
|
'No longer import from deprecated module "@checkdigit/aws". Please migrate to the official AWS SDK v3 modules.',
|
|
49
47
|
},
|
|
@@ -52,6 +50,7 @@ const rule: ESLintUtils.RuleModule<typeof MESSAGE_ID_REQUIRE_AWS_CONFIG | typeof
|
|
|
52
50
|
defaultOptions: [],
|
|
53
51
|
create(context) {
|
|
54
52
|
const { isAwsSdkV3Used } = context.settings;
|
|
53
|
+
const importedAwsClients = new Set<string>();
|
|
55
54
|
|
|
56
55
|
return {
|
|
57
56
|
ImportDeclaration(node) {
|