@sap-ux/cf-deploy-config-sub-generator 0.1.27 → 0.1.28

package/generators/app/index.d.ts

@@ -30,6 +30,7 @@ export default class extends DeploymentGenerator {
     private destinationName;
     private abort;
     private deployConfigExists;
+    private packageName;
     /**
      * Constructor for the CF deployment configuration generator.
      *

package/generators/app/index.js

@@ -43,6 +43,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
     destinationName;
     abort = false;
     deployConfigExists = false;
+    packageName;
     /**
      * Constructor for the CF deployment configuration generator.
      *
@@ -114,6 +115,13 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
             }
             this.isCap = true;
             this.projectRoot = capRoot;
+            try {
+                this.packageName =
+                    this.fs.readJSON((0, path_1.join)(this.projectRoot, project_access_1.FileName.Package))?.name ?? '';
+            }
+            catch {
+                // Ignore errors while reading the package.json file, will be handled in the validators of the respective modules
+            }
         }
         else if (this.mtaPath) {
             this.projectRoot = (0, path_1.dirname)(this.mtaPath);
@@ -150,6 +158,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
                 return;
             }
             // Configure defaults
+            this.appRouterAnswers.mtaId = this.packageName; // Required for the MTA validation
             this.destinationName = cf_deploy_config_writer_1.DefaultMTADestination;
             this.options.overwrite = true; // Don't prompt the user to overwrite files we've just written!
             this.answers = {};
@@ -217,7 +226,7 @@ class default_1 extends deploy_config_generator_shared_1.DeploymentGenerator {
             await this._writing();
         }
         else {
-            // Need to delay `init` as the yaml configurations wont be ready!
+            // Need to delay `init` as the yaml configurations won't be ready!
             await this._init();
             await this._writing();
         }

package/generators/app/questions.js

@@ -57,7 +57,7 @@ async function getCFApprouterQuestionsForCap({ projectRoot }) {
     // Disable some prompts, not required for CAP flow
     const appRouterPromptOptions = {
         [cf_deploy_config_inquirer_1.appRouterPromptNames.mtaPath]: projectRoot,
-        [cf_deploy_config_inquirer_1.appRouterPromptNames.mtaId]: true,
+        [cf_deploy_config_inquirer_1.appRouterPromptNames.mtaId]: false, // CDS Flow will auto generate this based on the package.json name property
         [cf_deploy_config_inquirer_1.appRouterPromptNames.mtaDescription]: false,
         [cf_deploy_config_inquirer_1.appRouterPromptNames.mtaVersion]: false,
         [cf_deploy_config_inquirer_1.appRouterPromptNames.routerType]: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sap-ux/cf-deploy-config-sub-generator",
   "description": "Generators for configuring Cloud Foundry deployment configuration",
-  "version": "0.1.27",
+  "version": "0.1.28",
   "repository": {
     "type": "git",
     "url": "https://github.com/SAP/open-ux-tools.git",
@@ -25,12 +25,12 @@
     "yeoman-generator": "5.10.0",
     "@sap-ux/btp-utils": "1.0.2",
     "@sap-ux/cf-deploy-config-writer": "0.1.22",
-    "@sap-ux/cf-deploy-config-inquirer": "0.2.18",
+    "@sap-ux/cf-deploy-config-inquirer": "0.2.19",
     "@sap-ux/deploy-config-generator-shared": "0.0.37",
     "@sap-ux/feature-toggle": "0.2.3",
     "@sap-ux/fiori-generator-shared": "0.9.9",
-    "@sap-ux/i18n": "0.2.3",
     "@sap-ux/inquirer-common": "0.6.29",
+    "@sap-ux/i18n": "0.2.3",
     "@sap-ux/project-access": "1.29.16",
     "@sap-ux/ui5-config": "0.26.4"
   },