@sap/artifact-management 1.6.0 → 1.6.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.
- package/CHANGELOG.md +5 -0
- package/dist/src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.js +19 -13
- package/dist/src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +6 -6
- package/dist/types/src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.d.ts +2 -1
- package/node_modules/@sap/artifact-management-base/package.json +1 -1
- package/node_modules/@sap/artifact-management-mdkplugin/package.json +2 -2
- package/package.json +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,8 @@
|
|
|
1
|
+
## 1.6.1 - 17 February, 2022
|
|
2
|
+
### Fixed
|
|
3
|
+
* Fixed issue where new roles were not generated on cf for subsequent deployments.
|
|
4
|
+
* Fixed deployment issue related to changes in generation of xs-security.json by cds.
|
|
5
|
+
|
|
1
6
|
## 1.6.0 - 10 February, 2022
|
|
2
7
|
### Added
|
|
3
8
|
* Added immutability/read-only view to Project-API result object data structures.
|
|
@@ -6,17 +6,16 @@ class XsSecurityModuleManifestGenerator {
|
|
|
6
6
|
return artifact_management_base_1.ModuleType.XsSecurity;
|
|
7
7
|
}
|
|
8
8
|
async provideResources(mgContext) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
await artifact_management_base_1.Util.exec('cds.cmd', 'compile', 'srv', '--to', 'xsuaa', '\>', 'xs-security.json');
|
|
14
|
-
}
|
|
15
|
-
else {
|
|
16
|
-
await artifact_management_base_1.Util.exec('bash', '-c', 'cds compile srv --to xsuaa > xs-security.json');
|
|
17
|
-
}
|
|
18
|
-
process.chdir(cwd);
|
|
9
|
+
const cwd = process.cwd();
|
|
10
|
+
process.chdir(mgContext.fs().rootPath);
|
|
11
|
+
if (/^win/.test(process.platform)) {
|
|
12
|
+
await artifact_management_base_1.Util.exec('cds.cmd', 'compile', 'srv', '--to', 'xsuaa', '\>', 'xs-security.json');
|
|
19
13
|
}
|
|
14
|
+
else {
|
|
15
|
+
await artifact_management_base_1.Util.exec('bash', '-c', 'cds compile srv --to xsuaa > xs-security.json');
|
|
16
|
+
}
|
|
17
|
+
await this.configureXsSecurity(mgContext);
|
|
18
|
+
process.chdir(cwd);
|
|
20
19
|
return [{
|
|
21
20
|
name: mgContext.nameFactory.serviceInstanceName('uaa'),
|
|
22
21
|
service: artifact_management_base_1.ServiceCatalog.xsuaa.name,
|
|
@@ -29,7 +28,7 @@ class XsSecurityModuleManifestGenerator {
|
|
|
29
28
|
type: artifact_management_base_1.DestinationType.DEST_TO_SERVICE_INSTANCE,
|
|
30
29
|
authentication: artifact_management_base_1.AuthenticationType.OAuth2UserTokenExchange,
|
|
31
30
|
},
|
|
32
|
-
xsappname:
|
|
31
|
+
xsappname: this.sec.xsappname + '-${space}',
|
|
33
32
|
'role-collections': await this.getRoleCollection(mgContext.fs()),
|
|
34
33
|
},
|
|
35
34
|
}];
|
|
@@ -43,11 +42,18 @@ class XsSecurityModuleManifestGenerator {
|
|
|
43
42
|
requires() {
|
|
44
43
|
return [];
|
|
45
44
|
}
|
|
46
|
-
async
|
|
45
|
+
async getXsSecurityContents(fs) {
|
|
47
46
|
if (!this.sec) {
|
|
48
47
|
this.sec = await fs.readJson('xs-security.json');
|
|
49
48
|
}
|
|
50
|
-
return this.sec
|
|
49
|
+
return this.sec;
|
|
50
|
+
}
|
|
51
|
+
async configureXsSecurity(context) {
|
|
52
|
+
const fileContents = await this.getXsSecurityContents(context.fs());
|
|
53
|
+
fileContents['xsappname'] = context.project.prefix;
|
|
54
|
+
fileContents['tenant-mode'] = 'dedicated';
|
|
55
|
+
this.sec = fileContents;
|
|
56
|
+
await context.fs().writeJSON('xs-security.json', fileContents);
|
|
51
57
|
}
|
|
52
58
|
async getRoleCollection(fs) {
|
|
53
59
|
const scopes = this.sec.scopes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"XsSecurityModuleManifestGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.ts"],"names":[],"mappings":";;AACA,4EAC0I;AAE1I,MAAqB,iCAAiC;IAIlD,OAAO;QACH,OAAO,qCAAU,CAAC,UAAU,CAAC;IACjC,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,SAAiC;QAC3D,
|
|
1
|
+
{"version":3,"file":"XsSecurityModuleManifestGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -857,8 +857,8 @@
|
|
|
857
857
|
"affectsGlobalScope": false
|
|
858
858
|
},
|
|
859
859
|
"../src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.ts": {
|
|
860
|
-
"version": "
|
|
861
|
-
"signature": "
|
|
860
|
+
"version": "cbb0eb8d106d544d4204a07bf30c239b4698829430e4ae2ed9f55340031e89a1",
|
|
861
|
+
"signature": "4b98e23007a3080de27168d6284b5dcc6b1afe90715d470c4a5e97b6eecb82dc",
|
|
862
862
|
"affectsGlobalScope": false
|
|
863
863
|
},
|
|
864
864
|
"../src/plugins/xsuaa/index.ts": {
|
|
@@ -1437,8 +1437,8 @@
|
|
|
1437
1437
|
"affectsGlobalScope": false
|
|
1438
1438
|
},
|
|
1439
1439
|
"../node_modules/@types/jsonwebtoken/index.d.ts": {
|
|
1440
|
-
"version": "
|
|
1441
|
-
"signature": "
|
|
1440
|
+
"version": "e5dd317ef2c7a2882b152337b03d592fafa8351b40351849a16a908b198bd3b5",
|
|
1441
|
+
"signature": "e5dd317ef2c7a2882b152337b03d592fafa8351b40351849a16a908b198bd3b5",
|
|
1442
1442
|
"affectsGlobalScope": false
|
|
1443
1443
|
},
|
|
1444
1444
|
"../node_modules/@types/mocha/index.d.ts": {
|
|
@@ -1447,8 +1447,8 @@
|
|
|
1447
1447
|
"affectsGlobalScope": true
|
|
1448
1448
|
},
|
|
1449
1449
|
"../node_modules/@types/sinonjs__fake-timers/index.d.ts": {
|
|
1450
|
-
"version": "
|
|
1451
|
-
"signature": "
|
|
1450
|
+
"version": "550650516d34048712520ffb1fce4a02f2d837761ee45c7d9868a7a35e7b0343",
|
|
1451
|
+
"signature": "550650516d34048712520ffb1fce4a02f2d837761ee45c7d9868a7a35e7b0343",
|
|
1452
1452
|
"affectsGlobalScope": false
|
|
1453
1453
|
},
|
|
1454
1454
|
"../node_modules/@types/sinon/index.d.ts": {
|
|
@@ -6,6 +6,7 @@ export default class XsSecurityModuleManifestGenerator implements ModuleManifest
|
|
|
6
6
|
beforeBuildCommands(mgContext: ModuleGeneratorContext): Promise<string[]>;
|
|
7
7
|
getModuleManifest(context: ModuleGeneratorContext): Promise<MtaModule | null>;
|
|
8
8
|
requires(): MtaModuleRequires[];
|
|
9
|
-
|
|
9
|
+
getXsSecurityContents(fs: ProjectFileSystem): Promise<any>;
|
|
10
|
+
private configureXsSecurity;
|
|
10
11
|
getRoleCollection(fs: ProjectFileSystem): Promise<any[]>;
|
|
11
12
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sap/artifact-management-mdkplugin",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.1",
|
|
4
4
|
"main": "dist/src/index.js",
|
|
5
5
|
"types": "dist/types/src/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"create-packages": "bash ../../bin/create_node_module.sh"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@sap/artifact-management-base": "1.6.
|
|
27
|
+
"@sap/artifact-management-base": "1.6.1",
|
|
28
28
|
"@sap/cds": "5.1.5",
|
|
29
29
|
"fast-glob": "3.2.7",
|
|
30
30
|
"glob": "7.2.0",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sap/artifact-management",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.1",
|
|
4
4
|
"main": "dist/src/index.js",
|
|
5
5
|
"types": "dist/types/src/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -28,8 +28,8 @@
|
|
|
28
28
|
"dev-project": "dist/src/project-api/ProjectCLI.js"
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@sap/artifact-management-base": "1.6.
|
|
32
|
-
"@sap/artifact-management-mdkplugin": "1.6.
|
|
31
|
+
"@sap/artifact-management-base": "1.6.1",
|
|
32
|
+
"@sap/artifact-management-mdkplugin": "1.6.1",
|
|
33
33
|
"ajv": "8.8.1",
|
|
34
34
|
"arg": "5.0.1",
|
|
35
35
|
"async": "3.2.2",
|
|
@@ -52,7 +52,7 @@
|
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@istanbuljs/nyc-config-typescript": "1.0.1",
|
|
55
|
-
"@sap/cds": "5.1
|
|
55
|
+
"@sap/cds": "5.8.1",
|
|
56
56
|
"@types/async": "3.2.3",
|
|
57
57
|
"@types/ejs": "3.0.5",
|
|
58
58
|
"@types/glob": "7.1.3",
|