@sap/cds-dk 9.1.2 → 9.2.0

package/lib/init/template/data/as-json.js

@@ -228,9 +228,10 @@ function dataForField(element, artifact, csn, record, data, parent, depth, refer
       return randomIntInRange(range)
     }
     case 'cds.hana.REAL':
-    case 'cds.Decimal': { // Decimal(9,5), Decimal(9), Decimal(precision:5)
+    case 'cds.Decimal': { // Decimal(9,5), Decimal(9), Decimal(precision:5), Decimal(2,2)
       const scale = element.scale ?? (element.precision ? 0 : 2) // scale is 0 if only precision is given
-      const prec  = element.precision ? Math.min(Math.pow(10, element.precision-scale), Number.MAX_SAFE_INTEGER) : 100
+      //10^x would allow one digit more than allowed, that's why -1
+      const prec  = element.precision ? Math.min(Math.pow(10, element.precision - scale) - 1, Number.MAX_SAFE_INTEGER) : 100
       const range = { from: 0, to: prec }
       annotatedIntRange(element, range)
       return +(randomDecimalInRange(range).toFixed(scale))
@@ -550,7 +551,7 @@ function randomDateInRange(dateRange) {
 function randomDecimalInRange(decimalRange) {
   const max = decimalRange.to
   const min = decimalRange.from
-  const num = min + (randomNumber() % (max - min))
+  const num = max === 0 ? 0 : min + (randomNumber() % (max - min))
   let dec = randomNumber()
   const divider = Math.pow(10, dec.toString().length)
   dec = dec / divider

package/lib/init/template/data/index.js

@@ -82,6 +82,7 @@ module.exports = class DataTemplate extends require('../../plugin') {
 
     if (contentType === 'csv') {
       const headerOnly = !cds.cli.options['records'] // compat to old behavior which only creates headers
+      if (headerOnly) console.log(`${dim('adding headers only, use --records to create random entries')}`)
       await asCsv(data, csn, Object.assign({ headerOnly }, dataForParams))
     }
 

package/lib/init/template/destination/files/mta.yaml.hbs

@@ -22,23 +22,4 @@ resources:
     type: org.cloudfoundry.managed-service
     parameters:
       service: destination
-      service-plan: lite{{#hasHtml5Repo}}
-      config:
-        HTML5Runtime_enabled: true
-        init_data:
-          instance:
-            existing_destinations_policy: update
-            destinations:
-              - Name: srv-api
-                URL: ~{srv-api/srv-url}
-                Authentication: NoAuthentication
-                Type: HTTP
-                ProxyType: Internet
-                HTML5.ForwardAuthToken: true
-                HTML5.DynamicDestination: true
-              - Name: ui5
-                URL: https://ui5.sap.com
-                Authentication: NoAuthentication
-                Type: HTTP
-                ProxyType: Internet
-        {{/hasHtml5Repo}}
+      service-plan: lite

package/lib/init/template/extension/index.js

@@ -8,7 +8,7 @@ const npmPackageRegex = /^(@[a-z0-9-~][a-z0-9-._~]*\/)?[a-z0-9-~][a-z0-9-._~]*$/
 module.exports = class ExtensionProjectTemplate extends require('../../plugin') {
 
   static help() {
-    return 'Extension project'
+    return 'extension project'
   }
 
   options() {

package/lib/init/template/github-actions/files/cf-github-deploy/action.yaml

@@ -0,0 +1,48 @@
+name: GitHub Deployment for Cloud Foundry
+description: "Creates a GitHub deployment for your Cloud Foundry app"
+
+inputs:
+  app-name:
+    description: "Base name of the deployed CAP app"
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get deployed server URL
+      id: get-url
+      shell: bash
+      run: |
+        raw=$(cf app "${{ inputs.app-name }}" | awk '/routes:/ {print $2}')
+        raw=$(echo "$raw" | sed -E 's#^https?://##')
+        echo "url=https://$raw" >> "$GITHUB_OUTPUT"
+
+    - name: Create GitHub Deployment
+      uses: actions/github-script@v7
+      env:
+        URL: ${{ steps.get-url.outputs.url }}
+      with:
+        script: |
+          const { owner, repo } = context.repo
+          const ref = context.ref
+          const url = process.env.URL
+
+          const deployment = await github.rest.repos.createDeployment({
+            owner,
+            repo,
+            ref,
+            required_contexts: [],
+            environment: 'Production',
+            auto_merge: false,
+            description: 'Deployed to Cloud Foundry',
+          })
+
+          await github.rest.repos.createDeploymentStatus({
+            owner,
+            repo,
+            deployment_id: deployment.data.id,
+            state: 'success',
+            environment_url: url,
+            log_url: `https://github.com/${owner}/${repo}/actions/runs/${context.runId}`,
+            description: 'CAP app is live',
+          })

package/lib/init/template/github-actions/files/cf-setup/action.yaml

@@ -0,0 +1,53 @@
+name: Cloud Foundry Setup
+description: "Installs dependencies for Cloud Foundry deployment"
+
+inputs:
+  cf-version:
+    description: "The version of the Cloud Foundry CLI to install"
+    required: false
+    default: "8.8.3"
+  cf-api:
+    description: "The Cloud Foundry API endpoint to connect to"
+    required: true
+  cf-org:
+    description: "The Cloud Foundry organization to target"
+    required: true
+  cf-space:
+    description: "The Cloud Foundry space to target"
+    required: true
+  cf-username:
+    description: "The Cloud Foundry username to authenticate with"
+    required: true
+  cf-password:
+    description: "The Cloud Foundry password to authenticate with"
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - shell: bash
+      run: |
+        set -e
+        echo "Using CF_VERSION=${{ inputs.cf-version }}"
+        echo "Using CF_API=${{ inputs.cf-api }}"
+        curl -L "https://packages.cloudfoundry.org/stable?release=linux64-binary&version=${{ inputs.cf-version }}&source=github" -o cf-cli.tgz
+        mkdir cf-cli && tar -xzf cf-cli.tgz -C cf-cli
+        chmod +x cf-cli/cf
+        echo "${PWD}/cf-cli" >> $GITHUB_PATH
+
+    - shell: bash
+      run: |
+        echo "Installing MBT..."
+        npm install -g mbt
+
+    - shell: bash
+      run: |
+        echo "Installing CF CLI multiapps plugin..."
+        cf install-plugin multiapps -f
+
+    - shell: bash
+      run: |
+        echo "Authenticating to Cloud Foundry..."
+        cf api "${{ inputs.cf-api }}"
+        cf auth "${{ inputs.cf-username }}" "${{ inputs.cf-password }}"
+        cf target -o "${{ inputs.cf-org }}" -s "${{ inputs.cf-space }}"

package/lib/init/template/github-actions/files/kyma-info/action.yaml

@@ -0,0 +1,37 @@
+name: Kyma Info
+
+description: "Prints post-deployment information for Kyma applications"
+
+inputs:
+  app:
+    description: App Name
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - name: Get Events
+      shell: bash
+      run: kubectl get events --sort-by='.lastTimestamp' | tail -n 10
+    - name: Get Pods
+      shell: bash
+      run: kubectl get pods
+    - name: Get Secrets
+      shell: bash
+      run: kubectl get secrets
+    - name: Get Service Instances
+      shell: bash
+      run: kubectl get serviceinstances
+    - name: Get Service Bindings
+      shell: bash
+      run: kubectl get servicebindings
+    - shell: bash
+      run: |
+        echo "::group::Kyma Logs for ${{ inputs.app }}-srv"
+        kubectl get pods --no-headers | awk '{print $1}' | grep "${{ inputs.app }}.*-srv" | xargs -r -I % kubectl logs % --since=10m
+        echo "::endgroup::"
+    - shell: bash
+      run: |
+        echo "::group::Kyma Logs for ${{ inputs.app }}-approuter"
+        kubectl get pods --no-headers | awk '{print $1}' | grep "${{ inputs.app }}.*-approuter" | xargs -r -I % kubectl logs % --since=10m
+        echo "::endgroup::"

package/lib/init/template/github-actions/files/kyma-setup/action.yaml

@@ -0,0 +1,64 @@
+name: Kyma Setup
+
+description: "Installs dependencies for Kyma deployment"
+
+inputs:
+  registry:
+    description: Image Registry
+    required: true
+  user:
+    description: Registry User
+    required: true
+  password:
+    description: Registry Password
+    required: true
+  kube-config:
+    description: Base64-encoded Kubernetes Config
+    required: true
+
+runs:
+  using: "composite"
+  steps:
+    - run: apt-get update -y
+      shell: bash
+    - run: apt-get install software-properties-common -y
+      shell: bash
+    - run: apt-get install curl ca-certificates -y
+      shell: bash
+    - run: apt install sudo
+      shell: bash
+    - run: curl -fsSL https://pkgs.k8s.io/core:/stable:/v1.29/deb/Release.key | sudo gpg --dearmor -o /etc/apt/keyrings/kubernetes-apt-keyring.gpg
+      shell: bash
+    - run: echo 'deb [signed-by=/etc/apt/keyrings/kubernetes-apt-keyring.gpg] https://pkgs.k8s.io/core:/stable:/v1.29/deb/ /' | sudo tee /etc/apt/sources.list.d/kubernetes.list
+      shell: bash
+    - run: apt-get update -y
+      shell: bash
+    - run: apt-get install make -y
+      shell: bash
+    - run: apt-get install maven -y
+      shell: bash
+    - run: apt-get install docker.io -y
+      shell: bash
+    - run: (curl -sSL "https://github.com/buildpacks/pack/releases/download/v0.31.0/pack-v0.31.0-linux.tgz" | sudo tar -C /usr/local/bin/ --no-same-owner -xzv pack)
+      shell: bash
+    - run: apt-get install kubectl -y
+      shell: bash
+    - run: curl https://baltocdn.com/helm/signing.asc | gpg --dearmor | sudo tee /usr/share/keyrings/helm.gpg > /dev/null
+      shell: bash
+    - run: sudo apt-get install apt-transport-https --yes
+      shell: bash
+    - run: echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/helm.gpg] https://baltocdn.com/helm/stable/debian/ all main" | sudo tee /etc/apt/sources.list.d/helm-stable-debian.list
+      shell: bash
+    - run: sudo apt-get update
+      shell: bash
+    - run: sudo apt-get install helm
+      shell: bash
+    - run: npm install -g ctz
+      shell: bash
+    - shell: bash
+      run: |
+          mkdir ${HOME}/kyma-binaries
+          export PATH=${HOME}/kyma-binaries/:$PATH
+          echo "${{ inputs.password }}" | docker login "${{ inputs.registry }}" -u "${{ inputs.user }}" --password-stdin
+          mkdir ${HOME}/.kube
+          echo "${{ inputs.kube-config }}" | base64 --decode > ${HOME}/.kube/config

package/lib/init/template/github-actions/files/workflows/cf.yaml.hbs

@@ -0,0 +1,48 @@
+name: Cloud Foundry
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  merge_group:
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: {{#literal}}cf-${{ github.workflow }}-${{ github.head_ref || github.run_id }}{{/literal}}
+  cancel-in-progress: true
+
+env:
+  APP_NAME: {{ appName }}
+jobs:
+  deploy:
+    runs-on: {{#sap}}[self-hosted, solinas]{{/sap}}{{^sap}}ubuntu-latest{{/sap}}
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - uses: ./.github/actions/cf-setup # cap-js/cf-setup@v1
+        with:
+          cf-api: {{#literal}}${{ vars.CF_API }}{{/literal}}
+          cf-org: {{#literal}}${{ vars.CF_ORG }}{{/literal}}
+          cf-space: {{#literal}}${{ vars.CF_SPACE }}{{/literal}}
+          cf-username: {{#literal}}${{ vars.CF_USERNAME }}{{/literal}}
+          cf-password: {{#literal}}${{ secrets.CF_PASSWORD }}{{/literal}}
+      - run: npm install
+      - run: npx cds up
+
+      - uses: ./.github/actions/cf-github-deploy
+        with:
+          app-name: {{#literal}}${{ env.APP_NAME }}{{/literal}}
+
+      {{#hasApprouter}}
+      - run: cf logs "${{ env.APP_NAME }}" --recent
+      {{/hasApprouter}}
+      - run: cf logs "${{ env.APP_NAME }}-srv" --recent
+      {{^hasMultitenancy}}
+      - run: cf logs "${{ env.APP_NAME }}-db-deployer" --recent
+      {{/hasMultitenancy}}
+      {{#hasMultitenancy}}
+      - run: cf logs "${{ env.APP_NAME }}-mtx" --recent
+      {{/hasMultitenancy}}

package/lib/init/template/github-actions/files/workflows/kyma.yaml.hbs

@@ -0,0 +1,39 @@
+name: Kyma
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  merge_group:
+  push:
+    branches:
+      - main
+
+concurrency:
+  group: {{#literal}}deploy-${{ github.workflow }}-${{ github.head_ref || github.run_id }}{{/literal}}
+  cancel-in-progress: true
+
+env:
+  APP_NAME: {{ appName }}
+jobs:
+  deploy:
+    runs-on: [self-hosted, {{#sap}}solinas{{/sap}}{{^sap}}ubuntu-latest{{/sap}}]
+    container:
+      image: public.int.repositories.cloud.sap/ubuntu:24.04
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - uses: ./.github/actions/kyma-setup
+        with:
+          registry: {{#literal}}${{ vars.DOCKER_REGISTRY }}{{/literal}}
+          user: {{#literal}}${{ vars.DOCKER_USERNAME }}{{/literal}}
+          password: {{#literal}}${{ secrets.DOCKER_PASSWORD }}{{/literal}}
+          kube-config: {{#literal}}${{ secrets.KUBE_CONFIG }}{{/literal}}
+      - run: npm clean-install
+      - run: npx cds up --to k8s
+
+      - uses: ./.github/actions/kyma-info
+        if: always()
+        with:
+          app: {{#literal}}${{ env.APP_NAME }}{{/literal}}

package/lib/init/template/github-actions/files/workflows/test.yaml.hbs

@@ -0,0 +1,21 @@
+name: Tests
+
+on:
+  workflow_call:
+  workflow_dispatch:
+  pull_request:
+  merge_group:
+  push:
+    branches:
+      - main
+
+jobs:
+  tests:
+    runs-on: [self-hosted, {{#sap}}solinas{{/sap}}{{^sap}}ubuntu-latest{{/sap}}]
+    steps:
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+      - uses: actions/checkout@v4
+      - run: npm install
+      - run: npm test

package/lib/init/template/github-actions/index.js

@@ -0,0 +1,73 @@
+const path = require('node:path')
+const { readProject } = require('../../projectReader')
+const { renderAndCopy } = require('../../template')
+const cds = require('../../../cds')
+const { exists, copy } = cds.utils
+
+module.exports = class GitHubActionTemplate extends require('../../plugin') {
+
+  static hasInProduction() {
+    return exists('.github/workflows/test.yaml')
+  }
+
+  options() {
+    return {
+      'sap': {
+        type: 'boolean'
+      }
+    }
+  }
+
+  static help() {
+    return 'CI/CD pipeline via GitHub Actions'
+  }
+
+  async run() {
+    const out = '.github/workflows/test.yaml'
+    if (!exists(out) || cds.cli.options.force) {
+      await renderAndCopy(path.join(__dirname, 'files/workflows/test.yaml.hbs'), out, { sap: cds.cli.options.sap })
+    } else {
+      console.log('> skipping ' + out)
+    }
+  }
+
+  async combine() {
+    const project = readProject()
+    const { hasMta, hasHelm } = project, { force } = cds.cli.options
+    project.literal = () => text => text
+    project.sap = cds.cli.options.sap
+    if (hasMta) {
+      const cf = '.github/workflows/cf.yaml'
+      if (!exists(cf) || force) {
+        await renderAndCopy(path.join(__dirname, 'files/workflows/cf.yaml.hbs'), cf, project)
+      }
+      const cfSetup = '.github/actions/cf-setup'
+      if (!exists(cfSetup) || force) {
+        await copy(path.join(__dirname, 'files/cf-setup'), cfSetup)
+      }
+      const cfGithub = '.github/actions/cf-github-deploy'
+      if (!exists(cfGithub) || force) {
+        await copy(path.join(__dirname, 'files/cf-github-deploy'), cfGithub)
+      }
+      const cfInfo = '.github/actions/cf-info'
+      if (!exists(cfInfo) || force) {
+        await copy(path.join(__dirname, 'files/cf-info'), cfInfo)
+      }
+    }
+    if (hasHelm) {
+      const kyma = '.github/workflows/kyma.yaml'
+      if (!exists(kyma) || force) {
+        await renderAndCopy(path.join(__dirname, 'files/workflows/kyma.yaml.hbs'), kyma, project)
+      }
+      const kymaSetup = '.github/actions/kyma-setup'
+      if (!exists(kymaSetup) || force) {
+        await copy(path.join(__dirname, 'files/kyma-setup'), kymaSetup)
+      }
+
+      const kymaInfo = '.github/actions/kyma-info'
+      if (!exists(kymaInfo) || force) {
+        await copy(path.join(__dirname, 'files/kyma-info'), kymaInfo)
+      }
+    }
+  }
+}

package/lib/init/template/helm/index.js

@@ -101,7 +101,11 @@ module.exports = class HelmTemplate extends require('../../plugin') {
         }
         if (hasMultitenancy) {
             await this._mergeDependency('web-application', 'sidecar')
-            await this._mergeDependency('service-instance', 'saas-registry')
+            if (hasXsuaa) {
+                await this._mergeDependency('service-instance', 'saas-registry')
+            } else {
+                await this._mergeDependency('service-instance', 'subscription-manager')
+            }
         }
         if (hasDestination) {
             await this._mergeDependency('service-instance', 'destination')

package/lib/init/template/html5-repo/files/containerize.yaml.hbs

@@ -1,12 +1,12 @@
 ---
 before-all:
 {{#hasUI5}}
-  - mkdir -p ui-resources/resources
+  - mkdir -p app/html5-deployer/resources
 {{#apps}}
   - npm i --prefix app/{{app}}
   - npm run build --prefix app/{{app}}
   # zip filename should match the archiveName specified in ui5-deploy.yaml
-  - cp -f app/{{app}}/dist/{{app}}.zip ui-resources/resources/{{app}}.zip
+  - cp -f app/{{app}}/dist/{{app}}.zip app/html5-deployer/resources/{{app}}.zip
 {{/apps}}
 {{/hasUI5}}
 modules:
@@ -20,6 +20,6 @@ modules:
         type: nodejs
         builder: builder-jammy-base
         {{/hasHelmUnifiedRuntime}}
-        path: ui-resources
+        path: app/html5-deployer
         env:
-          BP_NODE_RUN_SCRIPTS: ""
+          BP_NODE_RUN_SCRIPTS: ""

package/lib/init/template/html5-repo/files/mta.yaml.hbs

@@ -25,9 +25,14 @@ modules:
     type: com.sap.application.content
     path: {{#isNodejs}}gen{{/isNodejs}}{{#isJava}}.{{/isJava}}
     requires:
+      - name: {{appName}}-auth
+      - name: srv-api
       - name: {{appName}}-html5-repo-host
         parameters:
           content-target: true
+          config:
+            HTML5Runtime_enabled: true{{#hasIas}}
+            IASDependencyName: {{appName}}-api{{/hasIas}}
     build-parameters:
       build-result: {{#isNodejs}}{{& appPath }}{{/isNodejs}}{{#isJava}}resources{{/isJava}}
       requires:
@@ -37,6 +42,25 @@ modules:
             - {{app}}.zip
           target-path: {{#isNodejs}}{{& appPath }}{{/isNodejs}}{{#isJava}}resources{{/isJava}}
       {{/apps}}
+    parameters:
+      config:
+        HTML5Runtime_enabled: true
+        init_data:
+          instance:
+            existing_destinations_policy: update
+            destinations:
+              - Name: srv-api
+                URL: ~{srv-api/srv-url}
+                Authentication: NoAuthentication
+                Type: HTTP
+                ProxyType: Internet
+                HTML5.ForwardAuthToken: true
+                HTML5.DynamicDestination: true
+              - Name: ui5
+                URL: https://ui5.sap.com
+                Authentication: NoAuthentication
+                Type: HTTP
+                ProxyType: Internet
 
   {{#apps}}
   - name: {{strippedAppName}}{{strippedApp}}

package/lib/init/template/html5-repo/files/values.yaml.hbs

@@ -16,10 +16,11 @@ html5-apps-deployer:
       serviceInstanceName: xsuaa
     {{/hasXsuaa}}
     {{#hasIas}}
-    ias:
+    identity:
       serviceInstanceName: identity
       parameters:
         credential-type: X509_GENERATED
+        app-identifier: html5-deployer
     {{/hasIas}}
     destination:
       serviceInstanceName: destination

package/lib/init/template/html5-repo/index.js

@@ -1,7 +1,7 @@
 const { join } = require('path')
 const { readProject } = require('../../projectReader')
 const { merge } = require('../../merge')
-const { srv4, html5RepoHost, html5Runtime, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
+const { srv4, html5RepoHost, html5Runtime, xsuaa, appDeployer, approuter, mtxSidecar4 } = require('../../registries/mta')
 const { odataApi } = require('../../registries/xs-app')
 const { exists } = require('../../../cds').utils
 const { renderAndCopy } = require('../../template')
@@ -51,7 +51,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
 
     async combine() {
         const project = readProject()
-        const { isJava, srvPath, appPath, hasMta, hasMultitenancy, hasWorkzoneStandard, hasHelm, hasHelmUnifiedRuntime, hasApprouter, hasContainerize, apps } = project
+        const { isJava, srvPath, appPath, hasMta, hasXsuaa, hasMultitenancy, hasWorkzoneStandard, hasHelm, hasHelmUnifiedRuntime, hasApprouter, hasContainerize, apps } = project
 
         await Promise.all(apps.map(async ({ app }) => {
             project.app = app
@@ -97,6 +97,12 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
                     into: [isJava ? srv : mtxSidecar4('gen/mtx/sidecar'), 'requires', 'name']
                 })
             }
+            if (hasXsuaa) {
+                relationships.push({
+                    insert: [xsuaa, 'name'],
+                    into: [appDeployer, 'requires']
+                })
+            }
             await merge(__dirname, 'files/mta.yaml.hbs').into('mta.yaml', {
                 with: project,
                 additions,
@@ -111,7 +117,7 @@ module.exports = class Html5RepoTemplate extends require('../../plugin') {
             await merge(__dirname, '/files/containerize.yaml.hbs').into('containerize.yaml', { with: project, additions })
         }
         if (hasHelm || hasHelmUnifiedRuntime) {
-            await renderAndCopy(join(__dirname, 'files/ui-resources'), 'ui-resources', project)
+            await renderAndCopy(join(__dirname, 'files/html5-deployer.package.json.hbs'), 'app/html5-deployer/package.json', project)
             await merge(__dirname, 'files/values.yaml.hbs').into('chart/values.yaml', { with: project })
         }
     }

package/lib/init/template/http/index.js

@@ -163,7 +163,7 @@ module.exports = class HttpTemplate extends require('../../plugin') {
             const key = Object.keys(e.keys)[0] // draft keys are always single
             delete entityData[key] // draft keys should always by auto generated (either UUID or through custom logic), so remove them from the payload
             const postBody = JSON.stringify(entityData, null, 2)
-            generateDraftRequests(requests, requestTitle, url, headers, headerAuth, postBody, key)
+            generateDraftRequests(requests, requestTitle, url, headers, headerAuth, postBody, key, service)
           }
           else {
             const postBody = JSON.stringify(entityData, null, 2)
@@ -198,14 +198,14 @@ module.exports = class HttpTemplate extends require('../../plugin') {
       this.#write(requests, serviceName)
     }
 
-    function generateDraftRequests(requests, title, url, headers, headerAuth, postBody, key) {
+    function generateDraftRequests(requests, title, url, headers, headerAuth, postBody, key, service) {
       const nameDraftsCreate = slug(title+'_Draft_POST')
       requests.push(`${title} Drafts GET\n# @name ${slug(title+'_Drafts_GET')}\nGET ${url}?$filter=(IsActiveEntity eq false)\n${headerAuth}\n`) // unencoded URL for better readability (client can handle this)
       requests.push(`${title} Draft POST\n# @name ${nameDraftsCreate}\nPOST ${url}\n${headers}\n\n${postBody}\n`)
       requests.push(`\n### Result from POST request above\n@draftID={{${nameDraftsCreate}.response.body.$.${key}}}\n`)
       requests.push(`${title} Draft PATCH\n# @name ${slug(title+'_Draft_Patch')}\nPATCH ${url}(${key}={{draftID}},IsActiveEntity=false)\n${headers}\n\n${postBody}\n`)
-      requests.push(`${title} Draft Prepare\n# @name ${slug(title+'_Draft_Prepare')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/AdminService.draftPrepare\n${headers}\n\n{}\n`)
-      requests.push(`${title} Draft Activate\n# @name ${slug(title+'_Draft_Activate')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/AdminService.draftActivate\n${headers}\n\n{}\n`)
+      requests.push(`${title} Draft Prepare\n# @name ${slug(title+'_Draft_Prepare')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/${service.name}.draftPrepare\n${headers}\n\n{}\n`)
+      requests.push(`${title} Draft Activate\n# @name ${slug(title+'_Draft_Activate')}\nPOST ${url}(${key}={{draftID}},IsActiveEntity=false)/${service.name}.draftActivate\n${headers}\n\n{}\n`)
     }
 
     function slug(str) {

package/lib/init/template/ias/files/package.json.hbs

@@ -9,13 +9,20 @@
       {{#profile}}
       "[{{profile}}]": {
       {{/profile}}
+      {{#shortcut}}
+        "auth": "ias"
+      {{/shortcut}}
+      {{^shortcut}}
         "auth": {
           "kind": "ias"
         }
+      {{/shortcut}}
+
       {{#profile}}
       }
       {{/profile}}
     }
+
   {{#isNodejs}}
   }
   {{/isNodejs}}

package/lib/init/template/ias/files/values.yaml.hbs

@@ -29,10 +29,6 @@ identity:
     servicePlanName: application
     parameters:
         display-name: {{appName}}
-        {{#hasAms}}
-        authorization:
-            enabled: true
-        {{/hasAms}}
         {{#hasMultitenancy}}
         multi-tenant: true
         {{/hasMultitenancy}}
@@ -50,3 +46,4 @@ identity:
                 - https://*.{{ tpl .Values.global.domain . }}/*/logout.html
                 <%={{ }}=%>
         {{/hasApprouter}}
+