refactor run method

cap-js · Sep 13, 2024 · 5a10bc4 · 5a10bc4
1 parent cca2381
commit 5a10bc4
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/lib/add.js b/lib/add.js
@@ -69,6 +69,8 @@ module.exports = class CapOperatorAddPlugin extends cds.add.Plugin {
             await rimraf('chart')
         } else if (cds.cli.options['with-configurable-templates'] && cds.cli.options['with-templates']) {
             throw new Error(`Option '--with-templates' cannot be used with '--with-configurable-templates' option.`)
+        } else if (!cds.cli.options['with-mta'] && cds.cli.options['with-mta-extensions']) {
+            throw new Error(`mta YAML not provided. Please pass the mta YAML via option '--with-mta'.`)
         } else if (exists('chart')) {
             const isCAPOpChart = isCAPOperatorChart('chart')
             const isConfigurableTempChart = isConfigurableTemplateChart('chart')
@@ -114,19 +116,6 @@ module.exports = class CapOperatorAddPlugin extends cds.add.Plugin {
 
         console.log("`chart` folder generated.")
 
-        // Update xs-security.json
-        const { hasXsuaa } = project
-        if (hasXsuaa) {
-            await cds.add.merge(__dirname, '../files/xs-security.json.hbs').into('xs-security.json', {
-                project,
-                additions: [{ in: 'scopes', where: { name: '$XSAPPNAME.Callback' }},
-                            { in: 'scopes', where: { name: '$XSAPPNAME.mtcallback' }}]
-            })
-        }
-
-        if (!cds.cli.options['with-mta'] && cds.cli.options['with-mta-extensions'])
-            throw new Error(`mta YAML not provided. Please pass the mta YAML via option '--with-mta'.`)
-
         if (cds.cli.options['with-mta']) {
             const { hasMta } = project
             if (!hasMta) throw new Error(`mta is not added to this project. Run 'cds add mta'.`)
@@ -147,6 +136,17 @@ module.exports = class CapOperatorAddPlugin extends cds.add.Plugin {
         } else {
             console.log("Review and update the values.yaml file in the 'chart' folder as per your project's requirements.")
         }
+
+         // Update xs-security.json
+         const { hasXsuaa } = project
+         if (hasXsuaa) {
+             await cds.add.merge(__dirname, '../files/xs-security.json.hbs').into('xs-security.json', {
+                 project,
+                 additions: [{ in: 'scopes', where: { name: '$XSAPPNAME.Callback' }},
+                             { in: 'scopes', where: { name: '$XSAPPNAME.mtcallback' }}]
+             })
+         }
+
         console.log("Once values.yaml is updated, run 'cds build' to generate the helm chart. You can find the generated chart in the 'gen' folder within your project directory.")
     }
 

diff --git a/test/add.test.js b/test/add.test.js
@@ -23,7 +23,7 @@ describe('cds add cap-operator', () => {
     })
 
     afterEach(async () => {
-        execSync(`rm -r chart`, { cwd: bookshop })
+        if (cds.utils.exists(join(bookshop, 'chart'))) execSync(`rm -r chart`, { cwd: bookshop })
     })
 
     after(async () => {