npm - @sap/artifact-management - Versions diffs - 1.7.0 → 1.9.0 - Mend

@sap/artifact-management 1.7.0 → 1.9.0

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.

Files changed (46) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,19 @@
+## 1.9.0 - 24 March, 2022
+### Added
+* Added support to create destination to workflow instance on deploy.
+## 1.8.1 - 17 March, 2022
+### Fixed
+* Duplicate MDK UI apps fixed.
+## 1.8.0 - 10 March, 2022
+### Added
+* Added support for Delta-build.
+* Added support for Delta-deploy.
+### Fixed
+* Fixed Deploy failure issue when MDK Task UI app uses Document FormCell control.
+* Fixed issue where wrong MDK display name was returned to homepage.
+* Fixed issue where incorrect description of role is added to mta.yaml.
+* Fixed Deploy failure issue if Role Collection already exists in this subaccount.
 ## 1.7.0 - 24 February, 2022
 ### Added
 * Added support for Personal Data Manager.

package/README.md CHANGED Viewed

@@ -475,6 +475,78 @@ resources:
 ```
+---
+## Capability to generate MTA yaml and MTAD yaml
+###### Method
+`buildV2(options? : MtaGeneratorSettings, logger? : IChildLogger) : Promise<void>;`
+###### Description
+Generate manifest for the project and the modules specified in .status_tracker file and create a `mta.yaml` and `mtad.yaml` file.
+###### Parameters
+- options: (Optional) `MtaGeneratorSettings` build options.
+- logger: (Optional) An instance of IChildLogger which can be implemented by consumers of this library.
+###### returns
+- `Promise<void>`
+###### Example
+```
+const api = new ProjectImpl(projectPath);
+await api.buildV2();
+```
+###### CLI
+```
+dev-project buildV2  <my-application-folder-root absolute path>
+```
+###### Sample Output
+```
+_schema-version: '3.1'
+ID: DemoProject
+version: 1.0.0
+description: A simple CAP project.
+parameters:
+  enable-parallel-deployments: true
+build-parameters:
+  before-all:
+    - builder: custom
+      commands:
+        - bash -c "cds compile srv --to xsuaa > xs-security.json"
+    - builder: custom
+      commands:
+        - npm install --production
+        - >-
+          bash -c "cds -v 2>/dev/null >/dev/null || npm install --no-save
+          @sap/cds-dk"
+        - npx cds build --production
+modules:
+  - name: DemoProject-db-deployer
+    type: hdb
+    path: gen/db
+    parameters:
+      buildpack: nodejs_buildpack
+    build-parameters:
+      builder: npm
+      ignore:
+        - node_modules
+    requires:
+      - name: DemoProject-service-uaa
+      - name: DemoProject-service-db
+    ...
+    ...
+    ...
+resources:
+  - type: org.cloudfoundry.managed-service
+    name: DemoProject-service-uaa
+    parameters:
+      service: xsuaa
+      service-plan: application
+      service-name: DemoProject-uaa
+      path: xs-security.json
+    ...
+    ...
+    ...
+```
 #### Get MTA Manifest content
 ###### Method
 `getManifest(logger? : IChildLogger) : Promise<any>;`
@@ -543,6 +615,28 @@ dev-project deploy  <my-application-folder-root absolute path>
 ---
+## Deployment of MTAR to Cloud Foundry
+###### Method
+`deployV2(logger? : IChildLogger) : Promise<void>;`
+###### Description
+Generate the `<app-name>.mtar` file based on contents of .status_tracker file and deploy to currently targeted CF space.
+###### Parameters
+- logger: (Optional) An instance of IChildLogger which can be implemented by consumers of this library.
+###### returns
+- `Promise<void>`
+###### Example
+```
+const api = new ProjectImpl(projectPath);
+await api.deployV2();
+```
+###### CLI
+Build and deploy in one step
+```
+dev-project deployV2  <my-application-folder-root absolute path>
+```
+---
 ## Get Project Overview URL
 ###### Method
 `getProjectOverviewURL(logger? : IChildLogger) : Promise<string | undefined>;`

package/dist/src/cp/CFProjectBuilder.js CHANGED Viewed

@@ -11,11 +11,16 @@ const _ = require("lodash");
 const path_1 = require("path");
 const XsSecurityModuleManifestGenerator_1 = __importDefault(require("../plugins/xsuaa/generators/XsSecurityModuleManifestGenerator"));
 const OverviewPageGenerator_1 = __importDefault(require("./OverviewPageGenerator"));
+const UI5ModuleGenerator_1 = __importDefault(require("../plugins/ui5/generators/UI5ModuleGenerator"));
+const artifact_management_mdkplugin_1 = require("@sap/artifact-management-mdkplugin");
+const CapLaunchpadGenerator_1 = __importDefault(require("../plugins/cap/generators/CapLaunchpadGenerator"));
+const path_2 = __importDefault(require("path"));
 class CFProjectBuilder {
     constructor(project, fs) {
         this.resources = [];
         this.requiredServices = new Set();
         this.moduleContext = [];
+        this.moduleCommandMap = new Map();
         this.project = project;
         if (project.modules) {
             this.project.modules = project.modules.filter(module => this.filterWorkflowModule(module));
@@ -38,16 +43,81 @@ class CFProjectBuilder {
         await this.generateManifest();
         await this.buildMtar();
     }
-    async generateManifest() {
+    async buildV2() {
+        await this.buildFs.mkdir('.', { recursive: true });
+        await this.generateManifest(true);
+        const modulesToBuild = await this.readStatusTracker();
+        if (modulesToBuild.length > 0) {
+            await this.executePreBuildCommands(modulesToBuild);
+            const moduleNamesToBuild = this.generateModuleNamesToDeploy(modulesToBuild, ',');
+            await this.buildMtad(moduleNamesToBuild);
+        }
+    }
+    async executePreBuildCommands(modulesToBuild) {
+        let modulesPathAndCommands = [];
+        const beforeAllContents = this.moduleCommandMap.get('before-all');
+        if (beforeAllContents) {
+            modulesPathAndCommands = modulesPathAndCommands.concat(beforeAllContents);
+        }
+        for (const moduleToBuild of modulesToBuild) {
+            const modulesMap = this.moduleCommandMap.get(moduleToBuild);
+            if (modulesMap) {
+                modulesPathAndCommands = modulesPathAndCommands.concat(modulesMap);
+            }
+        }
+        if (modulesPathAndCommands.length > 0) {
+            for (const modulePathAndCommand of modulesPathAndCommands) {
+                const path = modulePathAndCommand.path.length > 0 ? modulePathAndCommand.path : '';
+                for (const command of modulePathAndCommand.commands) {
+                    await artifact_management_base_1.Util.execute(command, path_2.default.join(this.fs.rootPath, path));
+                }
+            }
+        }
+    }
+    generateModuleNamesToDeploy(modulesToBuild, separator) {
+        const moduleNames = [];
+        for (const module of modulesToBuild) {
+            moduleNames.push(this.nameFactory.getPrefix() + module);
+        }
+        return moduleNames.join(separator);
+    }
+    async readStatusTracker() {
+        let modules;
+        try {
+            modules = await this.fs.readJson('.status_tracker');
+        }
+        catch (error) {
+            artifact_management_base_1.getLogger().error(error);
+        }
+        const modulesToBuild = [];
+        for (const [module, flag] of Object.entries(modules)) {
+            if (flag) {
+                modulesToBuild.push(module);
+            }
+        }
+        return modulesToBuild;
+    }
+    async generateManifest(isDeltaBuild = false) {
         this.projectManifestGenerator = PluginFactory_1.default.getProjectGeneratorFor(this.project.type);
         const mta = await this.projectManifestGenerator.getProjectManifest(this.projectGeneratorContext);
         const builder = new MtaBuilder_1.default(this.fs, mta);
         this.moduleGenerators = this.getModuleGenerators();
         await this.getResourcesProvidedByGenerators();
-        await this.generateMtaModules(builder);
+        await this.generateMtaModules(builder, isDeltaBuild);
         await this.generateOverviewApplication();
         this.addResources(builder);
         const mtaObject = await builder.generate();
+        if (isDeltaBuild) {
+            const buildParameters = mta['build-parameters'];
+            const beforeAllPathAndCommands = [];
+            for (const content of buildParameters['before-all']) {
+                beforeAllPathAndCommands.push({
+                    path: '',
+                    commands: content.commands,
+                });
+            }
+            this.moduleCommandMap.set('before-all', beforeAllPathAndCommands);
+        }
         const yamlString = js_yaml_1.default.dump(mtaObject, { skipInvalid: true });
         await this.fs.writeTextFile('mta.yaml', yamlString);
     }
@@ -77,13 +147,32 @@ class CFProjectBuilder {
         }
         this.resources.push(...this.projectManifestGenerator.provideResources(this.projectGeneratorContext));
     }
-    async generateMtaModules(builder) {
+    async generateMtaModules(builder, isDeltaBuild) {
         const builtModules = [];
         for (let idx = 0; idx < this.moduleGenerators.length; idx++) {
             const moduleGeneratorContext = _.get(this.moduleContext, idx, this.projectGeneratorContext);
             moduleGeneratorContext.builtModules = builtModules;
             moduleGeneratorContext.services = this.resources;
             const module = await this.moduleGenerators[idx].getModuleManifest(moduleGeneratorContext);
+            if (isDeltaBuild && module && module['build-parameters'] && module['build-parameters'].commands) {
+                switch (this.moduleGenerators[idx].constructor.name) {
+                    case UI5ModuleGenerator_1.default.name:
+                    case artifact_management_mdkplugin_1.MdkModuleGenerator.name:
+                    case CapLaunchpadGenerator_1.default.name:
+                        let uiCommands = this.moduleCommandMap.get('aux-ui-deployer');
+                        if (!uiCommands) {
+                            uiCommands = [];
+                        }
+                        uiCommands.push({
+                            path: module.path,
+                            commands: module['build-parameters'].commands,
+                        });
+                        this.moduleCommandMap.set('aux-ui-deployer', uiCommands);
+                        break;
+                    default:
+                        break;
+                }
+            }
             const buildCommands = await this.moduleGenerators[idx].beforeBuildCommands(moduleGeneratorContext);
             builder.addBeforeBuildCommand(...buildCommands);
             if (module !== null) {
@@ -162,10 +251,37 @@ class CFProjectBuilder {
         const cmd = /^win/.test(process.platform) ? 'mbt.cmd' : 'mbt';
         await artifact_management_base_1.Util.exec({ cwd: this.fs.rootPath }, cmd, 'build', `--mtar=${this.mtarFileName()}`);
     }
+    async buildMtad(moduleNamesToBuild) {
+        const cmd = /^win/.test(process.platform) ? 'mbt.cmd' : 'mbt';
+        const buildCommand = `${cmd} module-build -m ${moduleNamesToBuild} -g -p=cf`;
+        await artifact_management_base_1.Util.execute(buildCommand, this.fs.rootPath);
+    }
     async deploy() {
         console.log('-> Deploying mtar file...>');
         await artifact_management_base_1.Util.exec({ cwd: this.fs.rootPath }, 'cf', 'deploy', `mta_archives/${this.mtarFileName()}`, '-f');
     }
+    async deployV2() {
+        const modulesToDeploy = await this.readStatusTracker();
+        if (modulesToDeploy.length > 0) {
+            const moduleNamesToDeploy = this.generateModuleNamesToDeploy(modulesToDeploy, ' -m ');
+            artifact_management_base_1.getLogger().info(`cf deploy -m ${moduleNamesToDeploy}`);
+            console.log('-> Generating and Deploying mtar file...>');
+            await artifact_management_base_1.Util.execute(`cf deploy -m ${moduleNamesToDeploy}`, this.fs.rootPath);
+            const deployStatus = await artifact_management_base_1.Util.execute(`cf mta-ops --mta ${this.project.name} --last 1 | sed '1,3d' | head -1`, this.fs.rootPath);
+            if (deployStatus && deployStatus.stdout) {
+                const status = deployStatus.stdout.match(/FINISHED|ERROR|RUNNING|ABORTED/);
+                if (status[0] === 'FINISHED') {
+                    const statusTrackerContent = {
+                        'db-deployer': false,
+                        'srv': false,
+                        'workflow': false,
+                        'aux-ui-deployer': false,
+                    };
+                    await this.fs.writeJSON('.status_tracker', statusTrackerContent);
+                }
+            }
+        }
+    }
     async updateDeployedTime() {
         console.log('-> Updating deployed time to User Provided Service...>');
         await artifact_management_base_1.Util.exec({ cwd: this.fs.rootPath }, 'cf', 'update-user-provided-service', `${this.project.name}-metadata`, '-t', `DeployedUTCTime: ${new Date().toISOString()}`);

package/dist/src/cp/CFProjectBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CFProjectBuilder.js","sourceRoot":"","sources":["../../../src/cp/CFProjectBuilder.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"CFProjectBuilder.js","sourceRoot":"","sources":["../../../src/cp/CFProjectBuilder.ts"],"names":[],"mappings":"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"}

package/dist/src/plugins/cap/generators/CapServiceModuleGenerator.js CHANGED Viewed

@@ -43,7 +43,7 @@ class CapServiceModuleGenerator {
                             '$ACCEPT_GRANTED_AUTHORITIES',
                         ],
                     },
-                    'fullyQualifiedApplicationName': context.nameFactory.getPrefix() + '-${space}-${org}',
+                    'fullyQualifiedApplicationName': context.nameFactory.getPrefix() + '${space}-${org}',
                     'appConsentServiceEnabled': true,
                 },
             };
@@ -76,8 +76,8 @@ class CapServiceModuleGenerator {
                 serviceName: artifact_management_base_1.ServiceCatalog.personal_data_manager.name,
                 parameters: {
                     'config': {
-                        'fullyQualifiedApplicationName': context.nameFactory.getPrefix() + '-${space}-${org}',
-                        'fullyQualifiedModuleName': context.nameFactory.getPrefix() + '-${space}-${org}',
+                        'fullyQualifiedApplicationName': context.nameFactory.getPrefix() + '${space}-${org}',
+                        'fullyQualifiedModuleName': context.nameFactory.getPrefix() + '${space}-${org}',
                         'applicationTitle': `${context.project.name} for LCAP`,
                         'applicationTitleKey': `${context.project.name} for LCAP`,
                         'applicationURL': '${default-url}',

package/dist/src/plugins/cap/generators/CapServiceModuleGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"CapServiceModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapServiceModuleGenerator.ts"],"names":[],"mappings":";;AAAA,4EAC0I;AAC1I,MAAqB,yBAAyB;IAE1C,OAAO;QACH,OAAO,qCAAU,CAAC,GAAG,CAAC;IAC1B,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAA+B;QACzD,MAAM,SAAS,GAAU,CAAC;gBACtB,OAAO,EAAG,yCAAc,CAAC,UAAU,CAAC,IAAI;gBACxC,IAAI,EAAE,yCAAc,CAAC,UAAU,CAAC,IAAI;gBACpC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;gBACtD,IAAI,EAAE,sCAAW,CAAC,WAAW;gBAC7B,iBAAiB,EAAE,IAAI;gBACvB,MAAM,EAAE;oBACJ,GAAG,EAAE,oBAAoB;oBACzB,cAAc,EAAE,SAAS;oBACzB,WAAW,EAAE;wBACT,IAAI,EAAE,0CAAe,CAAC,6BAA6B;wBACnD,cAAc,EAAE,6CAAkB,CAAC,uBAAuB;qBAC7D;iBACJ;aACJ;YACD;gBACI,OAAO,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI;gBACrC,IAAI,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI;gBAClC,IAAI,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE;gBAC9D,IAAI,EAAE,sCAAW,CAAC,wBAAwB;gBAC1C,MAAM,EAAE;oBACJ,gBAAgB,EAAE,mBAAmB;iBACxC;aACJ,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE;YACjC,MAAM,WAAW,GAAG;gBAChB,OAAO,EAAE,yCAAc,CAAC,qBAAqB,CAAC,IAAI;gBAClD,IAAI,EAAE,yCAAc,CAAC,qBAAqB,CAAC,IAAI;gBAC/C,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC;gBACpD,IAAI,EAAE,sCAAW,CAAC,kBAAkB;gBACpC,MAAM,EAAE;oBACJ,aAAa,EAAE;wBACX,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,UAAU;wBACvD,aAAa,EAAC;4BACV,6BAA6B;yBAChC;qBACJ;oBACD,+BAA+B,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,~~kBAAkB~~;~~oBACrF~~,0BAA0B,EAAE,IAAI;iBACnC;aACJ,CAAC;YACF,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;SAC/B;QAED,OAAO,SAAS,CAAC;QACjB,yFAAyF;QACzF,iGAAiG;IACrG,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;QACnD,OAAO,CAAC,GAAG,GAAG,gBAAgB,CAAC;QAC/B,MAAM,YAAY,GAAG,SAAS,GAAG,GAAG,CAAC;QACrC,OAAO,MAAM,sCAAW,CAAC,KAAK,CAAC,YAAY,EAAE,2BAA2B,EAAE,OAAO,CAAC,CAAC;IACvF,CAAC;IAED,QAAQ,CAAC,OAA+B;QACpC,MAAM,gBAAgB,GAAU;YAC5B,EAAE,WAAW,EAAE,yCAAc,CAAC,KAAK,CAAC,IAAI,EAAE;YAC1C,EAAE,WAAW,EAAE,yCAAc,CAAC,IAAI,CAAC,IAAI,EAAE;YACzC,EAAE,WAAW,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;YAC7D,EAAE,WAAW,EAAE,yCAAc,CAAC,WAAW,CAAC,IAAI,EAAE;YAChD,EAAE,WAAW,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC7C,EAAE,WAAW,EAAE,yCAAc,CAAC,YAAY,CAAC,IAAI,EAAE;SACpD,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACvD,IAAI,cAAc,EAAE;YAChB,MAAM,UAAU,GAAG;gBACf,WAAW,EAAE,yCAAc,CAAC,qBAAqB,CAAC,IAAI;gBACtD,UAAU,EAAE;oBACR,QAAQ,EAAC;wBACL,+BAA+B,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,~~kBAAkB~~;~~wBACrF~~,0BAA0B,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,EAAE,GAAG,~~kBAAkB~~;~~wBAChF~~,kBAAkB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,WAAW;wBACtD,qBAAqB,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,WAAW;wBACzD,gBAAgB,EAAE,gBAAgB;wBAClC,WAAW,EAAE,CAAC;gCACV,MAAM,EAAE,SAAS;gCACjB,aAAa,EAAE,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC;gCAC7D,cAAc,EAAE,yCAAyC;gCACzD,iBAAiB,EAAE,yCAAyC;gCAC5D,YAAY,EAAE,cAAc,CAAC,GAAG;gCAChC,sBAAsB,EAAE,IAAI;gCAC5B,cAAc,EAAE,UAAU;6BAC7B,CAAC;qBAEL;iBACJ;aACJ,CAAC;YACF,gBAAgB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SACrC;QACD,OAAO,gBAAgB,CAAC;IAC5B,CAAC;IACO,iBAAiB,CAAC,OAA+B;QACrD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;YAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;gBACvB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAG;oBAC9B,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,EAAE;wBAClF,OAAO,IAAI,CAAC;qBACf;iBACJ;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CAEJ;AAtHD,4CAsHC"}
1	+ {"version":3,"file":"CapServiceModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/cap/generators/CapServiceModuleGenerator.ts"],"names":[],"mappings":"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"}

package/dist/src/plugins/workflow/generators/WorkflowModuleGenerator.js CHANGED Viewed

@@ -12,6 +12,13 @@ class WorkflowModuleGenerator {
                 service: artifact_management_base_1.ServiceCatalog.workflow.name,
                 plan: artifact_management_base_1.ServiceCatalog.workflow.plan,
                 type: artifact_management_base_1.ServiceType.CF_MANAGED_SERVICE,
+                createDestination: true,
+                config: {
+                    destination: {
+                        type: artifact_management_base_1.DestinationType.DEST_TO_SERVICE_INSTANCE_NO_CLOUD,
+                        authentication: artifact_management_base_1.AuthenticationType.OAuth2JWTBearer,
+                    },
+                },
             }];
     }
     async beforeBuildCommands() {

package/dist/src/plugins/workflow/generators/WorkflowModuleGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"WorkflowModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/workflow/generators/WorkflowModuleGenerator.ts"],"names":[],"mappings":";;AAAA,~~4EACqG~~;~~AAErG~~,MAAqB,uBAAuB;IAExC,OAAO;QACH,OAAO,qCAAU,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAA+B;QACzD,wFAAwF;QACxF,OAAO,CAAC;gBACJ,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,CAAC;gBACzD,OAAO,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI;gBACrC,IAAI,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI;gBAClC,IAAI,EAAE,sCAAW,CAAC,kBAAkB;~~aACvC~~,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;;QACnD,0BAA0B;QAC1B,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9D,MAAM,MAAM,GAAc;gBACtB,IAAI,EAAG,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAK,CAAC;gBAC5D,IAAI,EAAG,wCAAa,CAAC,mBAAmB;gBACxC,IAAI,EAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAK;aAC/B,CAAC;YACF,OAAO,MAAM,CAAC;SACjB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ;QACJ,OAAO;YACH,EAAE,WAAW,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAC;YACrF,EAAE,WAAW,EAAE,yCAAc,CAAC,KAAK,CAAC,IAAI,EAAC;YACzC,EAAE,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE;SACnH,CAAC;IACN,CAAC;CACJ;~~AAxCD~~,~~0CAwCC~~"}
1	+ {"version":3,"file":"WorkflowModuleGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/workflow/generators/WorkflowModuleGenerator.ts"],"names":[],"mappings":";;AAAA,4EAC0I;AAE1I,MAAqB,uBAAuB;IAExC,OAAO;QACH,OAAO,qCAAU,CAAC,QAAQ,CAAC;IAC/B,CAAC;IAEM,KAAK,CAAC,gBAAgB,CAAC,OAA+B;QACzD,wFAAwF;QACxF,OAAO,CAAC;gBACJ,IAAI,EAAE,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,CAAC;gBACzD,OAAO,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI;gBACrC,IAAI,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI;gBAClC,IAAI,EAAE,sCAAW,CAAC,kBAAkB;gBACpC,iBAAiB,EAAE,IAAI;gBACvB,MAAM,EAAE;oBACJ,WAAW,EAAE;wBACT,IAAI,EAAE,0CAAe,CAAC,iCAAiC;wBACvD,cAAc,EAAE,6CAAkB,CAAC,eAAe;qBAErD;iBACJ;aACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA+B;;QACnD,0BAA0B;QAC1B,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YAC9D,MAAM,MAAM,GAAc;gBACtB,IAAI,EAAG,OAAO,CAAC,WAAW,CAAC,UAAU,CAAC,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAK,CAAC;gBAC5D,IAAI,EAAG,wCAAa,CAAC,mBAAmB;gBACxC,IAAI,EAAG,MAAA,OAAO,CAAC,MAAM,0CAAE,IAAK;aAC/B,CAAC;YACF,OAAO,MAAM,CAAC;SACjB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ;QACJ,OAAO;YACH,EAAE,WAAW,EAAE,yCAAc,CAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,EAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAC;YACrF,EAAE,WAAW,EAAE,yCAAc,CAAC,KAAK,CAAC,IAAI,EAAC;YACzC,EAAE,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,yCAAc,CAAC,oBAAoB,CAAC,IAAI,EAAE;SACnH,CAAC;IACN,CAAC;CACJ;AAhDD,0CAgDC"}

package/dist/src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.js CHANGED Viewed

@@ -72,9 +72,21 @@ class XsSecurityModuleManifestGenerator {
         const roleCollections = [];
         if (scopes && scopes.length) {
             for (const scope of scopes) {
+                let description = scope.description;
+                try {
+                    const roles = await fs.readJson('roles.roledefault');
+                    const scopeName = scope.name.split('.')[1];
+                    for (const role of roles) {
+                        if (role.Name === scopeName) {
+                            description = role.Description;
+                            break;
+                        }
+                    }
+                }
+                catch (error) { }
                 const roleCollection = {
-                    description: scope.description,
-                    name: scope.name.split('.')[1] + '-${space}',
+                    description: description,
+                    name: this.sec.xsappname + '-' + scope.name.split('.')[1] + '-${space}',
                     'role-template-references': [scope.name],
                 };
                 roleCollections.push(roleCollection);

package/dist/src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"XsSecurityModuleManifestGenerator.js","sourceRoot":"","sources":["../../../../../src/plugins/xsuaa/generators/XsSecurityModuleManifestGenerator.ts"],"names":[],"mappings":"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~~cAAc~~,GAAG;~~oBACnB~~,~~WAAW~~,EAAE,KAAK,CAAC,WAAW;~~oBAC9B~~,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW;~~oBAC5C~~,0BAA0B,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;iBAC3C,CAAC;gBACF,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACxC;SACJ;QACD,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,iBAAiB,CAAC,OAA+B;QACrD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;YAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;gBACvB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAG;oBAC9B,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,EAAE;wBAClF,OAAO,IAAI,CAAC;qBACf;iBACJ;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;~~AA1GD~~,~~oDA0GC~~"}
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,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC;QACvC,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC/B,MAAM,+BAAI,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,kBAAkB,CAAC,CAAC;SAC3F;aAAM;YACH,MAAM,+BAAI,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,+CAA+C,CAAC,CAAC;SAClF;QAED,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;QAE1C,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC;gBACJ,IAAI,EAAE,SAAS,CAAC,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC;gBACtD,OAAO,EAAE,yCAAc,CAAC,KAAK,CAAC,IAAI;gBAClC,IAAI,EAAE,yCAAc,CAAC,KAAK,CAAC,IAAI;gBAC/B,IAAI,EAAE,sCAAW,CAAC,kBAAkB;gBACpC,IAAI,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,kBAAkB,CAAC;gBACvD,iBAAiB,EAAE,IAAI;gBACvB,MAAM,EAAE;oBACJ,WAAW,EAAE;wBACT,IAAI,EAAE,0CAAe,CAAC,wBAAwB;wBAC9C,cAAc,EAAE,6CAAkB,CAAC,uBAAuB;qBAC7D;oBACD,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,WAAW;oBAC3C,kBAAkB,EAAE,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,EAAE,EAAE,CAAC;iBACnE;aACJ,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,SAAiC;QACvD,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,OAA8B;QAClD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,QAAQ;QACJ,OAAO,EAAE,CAAC;IACd,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,EAAqB;QAC7C,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,IAAI,CAAC,GAAG,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC;SACpD;QACD,OAAO,IAAI,CAAC,GAAG,CAAC;IACpB,CAAC;IAEO,KAAK,CAAC,mBAAmB,CAAC,OAA+B;QAC7D,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACpE,YAAY,CAAC,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;QAChD,YAAY,CAAC,aAAa,CAAC,GAAG,WAAW,CAAC;QAE1C,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QACvD,IAAI,cAAc,EAAE;YAChB,KAAK,MAAM,KAAK,IAAI,YAAY,CAAC,MAAM,EAAG;gBACtC,IAAI,KAAK,CAAC,IAAI,KAAK,cAAc,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE;oBAC9D,KAAK,CAAC,4BAA4B,CAAC,GAAG;wBAClC,kBAAkB,OAAO,CAAC,WAAW,CAAC,mBAAmB,CAAC,KAAK,CAAC,GAAG;qBACtE,CAAC;oBACF,MAAM;iBACT;aACJ;YACD,YAAY,CAAC,WAAW,GAAG,CAAC,cAAc,cAAc,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SAC9E;QACD,IAAI,CAAC,GAAG,GAAG,YAAY,CAAC;QACxB,MAAM,OAAO,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,kBAAkB,EAAE,YAAY,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,EAAqB;QACzC,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC;QAC/B,MAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,EAAE;YACzB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE;gBACxB,IAAI,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;gBACpC,IAAI;oBACA,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;oBACrD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAC3C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;wBACtB,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;4BACzB,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;4BAC/B,MAAM;yBACT;qBACJ;iBACJ;gBAAC,OAAO,KAAK,EAAE,GAAE;gBAClB,MAAM,cAAc,GAAG;oBACnB,WAAW,EAAE,WAAW;oBACxB,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,GAAG,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,WAAW;oBACvE,0BAA0B,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;iBAC3C,CAAC;gBACF,eAAe,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACxC;SACJ;QACD,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,iBAAiB,CAAC,OAA+B;QACrD,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE;YAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE;gBACvB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,KAAK,EAAG;oBAC9B,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,qBAAqB,EAAE;wBAClF,OAAO,IAAI,CAAC;qBACf;iBACJ;aACJ;SACJ;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;CACJ;AArHD,oDAqHC"}

package/dist/src/project-api/ModuleInstance.js CHANGED Viewed

@@ -83,6 +83,7 @@ class ModuleInstance extends ProjectEntityInstance_1.default {
             try {
                 artifact_management_base_1.getLogger().debug(`getting Module Item Type - ${itemSet.getItemReader().types} - Pattern - ${JSON.stringify(itemSet.getItemReader().matchConditions)}`);
                 items = items.concat(await itemSet.getItems() || []);
+                itemSet.tags = this.tags;
             }
             catch (error) {
                 const moduleType = await this.getModuleType();

package/dist/src/project-api/ModuleInstance.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ModuleInstance.js","sourceRoot":"","sources":["../../../src/project-api/ModuleInstance.ts"],"names":[],"mappings":"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~~aACxD~~;YAAC,OAAO,KAAK,EAAE;gBACZ,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC9C,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;aAC/B;SACJ;QAED,OAAO,EAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,EAAC,CAAC;IAClD,CAAC;CACJ;AAED,kBAAe,cAAc,CAAC"}
1	+ {"version":3,"file":"ModuleInstance.js","sourceRoot":"","sources":["../../../src/project-api/ModuleInstance.ts"],"names":[],"mappings":"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"}

package/dist/src/project-api/ProjectCLI.js CHANGED Viewed

@@ -125,6 +125,25 @@ async function cli() {
         const projectPath = argv.path || '.';
         const api = new ProjectImpl_1.default(projectPath);
         await api.build();
+    })
+        .command('buildV2 [path]', 'Generate an mta.yaml, generate zips and mtad.yaml file', (yargs) => {
+        yargs.positional('debug', {
+            type: 'boolean',
+            default: false,
+            describe: 'enable logging',
+        });
+        yargs.positional('loglevel', {
+            type: 'string',
+            default: undefined,
+            describe: 'can specify log level "off" | "fatal" | "error" | "warn" | "info" | "debug" | "silly"',
+        });
+    }, async (argv) => {
+        if (!configureLogger(argv)) {
+            return;
+        }
+        const projectPath = argv.path || '.';
+        const api = new ProjectImpl_1.default(projectPath);
+        await api.buildV2();
     })
         .command('deploy [path]', 'Generate an mta.yaml file, build mtar file and deploy it', (yargs) => {
         yargs.positional('debug', {
@@ -147,6 +166,28 @@ async function cli() {
         await api.deploy();
         const projectOverviewURL = await api.getProjectOverviewURL();
         console.log({ 'applicationOverviewURL': projectOverviewURL });
+    })
+        .command('deployV2 [path]', 'Generate mta.yaml, generate zips and mtad.yaml file, generate mtar file and deploy it', (yargs) => {
+        yargs.positional('debug', {
+            type: 'boolean',
+            default: false,
+            describe: 'enable logging',
+        });
+        yargs.positional('loglevel', {
+            type: 'string',
+            default: undefined,
+            describe: 'can specify log level "off" | "fatal" | "error" | "warn" | "info" | "debug" | "silly"',
+        });
+    }, async (argv) => {
+        if (!configureLogger(argv)) {
+            return;
+        }
+        const projectPath = argv.path || '.';
+        const api = new ProjectImpl_1.default(projectPath);
+        await api.buildV2();
+        await api.deployV2();
+        const projectOverviewURL = await api.getProjectOverviewURL();
+        console.log({ 'applicationOverviewURL': projectOverviewURL });
     })
         .command('get-projectoverview-url [path]', 'get project overview url of deployed application', (yargs) => {
         yargs.positional('debug', {

package/dist/src/project-api/ProjectCLI.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ProjectCLI.js","sourceRoot":"","sources":["../../../src/project-api/ProjectCLI.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"ProjectCLI.js","sourceRoot":"","sources":["../../../src/project-api/ProjectCLI.ts"],"names":[],"mappings":"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"}