From b37f723583f26f7e5475cc41976efef41d50c4aa Mon Sep 17 00:00:00 2001 From: Marc Becker Date: Fri, 13 Feb 2026 16:05:07 +0100 Subject: [PATCH 1/7] Connect deployed XTravels with deployed XFlight --- mta.yaml | 1 + srv/src/main/resources/application.yaml | 21 +++++++++++++++------ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/mta.yaml b/mta.yaml index 8533fe0..7f3ea59 100644 --- a/mta.yaml +++ b/mta.yaml @@ -19,6 +19,7 @@ modules: JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']" JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }' AMS_DCL_ROOT: ams/dcl + XFLIGHTS_URL: https://cap-sandbox-capire-xflights-srv.cert.cfapps.eu12.hana.ondemand.com # TODO derive from GitHub environment build-parameters: builder: custom commands: diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index 135dd3f..c253f41 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -14,6 +14,10 @@ management: db.enabled: true cds: drafts.enforce-readonly: true + security.mock.users: + admin: + roles: + - admin data-source.csv.paths: - "db/data/**" - "../db/data/**" @@ -24,13 +28,18 @@ cds: - "../../node_modules/@capire/**" --- spring: - config.activate.on-profile: "!cloud" - + config.activate.on-profile: "cloud" cds: - security.mock.users: - admin: - roles: - - admin + security.mock.enabled: false # required due to AMS lib + remote.services: + xflights: + type: hcql + model: sap.capire.flights.data + binding: + name: xtravels-ias + options: + url: ${XFLIGHTS_URL} # from mta.yaml + ias-dependency-name: xflights-data --- spring: config.activate.on-profile: hybrid From e416c81893d1f2172a792e3ee91fe9abc384cb94 Mon Sep 17 00:00:00 2001 From: Marc Becker Date: Fri, 13 Feb 2026 16:57:35 +0100 Subject: [PATCH 2/7] Adjust to Security Guide --- srv/src/main/resources/application.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index c253f41..cd41fc1 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -38,8 +38,8 @@ cds: binding: name: xtravels-ias options: - url: ${XFLIGHTS_URL} # from mta.yaml - ias-dependency-name: xflights-data + url: ${XFLIGHTS_URL}/hcql # from mta.yaml + ias-dependency-name: DataConsumer --- spring: config.activate.on-profile: hybrid @@ -51,6 +51,8 @@ cds: destination: properties: url: http://localhost:8081/hcql + User: consumer + Password: --- spring: config.activate.on-profile: default From d671c0b7db2d7af6da4dac0001bc397fe31bfe71 Mon Sep 17 00:00:00 2001 From: Marc Becker Date: Fri, 13 Feb 2026 17:00:03 +0100 Subject: [PATCH 3/7] Add onBehalfOf --- srv/src/main/resources/application.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index cd41fc1..33098ac 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -37,6 +37,7 @@ cds: model: sap.capire.flights.data binding: name: xtravels-ias + onBehalfOf: systemUser options: url: ${XFLIGHTS_URL}/hcql # from mta.yaml ias-dependency-name: DataConsumer From fbd6fbb89496f2dd02b5630ca25c84628509a89b Mon Sep 17 00:00:00 2001 From: Marc Becker Date: Mon, 16 Feb 2026 11:17:22 +0100 Subject: [PATCH 4/7] Use data-consumer as name --- srv/src/main/resources/application.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index 33098ac..61527a3 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -35,12 +35,14 @@ cds: xflights: type: hcql model: sap.capire.flights.data + http: + suffix: /hcql binding: name: xtravels-ias onBehalfOf: systemUser options: - url: ${XFLIGHTS_URL}/hcql # from mta.yaml - ias-dependency-name: DataConsumer + url: ${XFLIGHTS_URL} # from mta.yaml + ias-dependency-name: data-consumer --- spring: config.activate.on-profile: hybrid From fb8e0775ec25a54ab4798c7bcae123a5e9411157 Mon Sep 17 00:00:00 2001 From: Marc Becker Date: Mon, 16 Feb 2026 13:31:20 +0100 Subject: [PATCH 5/7] Use internal user --- srv/src/main/resources/application.yaml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/srv/src/main/resources/application.yaml b/srv/src/main/resources/application.yaml index 61527a3..6e8cdb8 100644 --- a/srv/src/main/resources/application.yaml +++ b/srv/src/main/resources/application.yaml @@ -28,7 +28,7 @@ cds: - "../../node_modules/@capire/**" --- spring: - config.activate.on-profile: "cloud" + config.activate.on-profile: cloud cds: security.mock.enabled: false # required due to AMS lib remote.services: @@ -51,10 +51,12 @@ cds: xflights: type: hcql model: sap.capire.flights.data + http: + suffix: /hcql destination: properties: - url: http://localhost:8081/hcql - User: consumer + url: http://localhost:8081 + User: internal Password: --- spring: From d0d112b581c1bb3f49d0bba3d76445a1490f51f8 Mon Sep 17 00:00:00 2001 From: Marc Becker Date: Mon, 16 Feb 2026 13:40:32 +0100 Subject: [PATCH 6/7] Test deployment --- .github/workflows/cf.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cf.yaml b/.github/workflows/cf.yaml index bf1dcf8..820c18a 100644 --- a/.github/workflows/cf.yaml +++ b/.github/workflows/cf.yaml @@ -1,6 +1,7 @@ name: Cloud Foundry on: + pull_request: workflow_call: inputs: environment: From 213c0dc46b83bc4b82ce6a640b173d98cfecc348 Mon Sep 17 00:00:00 2001 From: Marc Becker Date: Mon, 16 Feb 2026 13:51:56 +0100 Subject: [PATCH 7/7] Remove pull request trigger --- .github/workflows/cf.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/cf.yaml b/.github/workflows/cf.yaml index 820c18a..bf1dcf8 100644 --- a/.github/workflows/cf.yaml +++ b/.github/workflows/cf.yaml @@ -1,7 +1,6 @@ name: Cloud Foundry on: - pull_request: workflow_call: inputs: environment: