@eudiplo/cli 8.1.0-main.7e6a44b → 8.1.0-main.8f6abca
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/README.md +4 -4
- package/dist/commands/upgrade/action.d.ts.map +1 -1
- package/dist/commands/upgrade/action.js +3 -1
- package/dist/commands/upgrade/action.js.map +1 -1
- package/dist/index.js +999 -221
- package/dist/services/compose-project.js +2 -2
- package/dist/services/compose-project.js.map +1 -1
- package/dist/services/compose-upgrade.d.ts +8 -5
- package/dist/services/compose-upgrade.d.ts.map +1 -1
- package/dist/services/compose-upgrade.js +36 -11
- package/dist/services/compose-upgrade.js.map +1 -1
- package/package.json +5 -5
- package/templates/docker-compose.yml +3 -3
- package/templates/schemas/DCQL.schema.json +30 -4
- package/templates/schemas/PresentationConfigCreateDto.schema.json +30 -4
- package/templates/schemas/PresentationConfigFile.schema.json +720 -1
|
@@ -22,8 +22,8 @@ export function createComposeEnv(options) {
|
|
|
22
22
|
const authClientSecret = options.authClientSecret ?? "root";
|
|
23
23
|
const lines = [
|
|
24
24
|
`EUDIPLO_ENV_FILE=${envFileName}`,
|
|
25
|
-
`EUDIPLO_IMAGE=ghcr.io/
|
|
26
|
-
`EUDIPLO_CLIENT_IMAGE=ghcr.io/
|
|
25
|
+
`EUDIPLO_IMAGE=ghcr.io/eudiplo/eudiplo:${imageTag}`,
|
|
26
|
+
`EUDIPLO_CLIENT_IMAGE=ghcr.io/eudiplo/eudiplo-client:${imageTag}`,
|
|
27
27
|
...(options.mode === "demo" ? ["EUDIPLO_BIND_ADDRESS=127.0.0.1"] : []),
|
|
28
28
|
`EUDIPLO_CONFIG_MOUNT=./${configDirectoryName}:/app/config`,
|
|
29
29
|
"CONFIG_FOLDER=/app/config",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-project.js","sourceRoot":"","sources":["../../src/services/compose-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACH,kBAAkB,EAClB,gBAAgB,EAChB,gBAAgB,GACnB,MAAM,kBAAkB,CAAC;AAE1B,MAAM,CAAC,MAAM,sBAAsB,GAAG,sBAAsB,CAAC;AAC7D,MAAM,CAAC,MAAM,8BAA8B,GAAG,+BAA+B,CAAC;AAC9E,MAAM,CAAC,MAAM,kBAAkB,GAAG,cAAc,CAAC;AACjD,MAAM,CAAC,MAAM,mBAAmB,GAAG,2BAA2B,CAAC;AAC/D,MAAM,CAAC,MAAM,eAAe,GAAG,mBAAmB,CAAC;AACnD,MAAM,CAAC,MAAM,mBAAmB,GAAG,QAAQ,CAAC;AAC5C,MAAM,YAAY,GAAG,MAAM,CAAC;AAC5B,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,mBAAmB,IAAI,YAAY,EAAE,CAAC;AAC5E,MAAM,0BAA0B,GAAG,qCAAqC,CAAC;AAkBzE,MAAM,UAAU,gBAAgB,CAAC,OAA0B;IACvD,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3D,MAAM,WAAW,GACb,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,kBAAkB,CAAC;IACnE,MAAM,QAAQ,GACV,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC;IACxE,MAAM,OAAO,GACT,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,CAAC;IACrE,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,IAAI,IAAI,CAAC,CAAC;IACnE,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,uBAAuB,CAAC;IAC/D,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,MAAM,CAAC;IACpD,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,MAAM,CAAC;IAC5D,MAAM,KAAK,GAAG;QACV,oBAAoB,WAAW,EAAE;QACjC,
|
|
1
|
+
{"version":3,"file":"compose-project.js","sourceRoot":"","sources":["../../src/services/compose-project.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,13 +8,15 @@
|
|
|
8
8
|
* endings, is kept as it was.
|
|
9
9
|
*/
|
|
10
10
|
declare const managedImages: {
|
|
11
|
-
readonly EUDIPLO_IMAGE: "ghcr.io/
|
|
12
|
-
readonly EUDIPLO_CLIENT_IMAGE: "ghcr.io/
|
|
11
|
+
readonly EUDIPLO_IMAGE: "ghcr.io/eudiplo/eudiplo";
|
|
12
|
+
readonly EUDIPLO_CLIENT_IMAGE: "ghcr.io/eudiplo/eudiplo-client";
|
|
13
13
|
};
|
|
14
14
|
type ManagedKey = keyof typeof managedImages;
|
|
15
15
|
interface ImageChange {
|
|
16
16
|
key: ManagedKey;
|
|
17
17
|
repository: string;
|
|
18
|
+
/** The legacy repository the line pointed at, when it is being moved. */
|
|
19
|
+
movedFrom?: string;
|
|
18
20
|
from: string;
|
|
19
21
|
to: string;
|
|
20
22
|
}
|
|
@@ -25,9 +27,10 @@ interface UpgradePlan {
|
|
|
25
27
|
}
|
|
26
28
|
export declare function assertImageTag(tag: string): void;
|
|
27
29
|
/**
|
|
28
|
-
* Plans a tag change for the managed image lines.
|
|
29
|
-
*
|
|
30
|
-
*
|
|
30
|
+
* Plans a tag change for the managed image lines. Lines on a legacy
|
|
31
|
+
* repository are moved to the current one. Refuses rather than guesses when
|
|
32
|
+
* a line has been customised (another registry, a digest, or no tag),
|
|
33
|
+
* because that line is then user-managed.
|
|
31
34
|
*/
|
|
32
35
|
export declare function planImageUpgrade(content: string, tag: string): UpgradePlan;
|
|
33
36
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-upgrade.d.ts","sourceRoot":"","sources":["../../src/services/compose-upgrade.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,QAAA,MAAM,aAAa;aACf,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"compose-upgrade.d.ts","sourceRoot":"","sources":["../../src/services/compose-upgrade.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,QAAA,MAAM,aAAa;aACf,aAAa,EAAE,yBAAyB;aACxC,oBAAoB,EAAE,gCAAgC;CAChD,CAAC;AAEX,KAAK,UAAU,GAAG,MAAM,OAAO,aAAa,CAAC;AAU7C,UAAU,WAAW;IACjB,GAAG,EAAE,UAAU,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,yEAAyE;IACzE,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACd;AAED,UAAU,WAAW;IACjB,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,wDAAwD;IACxD,OAAO,EAAE,MAAM,CAAC;CACnB;AAKD,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAMhD;AAYD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,WAAW,CAwD1E;AA0BD;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,EAAE,CAwBjE"}
|
|
@@ -8,6 +8,13 @@
|
|
|
8
8
|
* endings, is kept as it was.
|
|
9
9
|
*/
|
|
10
10
|
const managedImages = {
|
|
11
|
+
EUDIPLO_IMAGE: "ghcr.io/eudiplo/eudiplo",
|
|
12
|
+
EUDIPLO_CLIENT_IMAGE: "ghcr.io/eudiplo/eudiplo-client",
|
|
13
|
+
};
|
|
14
|
+
// Releases up to v8.1.0 were published while the project was hosted by the
|
|
15
|
+
// OpenWallet Foundation. Instances still on those images are moved to the
|
|
16
|
+
// current repository by their next upgrade.
|
|
17
|
+
const legacyImages = {
|
|
11
18
|
EUDIPLO_IMAGE: "ghcr.io/openwallet-foundation/eudiplo",
|
|
12
19
|
EUDIPLO_CLIENT_IMAGE: "ghcr.io/openwallet-foundation/eudiplo-client",
|
|
13
20
|
};
|
|
@@ -18,10 +25,20 @@ export function assertImageTag(tag) {
|
|
|
18
25
|
throw new Error(`Invalid image tag ${JSON.stringify(tag)}. Tags contain letters, digits, "_", "." and "-", and cannot start with "." or "-".`);
|
|
19
26
|
}
|
|
20
27
|
}
|
|
28
|
+
/** Returns the tag of `value` if it is `repository:<tag>`. */
|
|
29
|
+
function tagOf(value, repository) {
|
|
30
|
+
const prefix = `${repository}:`;
|
|
31
|
+
if (!value.startsWith(prefix)) {
|
|
32
|
+
return undefined;
|
|
33
|
+
}
|
|
34
|
+
const tag = value.slice(prefix.length);
|
|
35
|
+
return TAG.test(tag) ? tag : undefined;
|
|
36
|
+
}
|
|
21
37
|
/**
|
|
22
|
-
* Plans a tag change for the managed image lines.
|
|
23
|
-
*
|
|
24
|
-
*
|
|
38
|
+
* Plans a tag change for the managed image lines. Lines on a legacy
|
|
39
|
+
* repository are moved to the current one. Refuses rather than guesses when
|
|
40
|
+
* a line has been customised (another registry, a digest, or no tag),
|
|
41
|
+
* because that line is then user-managed.
|
|
25
42
|
*/
|
|
26
43
|
export function planImageUpgrade(content, tag) {
|
|
27
44
|
assertImageTag(tag);
|
|
@@ -42,17 +59,25 @@ export function planImageUpgrade(content, tag) {
|
|
|
42
59
|
throw new Error(`${key} is defined more than once in the env file.`);
|
|
43
60
|
}
|
|
44
61
|
found.add(key);
|
|
45
|
-
const
|
|
46
|
-
const
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
62
|
+
const currentTag = tagOf(value, repository);
|
|
63
|
+
const legacyTag = tagOf(value, legacyImages[key]);
|
|
64
|
+
const current = currentTag ?? legacyTag;
|
|
65
|
+
if (current === undefined) {
|
|
66
|
+
throw new Error(`${key} is set to ${value}, which is not a CLI-managed image. Update it yourself, or restore ${repository}:<tag> to let the CLI manage it.`);
|
|
67
|
+
}
|
|
68
|
+
if (currentTag === undefined) {
|
|
69
|
+
changes.push({
|
|
70
|
+
key,
|
|
71
|
+
repository,
|
|
72
|
+
movedFrom: legacyImages[key],
|
|
73
|
+
from: current,
|
|
74
|
+
to: tag,
|
|
75
|
+
});
|
|
51
76
|
}
|
|
52
|
-
if (current !== tag) {
|
|
77
|
+
else if (current !== tag) {
|
|
53
78
|
changes.push({ key, repository, from: current, to: tag });
|
|
54
79
|
}
|
|
55
|
-
return `${key}=${
|
|
80
|
+
return `${key}=${repository}:${tag}${lineEnding}`;
|
|
56
81
|
});
|
|
57
82
|
if (!found.has("EUDIPLO_IMAGE")) {
|
|
58
83
|
throw new Error("The env file does not define EUDIPLO_IMAGE, so there is no CLI-managed image to upgrade.");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compose-upgrade.js","sourceRoot":"","sources":["../../src/services/compose-upgrade.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,MAAM,aAAa,GAAG;IAClB,aAAa,EAAE,uCAAuC;IACtD,oBAAoB,EAAE,8CAA8C;
|
|
1
|
+
{"version":3,"file":"compose-upgrade.js","sourceRoot":"","sources":["../../src/services/compose-upgrade.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@eudiplo/cli",
|
|
3
|
-
"version": "8.1.0-main.
|
|
3
|
+
"version": "8.1.0-main.8f6abca",
|
|
4
4
|
"description": "Deployment-aware command line tools for EUDIPLO",
|
|
5
5
|
"private": false,
|
|
6
6
|
"type": "module",
|
|
@@ -36,14 +36,14 @@
|
|
|
36
36
|
],
|
|
37
37
|
"repository": {
|
|
38
38
|
"type": "git",
|
|
39
|
-
"url": "git+https://github.com/
|
|
39
|
+
"url": "git+https://github.com/EUDIPLO/eudiplo.git",
|
|
40
40
|
"directory": "apps/cli"
|
|
41
41
|
},
|
|
42
|
-
"homepage": "https://github.com/
|
|
42
|
+
"homepage": "https://github.com/EUDIPLO/eudiplo/tree/main/apps/cli#readme",
|
|
43
43
|
"bugs": {
|
|
44
|
-
"url": "https://github.com/
|
|
44
|
+
"url": "https://github.com/EUDIPLO/eudiplo/issues"
|
|
45
45
|
},
|
|
46
|
-
"author": "
|
|
46
|
+
"author": "LF Decentralized Trust",
|
|
47
47
|
"license": "Apache-2.0",
|
|
48
48
|
"engines": {
|
|
49
49
|
"node": ">=22.12.0"
|
|
@@ -15,7 +15,7 @@ services:
|
|
|
15
15
|
# =============================================================================
|
|
16
16
|
|
|
17
17
|
eudiplo:
|
|
18
|
-
image: ${EUDIPLO_IMAGE:-ghcr.io/
|
|
18
|
+
image: ${EUDIPLO_IMAGE:-ghcr.io/eudiplo/eudiplo:latest}
|
|
19
19
|
restart: always
|
|
20
20
|
env_file:
|
|
21
21
|
- ${EUDIPLO_ENV_FILE:-.env}
|
|
@@ -41,7 +41,7 @@ services:
|
|
|
41
41
|
- eudiplo-network
|
|
42
42
|
|
|
43
43
|
eudiplo-client:
|
|
44
|
-
image: ${EUDIPLO_CLIENT_IMAGE:-ghcr.io/
|
|
44
|
+
image: ${EUDIPLO_CLIENT_IMAGE:-ghcr.io/eudiplo/eudiplo-client:latest}
|
|
45
45
|
restart: always
|
|
46
46
|
ports:
|
|
47
47
|
- '${EUDIPLO_BIND_ADDRESS:-0.0.0.0}:4200:8080'
|
|
@@ -113,7 +113,7 @@ services:
|
|
|
113
113
|
|
|
114
114
|
# S3 bucket initialization using the AWS CLI
|
|
115
115
|
rustfs-init:
|
|
116
|
-
image: amazon/aws-cli:2.37.
|
|
116
|
+
image: amazon/aws-cli:2.37.4
|
|
117
117
|
profiles: ['s3', 'standard', 'full']
|
|
118
118
|
depends_on:
|
|
119
119
|
rustfs:
|
|
@@ -157,10 +157,23 @@
|
|
|
157
157
|
"description": "Path to the claim value in presented credentials."
|
|
158
158
|
},
|
|
159
159
|
"values": {
|
|
160
|
-
"description": "Optional allowed values for the claim.",
|
|
160
|
+
"description": "Optional allowed values for the claim. A disclosed value must equal one of them in type and value.",
|
|
161
|
+
"minItems": 1,
|
|
161
162
|
"type": "array",
|
|
162
163
|
"items": {
|
|
163
|
-
"
|
|
164
|
+
"anyOf": [
|
|
165
|
+
{
|
|
166
|
+
"type": "string"
|
|
167
|
+
},
|
|
168
|
+
{
|
|
169
|
+
"type": "integer",
|
|
170
|
+
"minimum": -9007199254740991,
|
|
171
|
+
"maximum": 9007199254740991
|
|
172
|
+
},
|
|
173
|
+
{
|
|
174
|
+
"type": "boolean"
|
|
175
|
+
}
|
|
176
|
+
]
|
|
164
177
|
}
|
|
165
178
|
}
|
|
166
179
|
},
|
|
@@ -325,10 +338,23 @@
|
|
|
325
338
|
"description": "Path to the claim value in presented credentials."
|
|
326
339
|
},
|
|
327
340
|
"values": {
|
|
328
|
-
"description": "Optional allowed values for the claim.",
|
|
341
|
+
"description": "Optional allowed values for the claim. A disclosed value must equal one of them in type and value.",
|
|
342
|
+
"minItems": 1,
|
|
329
343
|
"type": "array",
|
|
330
344
|
"items": {
|
|
331
|
-
"
|
|
345
|
+
"anyOf": [
|
|
346
|
+
{
|
|
347
|
+
"type": "string"
|
|
348
|
+
},
|
|
349
|
+
{
|
|
350
|
+
"type": "integer",
|
|
351
|
+
"minimum": -9007199254740991,
|
|
352
|
+
"maximum": 9007199254740991
|
|
353
|
+
},
|
|
354
|
+
{
|
|
355
|
+
"type": "boolean"
|
|
356
|
+
}
|
|
357
|
+
]
|
|
332
358
|
}
|
|
333
359
|
},
|
|
334
360
|
"intent_to_retain": {
|
|
@@ -193,10 +193,23 @@
|
|
|
193
193
|
"description": "Path to the claim value in presented credentials."
|
|
194
194
|
},
|
|
195
195
|
"values": {
|
|
196
|
-
"description": "Optional allowed values for the claim.",
|
|
196
|
+
"description": "Optional allowed values for the claim. A disclosed value must equal one of them in type and value.",
|
|
197
|
+
"minItems": 1,
|
|
197
198
|
"type": "array",
|
|
198
199
|
"items": {
|
|
199
|
-
"
|
|
200
|
+
"anyOf": [
|
|
201
|
+
{
|
|
202
|
+
"type": "string"
|
|
203
|
+
},
|
|
204
|
+
{
|
|
205
|
+
"type": "integer",
|
|
206
|
+
"minimum": -9007199254740991,
|
|
207
|
+
"maximum": 9007199254740991
|
|
208
|
+
},
|
|
209
|
+
{
|
|
210
|
+
"type": "boolean"
|
|
211
|
+
}
|
|
212
|
+
]
|
|
200
213
|
}
|
|
201
214
|
}
|
|
202
215
|
},
|
|
@@ -361,10 +374,23 @@
|
|
|
361
374
|
"description": "Path to the claim value in presented credentials."
|
|
362
375
|
},
|
|
363
376
|
"values": {
|
|
364
|
-
"description": "Optional allowed values for the claim.",
|
|
377
|
+
"description": "Optional allowed values for the claim. A disclosed value must equal one of them in type and value.",
|
|
378
|
+
"minItems": 1,
|
|
365
379
|
"type": "array",
|
|
366
380
|
"items": {
|
|
367
|
-
"
|
|
381
|
+
"anyOf": [
|
|
382
|
+
{
|
|
383
|
+
"type": "string"
|
|
384
|
+
},
|
|
385
|
+
{
|
|
386
|
+
"type": "integer",
|
|
387
|
+
"minimum": -9007199254740991,
|
|
388
|
+
"maximum": 9007199254740991
|
|
389
|
+
},
|
|
390
|
+
{
|
|
391
|
+
"type": "boolean"
|
|
392
|
+
}
|
|
393
|
+
]
|
|
368
394
|
}
|
|
369
395
|
},
|
|
370
396
|
"intent_to_retain": {
|