@sap/artifact-management 1.38.0 → 1.39.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/dist/src/cp/templates/launchpad-ui5-app-template/webapp/manifest.json +4 -0
- package/dist/src/definitions/PluginFactory.js +4 -3
- package/dist/src/definitions/PluginFactory.js.map +1 -1
- package/dist/src/mta-generator/MtaMerger.js +2 -2
- package/dist/src/plugins/cap/generators/CapDbModuleGenerator.js +2 -1
- package/dist/src/plugins/cap/generators/CapDbModuleGenerator.js.map +1 -1
- package/dist/src/plugins/cap/generators/CapDestinationModuleGenerator.js +25 -3
- package/dist/src/plugins/cap/generators/CapDestinationModuleGenerator.js.map +1 -1
- package/dist/src/plugins/cap/generators/CapProjectGenerator.js +20 -1
- package/dist/src/plugins/cap/generators/CapProjectGenerator.js.map +1 -1
- package/dist/src/plugins/cap/generators/CapServiceModuleGenerator.js +2 -1
- package/dist/src/plugins/cap/generators/CapServiceModuleGenerator.js.map +1 -1
- package/dist/src/plugins/cap/generators/CapUIDeployerGenerator.js +41 -8
- package/dist/src/plugins/cap/generators/CapUIDeployerGenerator.js.map +1 -1
- package/dist/src/plugins/cap/generators/templates/mta-cap-java-db-template.yaml +10 -0
- package/dist/src/plugins/cap/generators/templates/mta-cap-java-srv-template.yaml +20 -0
- package/dist/src/plugins/cap/readers/CapModuleReader.js +28 -10
- package/dist/src/plugins/cap/readers/CapModuleReader.js.map +1 -1
- package/dist/src/plugins/cap/readers/CapProjectReader.js +4 -0
- package/dist/src/plugins/cap/readers/CapProjectReader.js.map +1 -1
- package/dist/src/plugins/cap/util/ItemUtil.js +78 -13
- package/dist/src/plugins/cap/util/ItemUtil.js.map +1 -1
- package/dist/src/plugins/cap/util/PathUtil.js +9 -7
- package/dist/src/plugins/cap/util/PathUtil.js.map +1 -1
- package/dist/src/plugins/java/index.js +20 -3
- package/dist/src/plugins/java/index.js.map +1 -1
- package/dist/src/plugins/java/readers/JavaModuleReader.js +94 -0
- package/dist/src/plugins/java/readers/JavaModuleReader.js.map +1 -1
- package/dist/src/plugins/java/readers/JavaProjectReader.js +27 -4
- package/dist/src/plugins/java/readers/JavaProjectReader.js.map +1 -1
- package/dist/src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.js +13 -7
- package/dist/src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.js.map +1 -1
- package/dist/src/project-api/CommandExecutor.js +8 -1
- package/dist/src/project-api/CommandExecutor.js.map +1 -1
- package/dist/src/project-api/ProjectCLI.js +29 -0
- package/dist/src/project-api/ProjectCLI.js.map +1 -1
- package/dist/src/project-api/ProjectImpl.js +1 -0
- package/dist/src/project-api/ProjectImpl.js.map +1 -1
- package/dist/src/project-api/updatexsuaaservice.js +2 -1
- package/dist/src/project-api/updatexsuaaservice.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +273 -76
- package/dist/types/src/mta-generator/MtaGeneratorSettings.d.ts +1 -0
- package/dist/types/src/plugins/cap/generators/CapDestinationModuleGenerator.d.ts +1 -0
- package/dist/types/src/plugins/cap/generators/CapUIDeployerGenerator.d.ts +2 -2
- package/dist/types/src/plugins/cap/util/ItemUtil.d.ts +2 -0
- package/dist/types/src/plugins/cap/util/PathUtil.d.ts +1 -1
- package/dist/types/src/plugins/java/readers/JavaModuleReader.d.ts +22 -1
- package/dist/types/src/plugins/java/readers/JavaProjectReader.d.ts +1 -0
- package/dist/types/src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.d.ts +1 -1
- package/package.json +10 -10
|
@@ -137,8 +137,9 @@ class PluginFactory {
|
|
|
137
137
|
}
|
|
138
138
|
getModuleManifestGeneratorFor(moduleType) {
|
|
139
139
|
this.loadModuleManifestGenerators();
|
|
140
|
-
|
|
141
|
-
|
|
140
|
+
const moduleDataType = (moduleType === artifact_management_base_1.ModuleType.CAPJAVA) ? artifact_management_base_1.ModuleType.CAP : moduleType;
|
|
141
|
+
if (this.moduleManifestGenerators.itemMap.has(moduleDataType)) {
|
|
142
|
+
return this.moduleManifestGenerators.itemMap.get(moduleDataType);
|
|
142
143
|
}
|
|
143
144
|
throw new Error(`Module Type ${moduleType} definition not found.`);
|
|
144
145
|
}
|
|
@@ -174,7 +175,7 @@ class PluginFactory {
|
|
|
174
175
|
}
|
|
175
176
|
getProjectGeneratorFor(projectType) {
|
|
176
177
|
this.loadProjectGenerators();
|
|
177
|
-
const projectDataType = projectType === artifact_management_base_1.ProjectType.LCAP ? artifact_management_base_1.ProjectType.CAP : projectType;
|
|
178
|
+
const projectDataType = (projectType === artifact_management_base_1.ProjectType.LCAP || projectType === artifact_management_base_1.ProjectType.CAPJAVA) ? artifact_management_base_1.ProjectType.CAP : projectType;
|
|
178
179
|
if (this.projectManifestGenerators.itemMap.has(projectDataType)) {
|
|
179
180
|
return this.projectManifestGenerators.itemMap.get(projectDataType);
|
|
180
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PluginFactory.js","sourceRoot":"","sources":["../../../src/definitions/PluginFactory.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"PluginFactory.js","sourceRoot":"","sources":["../../../src/definitions/PluginFactory.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,8 +7,8 @@ const artifact_management_base_1 = require("@sap/artifact-management-base");
|
|
|
7
7
|
const simple_git_1 = __importDefault(require("simple-git"));
|
|
8
8
|
const path_1 = __importDefault(require("path"));
|
|
9
9
|
const mtaFile = 'mta.yaml';
|
|
10
|
-
const autoHiddenFile = '.mta.yaml
|
|
11
|
-
const autoMemoryFile = '.mta.yaml
|
|
10
|
+
const autoHiddenFile = '.mta.snapshot.yaml';
|
|
11
|
+
const autoMemoryFile = '.mta.memory.yaml';
|
|
12
12
|
const autoDiffFile = '.snapshot.diff';
|
|
13
13
|
class MtaMerger {
|
|
14
14
|
constructor(fs) {
|
|
@@ -13,7 +13,8 @@ class CapDbModuleGenerator {
|
|
|
13
13
|
}
|
|
14
14
|
async getModuleManifest(context) {
|
|
15
15
|
const templatePath = __dirname + '/';
|
|
16
|
-
const
|
|
16
|
+
const templateFile = context.project.type === artifact_management_base_1.ProjectType.CAPJAVA ? 'mta-cap-java-db-template.yaml' : 'mta-cap-db-template.yaml';
|
|
17
|
+
const template = await artifact_management_base_1.MtaTemplate.build(templatePath, templateFile, context);
|
|
17
18
|
if (context.project.vendorDependency) {
|
|
18
19
|
template['build-parameters']['ignore'] = [];
|
|
19
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapDbModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapDbModuleGenerator.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"CapDbModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapDbModuleGenerator.ts"],"names":[],"mappings":";;AAAA,4EACqF;AACrF,MAAqB,oBAAoB;IAErC,OAAO;QACH,OAAO,qCAAU,CAAC,GAAG,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,gBAAgB;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,MAAM,YAAY,GAAG,SAAS,GAAG,GAAG,CAAC;QACrC,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,KAAK,sCAAW,CAAC,OAAO,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,0BAA0B,CAAC;QACjI,MAAM,QAAQ,GAAG,MAAM,sCAAW,CAAC,KAAK,CAAC,YAAY,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;QAC9E,IAAI,OAAO,CAAC,OAAO,CAAC,gBAAgB,EAAE;YAClC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;SAC/C;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,QAAQ;QACJ,OAA6B;YACzB,EAAE,WAAW,EAAE,yCAAc,CAAC,KAAK,CAAC,IAAI,EAAE;YAC1C,EAAE,WAAW,EAAE,yCAAc,CAAC,IAAI,CAAC,IAAI,EAAC;SAC3C,CAAC;IACN,CAAC;CACJ;AA9BD,uCA8BC"}
|
|
@@ -66,18 +66,29 @@ class CapDestinationModuleGenerator {
|
|
|
66
66
|
}
|
|
67
67
|
return destinations;
|
|
68
68
|
}
|
|
69
|
+
getDesinationsForWorkzone(context) {
|
|
70
|
+
const destinationData = new artifact_management_base_1.DestinationData();
|
|
71
|
+
destinationData.Name = context.project.name + '-html5-content-dt';
|
|
72
|
+
destinationData.ServiceInstanceName = context.nameFactory.serviceInstanceName('html5-apps-repo', 'runtime');
|
|
73
|
+
destinationData.ServiceKeyName = `${context.nameFactory.serviceInstanceName('html5-apps-repo', 'runtime')}-key`;
|
|
74
|
+
destinationData.URL = 'https://html5-apps-repo-rt.${default-domain}/applications/cdm/' + context.project.cloudService;
|
|
75
|
+
return destinationData;
|
|
76
|
+
}
|
|
69
77
|
getDestinationsToBeCreated(services, context) {
|
|
70
78
|
const servicesNeedingDestination = services.filter((service) => service.createDestination);
|
|
71
79
|
const destinations = [];
|
|
72
80
|
for (const service of servicesNeedingDestination) {
|
|
73
81
|
const destinationType = lodash_1.default.get(service, 'config.destination.type');
|
|
82
|
+
const destinationName = service.name;
|
|
74
83
|
//https://help.sap.com/viewer/cca91383641e40ffbe03bdc78f00f681/Cloud/en-US/8aeea65eb9d64267b554f64a3db8a349.html
|
|
75
84
|
//Read above link to understand about creation of diff destination types creation via Content Types.
|
|
76
85
|
if (destinationType === artifact_management_base_1.DestinationType.DEST_TO_SERVICE_INSTANCE) {
|
|
77
86
|
destinations.push(this.getDestinationToServiceInstanceInfo(service, context, true));
|
|
78
87
|
}
|
|
79
88
|
else /* istanbul ignore else */ if (destinationType === artifact_management_base_1.DestinationType.DEST_TO_RESOURCE_BEHIND_XSUAA) {
|
|
80
|
-
|
|
89
|
+
if (destinationName !== context.nameFactory.destinationToApp('srv') || !context.project.workzone) {
|
|
90
|
+
destinations.push(this.getDestinationToResourceBehindXsuaaInfo(service, context));
|
|
91
|
+
}
|
|
81
92
|
}
|
|
82
93
|
else if (destinationType === artifact_management_base_1.DestinationType.DEST_TO_SERVICE_INSTANCE_NO_CLOUD) {
|
|
83
94
|
destinations.push(this.getDestinationToServiceInstanceInfo(service, context, false));
|
|
@@ -87,6 +98,9 @@ class CapDestinationModuleGenerator {
|
|
|
87
98
|
throw new Error(`Service ${service.name} - ${service.service} - ${service.plan} - destination data incorrectly provided. Check provideResource method of the module.`);
|
|
88
99
|
}
|
|
89
100
|
}
|
|
101
|
+
if (context.project.workzone) {
|
|
102
|
+
destinations.push(this.getDesinationsForWorkzone(context));
|
|
103
|
+
}
|
|
90
104
|
return destinations;
|
|
91
105
|
}
|
|
92
106
|
getDestinationToServiceInstanceInfo(service, context, hasCloud) {
|
|
@@ -130,8 +144,8 @@ class CapDestinationModuleGenerator {
|
|
|
130
144
|
});
|
|
131
145
|
}
|
|
132
146
|
requires(context) {
|
|
133
|
-
const servicesNeedingDestination = context.services.filter((service) => service.createDestination);
|
|
134
147
|
const modRequires = [];
|
|
148
|
+
const servicesNeedingDestination = context.services.filter((service) => service.createDestination);
|
|
135
149
|
for (const service of servicesNeedingDestination) {
|
|
136
150
|
const require = {
|
|
137
151
|
serviceName: service.service,
|
|
@@ -141,7 +155,15 @@ class CapDestinationModuleGenerator {
|
|
|
141
155
|
}
|
|
142
156
|
modRequires.push(require);
|
|
143
157
|
}
|
|
144
|
-
|
|
158
|
+
if (context.project.workzone) {
|
|
159
|
+
modRequires.push({
|
|
160
|
+
serviceName: artifact_management_base_1.ServiceCatalog.html5_apps_repo_runtime.name,
|
|
161
|
+
servicePlan: artifact_management_base_1.ServiceCatalog.html5_apps_repo_runtime.plan,
|
|
162
|
+
parameters: { 'service-key': { name: `${context.nameFactory.serviceInstanceName('html5-apps-repo', 'runtime')}-key` } },
|
|
163
|
+
});
|
|
164
|
+
}
|
|
165
|
+
modRequires.push({
|
|
166
|
+
serviceName: artifact_management_base_1.ServiceCatalog.destination.name,
|
|
145
167
|
parameters: {
|
|
146
168
|
'content-target': true,
|
|
147
169
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapDestinationModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapDestinationModuleGenerator.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAsQ;AACtQ,oDAAuB;AACvB,MAAa,6BAA6B;IAEtC,OAAO;QACH,OAAO,qCAAU,CAAC,GAAG,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAA+B;QACzD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,MAAM,YAAY,GAAU,IAAI,CAAC,0BAA0B,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC,CAAC;QAC1I,MAAM,MAAM,
|
|
1
|
+
{"version":3,"file":"CapDestinationModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapDestinationModuleGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,8 +65,23 @@ class CapProjectGenerator {
|
|
|
65
65
|
plan: artifact_management_base_1.ServiceCatalog.destination.plan,
|
|
66
66
|
type: artifact_management_base_1.ServiceType.CF_MANAGED_SERVICE,
|
|
67
67
|
config: {
|
|
68
|
-
HTML5Runtime_enabled: true,
|
|
68
|
+
HTML5Runtime_enabled: context.project.workzone ? undefined : true,
|
|
69
69
|
version: '1.0.0',
|
|
70
|
+
init_data: context.project.workzone ? {
|
|
71
|
+
subaccount: {
|
|
72
|
+
destinations: [
|
|
73
|
+
{
|
|
74
|
+
'Name': `${context.project.name}-html5-content-rt`,
|
|
75
|
+
'Authentication': 'NoAuthentication',
|
|
76
|
+
'ProxyType': 'Internet',
|
|
77
|
+
'Type': 'HTTP',
|
|
78
|
+
'URL': 'https://${subdomain}.launchpad.${default-domain}',
|
|
79
|
+
'CEP.HTML5contentprovider': true,
|
|
80
|
+
},
|
|
81
|
+
],
|
|
82
|
+
existing_destinations_policy: 'update',
|
|
83
|
+
},
|
|
84
|
+
} : undefined,
|
|
70
85
|
},
|
|
71
86
|
},
|
|
72
87
|
{
|
|
@@ -118,6 +133,10 @@ class CapProjectGenerator {
|
|
|
118
133
|
if (context.project.vendorDependency) {
|
|
119
134
|
template['build-parameters']['after-all'][0].commands = ['npm ci'];
|
|
120
135
|
}
|
|
136
|
+
if (context.project.workzone) {
|
|
137
|
+
const subdomain = process.env['TENANT_SUBDOMAIN'];
|
|
138
|
+
template['parameters']['subdomain'] = subdomain ? subdomain : 'target-domain';
|
|
139
|
+
}
|
|
121
140
|
return template;
|
|
122
141
|
}
|
|
123
142
|
;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapProjectGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapProjectGenerator.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"CapProjectGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapProjectGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,7 +65,8 @@ class CapServiceModuleGenerator {
|
|
|
65
65
|
async getModuleManifest(context) {
|
|
66
66
|
context.url = '${default-url}';
|
|
67
67
|
const templatePath = __dirname + '/';
|
|
68
|
-
const
|
|
68
|
+
const templateFile = context.project.type === artifact_management_base_1.ProjectType.CAPJAVA ? 'mta-cap-java-srv-template.yaml' : 'mta-cap-srv-template.yaml';
|
|
69
|
+
const template = await artifact_management_base_1.MtaTemplate.build(templatePath, templateFile, context);
|
|
69
70
|
if (context.project.vendorDependency) {
|
|
70
71
|
template['build-parameters']['ignore'] = [];
|
|
71
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapServiceModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapServiceModuleGenerator.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"CapServiceModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapServiceModuleGenerator.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,10 +8,16 @@ class CapUIDeployerGenerator {
|
|
|
8
8
|
async provideResources() {
|
|
9
9
|
return [];
|
|
10
10
|
}
|
|
11
|
-
async beforeBuildCommands() {
|
|
12
|
-
|
|
11
|
+
async beforeBuildCommands(context) {
|
|
12
|
+
const defaultCommands = [
|
|
13
|
+
'rm -rf build/ui-deployer',
|
|
13
14
|
'mkdir -p build/ui-deployer',
|
|
14
15
|
];
|
|
16
|
+
const workzoneCommands = [
|
|
17
|
+
'mkdir -p build/ui-deployer/resources',
|
|
18
|
+
'cp workzone/cdm.json build/ui-deployer/resources/cdm.json',
|
|
19
|
+
];
|
|
20
|
+
return context.project.workzone ? defaultCommands.concat(workzoneCommands) : defaultCommands;
|
|
15
21
|
}
|
|
16
22
|
async getModuleManifest(context) {
|
|
17
23
|
context.moduleName = context.nameFactory.auxModuleName('ui-deployer');
|
|
@@ -28,14 +34,41 @@ class CapUIDeployerGenerator {
|
|
|
28
34
|
}
|
|
29
35
|
}
|
|
30
36
|
module['build-parameters'].requires = artifacts;
|
|
37
|
+
if (context.project.workzone) {
|
|
38
|
+
module['parameters'] = {
|
|
39
|
+
'config': {
|
|
40
|
+
'destinations': [
|
|
41
|
+
{
|
|
42
|
+
'forwardAuthToken': true,
|
|
43
|
+
'name': context.nameFactory.destinationToApp('srv'),
|
|
44
|
+
'url': '~{srv-api/srv-url}',
|
|
45
|
+
},
|
|
46
|
+
],
|
|
47
|
+
},
|
|
48
|
+
};
|
|
49
|
+
}
|
|
31
50
|
return module;
|
|
32
51
|
}
|
|
33
|
-
requires() {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
52
|
+
requires(context) {
|
|
53
|
+
const htmlRepo = {
|
|
54
|
+
serviceName: artifact_management_base_1.ServiceCatalog.html5_apps_repo_host.name,
|
|
55
|
+
servicePlan: artifact_management_base_1.ServiceCatalog.html5_apps_repo_host.plan,
|
|
56
|
+
parameters: { 'content-target': true },
|
|
57
|
+
};
|
|
58
|
+
if (context.project.workzone) {
|
|
59
|
+
const workzoneRequires = [{
|
|
60
|
+
serviceName: 'capservice',
|
|
61
|
+
},
|
|
62
|
+
{
|
|
63
|
+
serviceName: 'xsuaa',
|
|
64
|
+
},
|
|
65
|
+
htmlRepo,
|
|
66
|
+
];
|
|
67
|
+
return workzoneRequires;
|
|
68
|
+
}
|
|
69
|
+
else {
|
|
70
|
+
return [htmlRepo];
|
|
71
|
+
}
|
|
39
72
|
}
|
|
40
73
|
}
|
|
41
74
|
exports.default = CapUIDeployerGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CapUIDeployerGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapUIDeployerGenerator.ts"],"names":[],"mappings":";;AAAA,
|
|
1
|
+
{"version":3,"file":"CapUIDeployerGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapUIDeployerGenerator.ts"],"names":[],"mappings":";;AAAA,4EAGuC;AACvC,MAAqB,sBAAsB;IACvC,OAAO;QACH,OAAO,qCAAU,CAAC,GAAG,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,gBAAgB;QACzB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,OAA+B;QACrD,MAAM,eAAe,GAAG;YACpB,0BAA0B;YAC1B,4BAA4B;SAC/B,CAAC;QAEF,MAAM,gBAAgB,GAAG;YACrB,sCAAsC;YACtC,2DAA2D;SAC9D,CAAC;QAEF,OAAO,OAAO,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC;IACjG,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;QACtE,MAAM,YAAY,GAAG,SAAS,GAAG,GAAG,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,sCAAW,CAAC,KAAK,CAAC,YAAY,EAAE,+BAA+B,EAAE,OAAO,CAAC,CAAC;QAC/F,MAAM,SAAS,GAAQ,EAAE,CAAC;QAC1B,KAAK,MAAM,SAAS,IAAI,OAAO,CAAC,YAAY,EAAE;YAC1C,IAAI,SAAS,CAAC,IAAI,KAAK,OAAO,EAAE;gBAC5B,SAAS,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,SAAS,CAAC,IAAI;oBACpB,SAAS,EAAE,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,aAAa,CAAC;oBACxD,aAAa,EAAE,WAAW;iBAC7B,CAAC,CAAC;aACN;SACJ;QACD,MAAM,CAAC,kBAAkB,CAAC,CAAC,QAAQ,GAAG,SAAS,CAAC;QAEhD,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC1B,MAAM,CAAC,YAAY,CAAC,GAAG;gBACnB,QAAQ,EAAE;oBACN,cAAc,EAAE;wBACZ;4BACI,kBAAkB,EAAE,IAAI;4BACxB,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC;4BACnD,KAAK,EAAE,oBAAoB;yBAC9B;qBACJ;iBACJ;aACJ,CAAC;SACL;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,QAAQ,CAAC,OAA+B;QACpC,MAAM,QAAQ,GAAG;YACb,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI;YACrD,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI;YACrD,UAAU,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE;SACzC,CAAC;QAEF,IAAI,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE;YAC1B,MAAM,gBAAgB,GAAG,CAAC;oBACtB,WAAW,EAAE,YAAY;iBAC5B;gBACD;oBACI,WAAW,EAAE,OAAO;iBACvB;gBACD,QAAQ;aACP,CAAC;YACF,OAAO,gBAAgB,CAAC;SAC3B;aAAM;YACH,OAAO,CAAC,QAAQ,CAAC,CAAC;SACrB;IAEL,CAAC;CACJ;AA7ED,yCA6EC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
name: <%- project.prefix %>-srv
|
|
2
|
+
type: java
|
|
3
|
+
path: srv
|
|
4
|
+
parameters:
|
|
5
|
+
buildpack: sap_java_buildpack_jakarta
|
|
6
|
+
readiness-health-check-type: http
|
|
7
|
+
readiness-health-check-http-endpoint: /actuator/health/readiness
|
|
8
|
+
properties:
|
|
9
|
+
SPRING_PROFILES_ACTIVE: cloud,sandbox
|
|
10
|
+
JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']"
|
|
11
|
+
JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }'
|
|
12
|
+
provides:
|
|
13
|
+
- name: srv-api
|
|
14
|
+
properties:
|
|
15
|
+
srv-url: <%- url %>
|
|
16
|
+
build-parameters:
|
|
17
|
+
builder: custom
|
|
18
|
+
commands:
|
|
19
|
+
- mvn clean package -DskipTests=true --batch-mode
|
|
20
|
+
build-result: target/*-exec.jar
|
|
@@ -121,7 +121,7 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
|
|
|
121
121
|
const serviceRefs = {};
|
|
122
122
|
const allMatchedFiles = Object.values(matchedFiles).reduce((result, val) => result.concat(val), []);
|
|
123
123
|
const capApi = new artifact_management_base_1.CapApi(fs, allMatchedFiles);
|
|
124
|
-
const modelArr = await PathUtil_1.default.
|
|
124
|
+
const modelArr = await PathUtil_1.default.getExternalServiceInfo(fs);
|
|
125
125
|
await capApi.load();
|
|
126
126
|
const itemTags = Array.from(this.itemTags);
|
|
127
127
|
const additionalTag = await this.getMappedFolderType(fs.relativeToRoot() + '/', fs);
|
|
@@ -141,7 +141,15 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
|
|
|
141
141
|
const path = fs.relativeToRootFromAbsolutePath(location);
|
|
142
142
|
const pathParts = path.split(/\./);
|
|
143
143
|
const attrPath = pathParts[0].split('\\').join('/');
|
|
144
|
-
|
|
144
|
+
let external = false;
|
|
145
|
+
let kind = '';
|
|
146
|
+
for (const modelItem of modelArr.values()) {
|
|
147
|
+
if (modelItem.model === attrPath) {
|
|
148
|
+
external = true;
|
|
149
|
+
kind = modelItem.kind;
|
|
150
|
+
break;
|
|
151
|
+
}
|
|
152
|
+
}
|
|
145
153
|
const item = {
|
|
146
154
|
type: artifact_management_base_1.ItemType.CAPService,
|
|
147
155
|
name: service.name,
|
|
@@ -150,11 +158,15 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
|
|
|
150
158
|
external,
|
|
151
159
|
tags: itemTags,
|
|
152
160
|
};
|
|
153
|
-
if (
|
|
161
|
+
if (kind) {
|
|
154
162
|
item.info = {
|
|
155
|
-
|
|
163
|
+
kind: kind,
|
|
156
164
|
};
|
|
157
165
|
}
|
|
166
|
+
if (service['@PersonalDataManagerService']) {
|
|
167
|
+
item.info = item.info ? item.info : {};
|
|
168
|
+
item.info.isPDMService = true;
|
|
169
|
+
}
|
|
158
170
|
else {
|
|
159
171
|
ItemUtil_1.default.addLinkToRoles(service, item);
|
|
160
172
|
}
|
|
@@ -176,7 +188,13 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
|
|
|
176
188
|
const path = fs.relativeToRootFromAbsolutePath(location).split('\\').join('/');
|
|
177
189
|
const pathParts = path.split(/\./);
|
|
178
190
|
const attrPath = pathParts[0].split('\\').join('/');
|
|
179
|
-
|
|
191
|
+
let external = false;
|
|
192
|
+
for (const modelItem of modelArr.values()) {
|
|
193
|
+
if (modelItem.model === attrPath) {
|
|
194
|
+
external = true;
|
|
195
|
+
break;
|
|
196
|
+
}
|
|
197
|
+
}
|
|
180
198
|
const entityNamePartsLast = entityNameParts[entityNameParts.length - 1];
|
|
181
199
|
const entityName = external ? entity.name : entityNamePartsLast;
|
|
182
200
|
// Add service entity items
|
|
@@ -454,7 +472,7 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
|
|
|
454
472
|
for (const pattern of Object.keys(matchedFiles)) {
|
|
455
473
|
files = files.concat(matchedFiles[pattern]);
|
|
456
474
|
}
|
|
457
|
-
const modelArr = await PathUtil_1.default.
|
|
475
|
+
const modelArr = await PathUtil_1.default.getExternalServiceInfo(fs);
|
|
458
476
|
const externalServices = await this.getExtenalServices(fs, modelArr);
|
|
459
477
|
for (const file of files) {
|
|
460
478
|
const path = fs.relativeToRoot(file).split('\\').join('/'); //> db/data/sap.ui.riskmanagement-Mitigations.csv OR srv/external/data/API_BUSINESS_PARTNER-A_BusinessPartner.csv
|
|
@@ -466,8 +484,8 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
|
|
|
466
484
|
* fileNameParts = [sap.ui.riskmanagement, Mitigations] on split of sap.ui.riskmanagement-Mitigations
|
|
467
485
|
*/
|
|
468
486
|
let external = false;
|
|
469
|
-
for (const
|
|
470
|
-
if (model.includes(fileNameParts[0])) {
|
|
487
|
+
for (const modelItem of modelArr.values()) {
|
|
488
|
+
if (modelItem.model.includes(fileNameParts[0])) {
|
|
471
489
|
external = true;
|
|
472
490
|
break;
|
|
473
491
|
}
|
|
@@ -571,8 +589,8 @@ class CapModuleReader extends artifact_management_base_1.ModuleReader {
|
|
|
571
589
|
if (modelArr.size > 0) {
|
|
572
590
|
const rootFS = artifact_management_base_1.FileSystemFactory.getFileSystem(fs.rootPath);
|
|
573
591
|
const allMatchedFiles = [];
|
|
574
|
-
for (const
|
|
575
|
-
allMatchedFiles.push(`${model}.cds`);
|
|
592
|
+
for (const modelItem of modelArr.values()) {
|
|
593
|
+
allMatchedFiles.push(`${modelItem.model}.cds`);
|
|
576
594
|
}
|
|
577
595
|
if (allMatchedFiles.length > 0) {
|
|
578
596
|
const capApi = new artifact_management_base_1.CapApi(rootFS, allMatchedFiles);
|