@prairielearn/config 3.0.5 → 3.0.7
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/CHANGELOG.md +16 -0
- package/dist/index.d.ts +2 -3
- package/dist/index.js +0 -1
- package/dist/index.js.map +1 -1
- package/package.json +11 -11
- package/src/index.ts +1 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# @prairielearn/config
|
|
2
2
|
|
|
3
|
+
## 3.0.7
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 315d931: Upgrade all JavaScript dependencies
|
|
8
|
+
- Updated dependencies [315d931]
|
|
9
|
+
- @prairielearn/aws-imds@2.0.6
|
|
10
|
+
|
|
11
|
+
## 3.0.6
|
|
12
|
+
|
|
13
|
+
### Patch Changes
|
|
14
|
+
|
|
15
|
+
- 4b79275: Upgrade all JavaScript dependencies
|
|
16
|
+
- Updated dependencies [4b79275]
|
|
17
|
+
- @prairielearn/aws-imds@2.0.5
|
|
18
|
+
|
|
3
19
|
## 3.0.5
|
|
4
20
|
|
|
5
21
|
### Patch Changes
|
package/dist/index.d.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
|
|
3
|
-
type AbstractConfig = z.infer<typeof AbstractConfigSchema>;
|
|
2
|
+
type AbstractConfig = Record<string, unknown>;
|
|
4
3
|
interface ConfigSource {
|
|
5
4
|
load: (existingConfig: AbstractConfig) => Promise<AbstractConfig>;
|
|
6
5
|
}
|
|
7
6
|
export declare function makeLiteralConfigSource(config: AbstractConfig): {
|
|
8
|
-
load: () => Promise<
|
|
7
|
+
load: () => Promise<AbstractConfig>;
|
|
9
8
|
};
|
|
10
9
|
export declare function makeFileConfigSource(path: string): ConfigSource;
|
|
11
10
|
export declare function makeSecretsManagerConfigSource(tagKey: string): ConfigSource;
|
package/dist/index.js
CHANGED
|
@@ -4,7 +4,6 @@ import fs from 'fs-extra';
|
|
|
4
4
|
import _ from 'lodash';
|
|
5
5
|
import { z } from 'zod';
|
|
6
6
|
import { fetchInstanceHostname, fetchInstanceIdentity } from '@prairielearn/aws-imds';
|
|
7
|
-
const AbstractConfigSchema = z.record(z.string(), z.unknown());
|
|
8
7
|
export function makeLiteralConfigSource(config) {
|
|
9
8
|
return {
|
|
10
9
|
load: async () => config,
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { EC2Client, DescribeTagsCommand } from '@aws-sdk/client-ec2';\nimport { SecretsManagerClient, GetSecretValueCommand } from '@aws-sdk/client-secrets-manager';\nimport fs from 'fs-extra';\nimport _ from 'lodash';\nimport { z } from 'zod';\n\nimport { fetchInstanceHostname, fetchInstanceIdentity } from '@prairielearn/aws-imds';\n\ntype AbstractConfig = Record<string, unknown>;\n\ninterface ConfigSource {\n load: (existingConfig: AbstractConfig) => Promise<AbstractConfig>;\n}\n\nexport function makeLiteralConfigSource(config: AbstractConfig) {\n return {\n load: async () => config,\n };\n}\n\nexport function makeFileConfigSource(path: string): ConfigSource {\n return {\n load: async () => {\n if (!(await fs.pathExists(path))) return {};\n\n const config = await fs.readJson(path);\n return z.record(z.string(), z.any()).parse(config);\n },\n };\n}\n\nexport function makeSecretsManagerConfigSource(tagKey: string): ConfigSource {\n return {\n load: async (existingConfig) => {\n if (!existingConfig.runningInEc2 && !process.env.CONFIG_LOAD_FROM_AWS) {\n return {};\n }\n\n const identity = await fetchInstanceIdentity();\n\n // We disable the ESLint rule here because we don't care about sharing\n // configs between clients in this case. We only want to share configs\n // to avoid spamming the IMDS API when creating lots of clients, but\n // this client will only be used once, typically at application startup.\n // eslint-disable-next-line @prairielearn/aws-client-shared-config\n const ec2Client = new EC2Client({ region: identity.region });\n const tags = await ec2Client.send(\n new DescribeTagsCommand({\n Filters: [{ Name: 'resource-id', Values: [identity.instanceId] }],\n }),\n );\n\n const secretId = tags.Tags?.find((tag) => tag.Key === tagKey)?.Value;\n if (!secretId) return {};\n\n // As above, we don't care about sharing configs between clients.\n // eslint-disable-next-line @prairielearn/aws-client-shared-config\n const secretsManagerClient = new SecretsManagerClient({ region: identity.region });\n const secretValue = await secretsManagerClient.send(\n new GetSecretValueCommand({ SecretId: secretId }),\n );\n if (!secretValue.SecretString) return {};\n\n const config = JSON.parse(secretValue.SecretString);\n return z.record(z.string(), z.any()).parse(config);\n },\n };\n}\n\nexport function makeImdsConfigSource(): ConfigSource {\n return {\n load: async (existingConfig) => {\n if (!existingConfig.runningInEc2 && !process.env.CONFIG_LOAD_FROM_AWS) {\n return {};\n }\n\n const hostname = await fetchInstanceHostname();\n const identity = await fetchInstanceIdentity();\n\n return {\n hostname,\n instanceId: identity.instanceId,\n awsRegion: identity.region,\n };\n },\n };\n}\n\nexport class ConfigLoader<Schema extends z.ZodTypeAny> {\n private readonly schema: Schema;\n private readonly resolvedConfig: z.infer<Schema>;\n\n constructor(schema: Schema) {\n this.schema = schema;\n\n // Get the default values from the schema. This ensures that all values\n // have defaults, and also allows us to override nested defaults with\n // `_.merge()` in `loadAndValidate()`.\n this.resolvedConfig = schema.parse({});\n }\n\n async loadAndValidate(sources: ConfigSource[] = []) {\n let config = this.schema.parse({});\n // If the config setting is an array, override instead of merge\n const mergeRule = (_obj: any, src: any) => (Array.isArray(src) ? src : undefined);\n\n for (const source of sources) {\n config = _.mergeWith(config, await source.load(config), mergeRule);\n }\n\n const parsedConfig = this.schema.parse(config);\n _.mergeWith(this.resolvedConfig, parsedConfig, mergeRule);\n }\n\n get config() {\n return this.resolvedConfig;\n }\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@prairielearn/config",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.7",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -9,9 +9,9 @@
|
|
|
9
9
|
"test": "c8 mocha src/**/*.test.ts"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@aws-sdk/client-ec2": "^3.
|
|
13
|
-
"@aws-sdk/client-secrets-manager": "^3.
|
|
14
|
-
"@prairielearn/aws-imds": "^2.0.
|
|
12
|
+
"@aws-sdk/client-ec2": "^3.703.0",
|
|
13
|
+
"@aws-sdk/client-secrets-manager": "^3.699.0",
|
|
14
|
+
"@prairielearn/aws-imds": "^2.0.6",
|
|
15
15
|
"fs-extra": "^11.2.0",
|
|
16
16
|
"lodash": "^4.17.21",
|
|
17
17
|
"zod": "^3.23.8"
|
|
@@ -19,15 +19,15 @@
|
|
|
19
19
|
"devDependencies": {
|
|
20
20
|
"@prairielearn/tsconfig": "^0.0.0",
|
|
21
21
|
"@types/fs-extra": "^11.0.4",
|
|
22
|
-
"@types/lodash": "^4.17.
|
|
23
|
-
"@types/mocha": "^10.0.
|
|
24
|
-
"@types/node": "^20.
|
|
22
|
+
"@types/lodash": "^4.17.13",
|
|
23
|
+
"@types/mocha": "^10.0.10",
|
|
24
|
+
"@types/node": "^20.17.9",
|
|
25
25
|
"c8": "^10.1.2",
|
|
26
|
-
"chai": "^5.1.
|
|
27
|
-
"mocha": "^10.
|
|
26
|
+
"chai": "^5.1.2",
|
|
27
|
+
"mocha": "^10.8.2",
|
|
28
28
|
"tmp-promise": "^3.0.3",
|
|
29
|
-
"tsx": "^4.
|
|
30
|
-
"typescript": "^5.
|
|
29
|
+
"tsx": "^4.19.2",
|
|
30
|
+
"typescript": "^5.7.2"
|
|
31
31
|
},
|
|
32
32
|
"c8": {
|
|
33
33
|
"reporter": [
|
package/src/index.ts
CHANGED
|
@@ -6,8 +6,7 @@ import { z } from 'zod';
|
|
|
6
6
|
|
|
7
7
|
import { fetchInstanceHostname, fetchInstanceIdentity } from '@prairielearn/aws-imds';
|
|
8
8
|
|
|
9
|
-
|
|
10
|
-
type AbstractConfig = z.infer<typeof AbstractConfigSchema>;
|
|
9
|
+
type AbstractConfig = Record<string, unknown>;
|
|
11
10
|
|
|
12
11
|
interface ConfigSource {
|
|
13
12
|
load: (existingConfig: AbstractConfig) => Promise<AbstractConfig>;
|