Merge branch 'main' into dynamic-constraints

Author: danjoa

.github/actions/cf-github-deploy/action.yaml

@@ -0,0 +1,23 @@
+version: 2
+
+updates:
+- package-ecosystem: npm
+  directory: /
+  versioning-strategy: increase-if-necessary
+  schedule:
+    interval: weekly
+  groups:
+    production-dependencies:
+      dependency-type: "production"
+    development-dependencies:
+      dependency-type: "development"
+  ignore:
+    - dependency-name: "chai"
+        # chai 5 doesn't work atm w/ cds.test, TODO fix that in cds.test
+      versions: ["5.x"]
+    - dependency-name: "chai-as-promised"
+        # chai-as-promised 8 doesn't work atm w/ cds.test, TODO fix that in cds.test
+      versions: ["8.x"]
+    - dependency-name: "express"
+        # express 5 not supported atm
+      versions: ["5.x"]

.github/dependabot.yml

@@ -3,28 +3,19 @@ name: Cloud Foundry
 on:
   workflow_call:
     inputs:
-      cf-api:
-        description: 'Cloud Foundry API endpoint'
-        required: false
-        type: string
-      cf-org:
-        description: 'Cloud Foundry organization'
-        required: false
-        type: string
-      cf-space:
-        description: 'Cloud Foundry space'
-        required: false
-        type: string
       environment:
-        description: 'Deployment environment name'
-        required: true
+        default: Staging
         type: string
 
   workflow_dispatch:
   push:
     branches:
       - main
 
+permissions:
+  contents: read
+  deployments: write
+
 concurrency:
   group: cf-${{ github.workflow }}-${{ github.head_ref || github.run_id }}
   cancel-in-progress: true
@@ -36,27 +27,22 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: 22
       - uses: ./.github/actions/cf-setup
         with:
-          cf-api: ${{ inputs.cf-api || vars.CF_API }}
-          cf-org: ${{ inputs.cf-org || vars.CF_ORG }}
-          cf-space: ${{ inputs.cf-space || vars.CF_SPACE }}
+          cf-api: ${{ vars.CF_API }}
+          cf-org: ${{ vars.CF_ORG }}
+          cf-space: ${{ vars.CF_SPACE }}
           cf-username: ${{ vars.CF_USERNAME }}
           cf-password: ${{ secrets.CF_PASSWORD }}
       - run: npm clean-install
       - run: npx cds up
 
-      - uses: ./.github/actions/cf-github-deploy
-        with:
-          app-name: ${{ env.APP_NAME }}
-          environment: ${{ inputs.environment || 'Staging' }}
-
       - run: cf logs ${{ env.APP_NAME }} --recent
         if: always()
       - run: cf logs orders-srv --recent
@@ -67,3 +53,13 @@ jobs:
         if: always()
       - run: cf logs ${{ env.APP_NAME }}-db-deployer --recent
         if: always()
+
+      - name: Get application URL
+        id: route
+        shell: bash
+        run: |
+          host=$(cf app "${APP_NAME}" | awk '/routes:/ {print $2}' | sed -E 's#^https?://##; s/,.*$//')
+          echo "url=https://$host" >> "$GITHUB_OUTPUT"
+    environment:
+      name: ${{ inputs.environment || 'Staging' }}
+      url:  ${{ steps.route.outputs.url }}

.github/workflows/cf.yaml

@@ -5,6 +5,10 @@ on:
   release:
     types: [published]
 
+permissions:
+  contents: read
+  deployments: write
+
 jobs:
   tests:
     uses: capire/samples/.github/workflows/test.yaml@main
@@ -15,7 +19,4 @@ jobs:
     uses: capire/samples/.github/workflows/cf.yaml@main
     secrets: inherit
     with:
-      cf-api: ${{ vars.CF_API_PRODUCTION }}
-      cf-org: ${{ vars.CF_ORG_PRODUCTION }}
-      cf-space: ${{ vars.CF_SPACE_PRODUCTION }}
       environment: Production

.github/workflows/release.yaml

@@ -9,17 +9,19 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
 jobs:
   tests:
     runs-on: ubuntu-latest
     strategy:
       matrix:
         node-version: [20, 22]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           submodules: true
-      - uses: actions/setup-node@v4
+      - uses: actions/setup-node@v5
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm ci

.github/workflows/test.yaml

@@ -11,3 +11,7 @@
 
 **/@types
 **/@cds-models
+
+# local nesting of projects
+/xflights
+/xtravels

.gitignore

@@ -1,18 +1,24 @@
 {
-  // Use IntelliSense to learn about possible attributes.
-  // Hover to view descriptions of existing attributes.
-  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "bookshop",
-      "command": "npx cds watch bookshop",
-      "type": "node-terminal",
+      "name": "vscode-jest-tests.v2",
       "request": "launch",
+      "type": "node", "runtimeExecutable": "jest",
+      "experimentalNetworking": "off",
+      "args": [
+        "${relativeFile}",
+        "-i", "--test-timeout", "1e6",
+        "-t", "${jest.testNamePattern}",
+      ],
       "skipFiles": [
         "<node_internals>/**",
         "**/node_modules/**",
-      ]
+        "**/express/**",
+        "**/jasmine/**",
+        "**/jest/**",
+        "**/cds/lib/req/cds-context.js",
+      ],
     },
   ]
 }