From e4a3239f347b0d6d8fbda9920f7f9d5ff4159f4f Mon Sep 17 00:00:00 2001 From: "Yashmeet ." Date: Thu, 4 Jun 2026 17:32:25 +0530 Subject: [PATCH] remove .gitignore from leading apps and add mta.yaml back --- .../cloud-cap-samples-java/.gitignore | 38 ---- .../cloud-cap-samples-java/mta.yaml | 170 ++++++++++++++++++ .../cloud-cap-samples-java/.gitignore | 38 ---- .../cloud-cap-samples-java/mta.yaml | 170 ++++++++++++++++++ .../central-space/demoapp/.gitignore | 31 ---- .../personal-space/demoapp/.gitignore | 31 ---- 6 files changed, 340 insertions(+), 138 deletions(-) delete mode 100644 app/multi-tenant/central-space/cloud-cap-samples-java/.gitignore create mode 100644 app/multi-tenant/central-space/cloud-cap-samples-java/mta.yaml delete mode 100644 app/multi-tenant/personal-space/cloud-cap-samples-java/.gitignore create mode 100644 app/multi-tenant/personal-space/cloud-cap-samples-java/mta.yaml delete mode 100644 app/single-tenant/central-space/demoapp/.gitignore delete mode 100644 app/single-tenant/personal-space/demoapp/.gitignore diff --git a/app/multi-tenant/central-space/cloud-cap-samples-java/.gitignore b/app/multi-tenant/central-space/cloud-cap-samples-java/.gitignore deleted file mode 100644 index f9986b41c..000000000 --- a/app/multi-tenant/central-space/cloud-cap-samples-java/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -gen/ -edmx/ -schema-h2.sql -default-env.json -openapi.json -.env -.values.yaml - -bin/ -target/ -.java-version -.flattened-pom.xml -.classpath -.project -.settings -.vscode -.idea -*.iml - -node/ -node_modules/ - -.mta/ -*.mtar -mta.yaml - -*.log* -gc_history* -hs_err* -.DS_Store - -*.db -*.sqlite* - -.cdsrc-private.json - -/chart/ -.reloadtrigger diff --git a/app/multi-tenant/central-space/cloud-cap-samples-java/mta.yaml b/app/multi-tenant/central-space/cloud-cap-samples-java/mta.yaml new file mode 100644 index 000000000..1594e917e --- /dev/null +++ b/app/multi-tenant/central-space/cloud-cap-samples-java/mta.yaml @@ -0,0 +1,170 @@ +_schema-version: '2.1' +ID: bookshop-mt +version: 1.0.0 +description: "Multitenant Bookshop CAP Java Project with UI" +parameters: + enable-parallel-deployments: true +modules: +# --------------------- SERVER MODULE ------------------------ + - name: bookshop-mt-srv +# ------------------------------------------------------------ + type: java + path: srv + parameters: + memory: 1024M + disk-quota: 512M + buildpack: sap_java_buildpack_jakarta + properties: + SPRING_PROFILES_ACTIVE: cloud,sandbox + CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-" + JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']" + JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }' + REPOSITORY_ID: __REPOSITORY_ID__ # Placeholder for REPOSITORY_ID + INCOMING_CONNECTION_TIMEOUT: 12000000 + INCOMING_REQUEST_TIMEOUT: 12000000 + timeout: 12000000 + build-parameters: + builder: custom + commands: + - mvn clean package -DskipTests=true + build-result: target/*-exec.jar + requires: + - name: bookshop-mt-service-manager + - name: bookshop-mt-uaa + - name: bookshop-mt-saas-registry + - name: sdm + - name: mtx-api + properties: + CDS_MULTITENANCY_SIDECAR_URL: ~{mtx-url} + - name: app-api + properties: + CDS_MULTITENANCY_APPUI_URL: ~{app-url} + - name: cf-logging + provides: + - name: srv-api + properties: + srv-url: '${default-url}' +# --------------------- SIDECAR MODULE ----------------------- + - name: bookshop-mt-sidecar +# ------------------------------------------------------------ + type: nodejs + path: mtx/sidecar + parameters: + memory: 256M + disk-quota: 1024M + build-parameters: + builder: custom + build-result: gen + commands: + - npm run build + requires: + - name: bookshop-mt-srv + requires: + - name: bookshop-mt-service-manager + - name: bookshop-mt-uaa + - name: cf-logging + - name: sdm + provides: + - name: mtx-api + properties: + mtx-url: ${default-url} + hooks: + - name: upgrade-all + type: task + phases: + - blue-green.application.before-start.idle + - deploy.application.before-start + parameters: + name: upgrade + memory: 512M + disk-quota: 768M + command: npx -p @sap/cds-mtx cds-mtx upgrade "*" +# --------------------- APPROUTER MODULE --------------------- + - name: bookshop-mt-app +# ------------------------------------------------------------ + type: approuter.nodejs + path: app + + parameters: + memory: 256M + disk-quota: 512M + keep-existing-routes: true + host: ${space}-1-multi-pgnaicm + routes: + # - route: playground-agri-com-de2-subscriber-${space}-pgcnaim.${default-domain} + - route: sdm-dev-consumer-eu12-6uxoiqfk-${default-uri} + - route: sdmgoogleworkspace-cpok9mi1-${default-uri} + properties: + TENANT_HOST_PATTERN: ^(.*)-${default-uri} # testing only, use custom domain with wildcard for production + INCOMING_CONNECTION_TIMEOUT: 1200000 + INCOMING_REQUEST_TIMEOUT: 1200000 + timeout: 1200000 + requires: + - name: srv-api + group: destinations + properties: + name: backend + url: ~{srv-url} + forwardAuthToken: true + strictSSL: true + timeout: 1200000 + - name: bookshop-mt-uaa + provides: + - name: app-api + properties: + app-url: '${default-url}' + app-domain: '${domain}' +# --------------------- RESOURCES --------------------- +resources: +# ----------------------------------------------------- + - name: bookshop-mt-uaa + type: org.cloudfoundry.managed-service + parameters: + service: xsuaa + service-plan: application + path: ./xs-security-mt.json + config: # override xsappname as it needs to be unique + xsappname: bookshop-mt-${org}-${space} + oauth2-configuration: + credential-types: + - binding-secret + - x509 + redirect-uris: + - https://*.~{app-api/app-domain}/** + requires: + - name: app-api + - name: bookshop-mt-service-manager + type: org.cloudfoundry.managed-service + parameters: + service: service-manager + service-plan: container + - name: bookshop-mt-saas-registry + type: org.cloudfoundry.managed-service + parameters: + service: saas-registry + service-plan: application + config: + appName: bookshop-mt-${org}-${space} # this is the text on the tile + xsappname: bookshop-mt-${org}-${space} # this is the value from xsuaa.parameters.config.xsappname + appUrls: + getDependencies: ~{srv-api/srv-url}/mt/v1.0/subscriptions/dependencies + onSubscription: ~{srv-api/srv-url}/mt/v1.0/subscriptions/tenants/{tenantId} + onSubscriptionAsync: true + onUnSubscriptionAsync: true + onUpdateDependenciesAsync: true + callbackTimeoutMillis: 3600000 + displayName: Multitenancy App ${space} + description: Multitenancy App test deployed using job + category: 'Category' + requires: + - name: srv-api + - name: cf-logging + type: org.cloudfoundry.managed-service + parameters: + service: application-logs + service-plan: lite + - name: sdm + type: org.cloudfoundry.managed-service + parameters: + service: sdm + service-plan: standard diff --git a/app/multi-tenant/personal-space/cloud-cap-samples-java/.gitignore b/app/multi-tenant/personal-space/cloud-cap-samples-java/.gitignore deleted file mode 100644 index f9986b41c..000000000 --- a/app/multi-tenant/personal-space/cloud-cap-samples-java/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -gen/ -edmx/ -schema-h2.sql -default-env.json -openapi.json -.env -.values.yaml - -bin/ -target/ -.java-version -.flattened-pom.xml -.classpath -.project -.settings -.vscode -.idea -*.iml - -node/ -node_modules/ - -.mta/ -*.mtar -mta.yaml - -*.log* -gc_history* -hs_err* -.DS_Store - -*.db -*.sqlite* - -.cdsrc-private.json - -/chart/ -.reloadtrigger diff --git a/app/multi-tenant/personal-space/cloud-cap-samples-java/mta.yaml b/app/multi-tenant/personal-space/cloud-cap-samples-java/mta.yaml new file mode 100644 index 000000000..1594e917e --- /dev/null +++ b/app/multi-tenant/personal-space/cloud-cap-samples-java/mta.yaml @@ -0,0 +1,170 @@ +_schema-version: '2.1' +ID: bookshop-mt +version: 1.0.0 +description: "Multitenant Bookshop CAP Java Project with UI" +parameters: + enable-parallel-deployments: true +modules: +# --------------------- SERVER MODULE ------------------------ + - name: bookshop-mt-srv +# ------------------------------------------------------------ + type: java + path: srv + parameters: + memory: 1024M + disk-quota: 512M + buildpack: sap_java_buildpack_jakarta + properties: + SPRING_PROFILES_ACTIVE: cloud,sandbox + CDS_MULTITENANCY_APPUI_TENANTSEPARATOR: "-" + JBP_CONFIG_COMPONENTS: "jres: ['com.sap.xs.java.buildpack.jre.SAPMachineJRE']" + JBP_CONFIG_SAP_MACHINE_JRE: '{ version: 21.+ }' + REPOSITORY_ID: __REPOSITORY_ID__ # Placeholder for REPOSITORY_ID + INCOMING_CONNECTION_TIMEOUT: 12000000 + INCOMING_REQUEST_TIMEOUT: 12000000 + timeout: 12000000 + build-parameters: + builder: custom + commands: + - mvn clean package -DskipTests=true + build-result: target/*-exec.jar + requires: + - name: bookshop-mt-service-manager + - name: bookshop-mt-uaa + - name: bookshop-mt-saas-registry + - name: sdm + - name: mtx-api + properties: + CDS_MULTITENANCY_SIDECAR_URL: ~{mtx-url} + - name: app-api + properties: + CDS_MULTITENANCY_APPUI_URL: ~{app-url} + - name: cf-logging + provides: + - name: srv-api + properties: + srv-url: '${default-url}' +# --------------------- SIDECAR MODULE ----------------------- + - name: bookshop-mt-sidecar +# ------------------------------------------------------------ + type: nodejs + path: mtx/sidecar + parameters: + memory: 256M + disk-quota: 1024M + build-parameters: + builder: custom + build-result: gen + commands: + - npm run build + requires: + - name: bookshop-mt-srv + requires: + - name: bookshop-mt-service-manager + - name: bookshop-mt-uaa + - name: cf-logging + - name: sdm + provides: + - name: mtx-api + properties: + mtx-url: ${default-url} + hooks: + - name: upgrade-all + type: task + phases: + - blue-green.application.before-start.idle + - deploy.application.before-start + parameters: + name: upgrade + memory: 512M + disk-quota: 768M + command: npx -p @sap/cds-mtx cds-mtx upgrade "*" +# --------------------- APPROUTER MODULE --------------------- + - name: bookshop-mt-app +# ------------------------------------------------------------ + type: approuter.nodejs + path: app + + parameters: + memory: 256M + disk-quota: 512M + keep-existing-routes: true + host: ${space}-1-multi-pgnaicm + routes: + # - route: playground-agri-com-de2-subscriber-${space}-pgcnaim.${default-domain} + - route: sdm-dev-consumer-eu12-6uxoiqfk-${default-uri} + - route: sdmgoogleworkspace-cpok9mi1-${default-uri} + properties: + TENANT_HOST_PATTERN: ^(.*)-${default-uri} # testing only, use custom domain with wildcard for production + INCOMING_CONNECTION_TIMEOUT: 1200000 + INCOMING_REQUEST_TIMEOUT: 1200000 + timeout: 1200000 + requires: + - name: srv-api + group: destinations + properties: + name: backend + url: ~{srv-url} + forwardAuthToken: true + strictSSL: true + timeout: 1200000 + - name: bookshop-mt-uaa + provides: + - name: app-api + properties: + app-url: '${default-url}' + app-domain: '${domain}' +# --------------------- RESOURCES --------------------- +resources: +# ----------------------------------------------------- + - name: bookshop-mt-uaa + type: org.cloudfoundry.managed-service + parameters: + service: xsuaa + service-plan: application + path: ./xs-security-mt.json + config: # override xsappname as it needs to be unique + xsappname: bookshop-mt-${org}-${space} + oauth2-configuration: + credential-types: + - binding-secret + - x509 + redirect-uris: + - https://*.~{app-api/app-domain}/** + requires: + - name: app-api + - name: bookshop-mt-service-manager + type: org.cloudfoundry.managed-service + parameters: + service: service-manager + service-plan: container + - name: bookshop-mt-saas-registry + type: org.cloudfoundry.managed-service + parameters: + service: saas-registry + service-plan: application + config: + appName: bookshop-mt-${org}-${space} # this is the text on the tile + xsappname: bookshop-mt-${org}-${space} # this is the value from xsuaa.parameters.config.xsappname + appUrls: + getDependencies: ~{srv-api/srv-url}/mt/v1.0/subscriptions/dependencies + onSubscription: ~{srv-api/srv-url}/mt/v1.0/subscriptions/tenants/{tenantId} + onSubscriptionAsync: true + onUnSubscriptionAsync: true + onUpdateDependenciesAsync: true + callbackTimeoutMillis: 3600000 + displayName: Multitenancy App ${space} + description: Multitenancy App test deployed using job + category: 'Category' + requires: + - name: srv-api + - name: cf-logging + type: org.cloudfoundry.managed-service + parameters: + service: application-logs + service-plan: lite + - name: sdm + type: org.cloudfoundry.managed-service + parameters: + service: sdm + service-plan: standard diff --git a/app/single-tenant/central-space/demoapp/.gitignore b/app/single-tenant/central-space/demoapp/.gitignore deleted file mode 100644 index c161f228e..000000000 --- a/app/single-tenant/central-space/demoapp/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -**/gen/ -**/edmx/ -*.db -*.sqlite -*.sqlite-wal -*.sqlite-shm -schema*.sql -default-env.json - -**/bin/ -**/target/ -.flattened-pom.xml -.classpath -.project -.settings - -**/node/ -**/node_modules/ - -**/.mta/ -*.mtar - -*.log* -gc_history* -hs_err* -*.tgz -*.iml - -.vscode -.idea -.reloadtrigger diff --git a/app/single-tenant/personal-space/demoapp/.gitignore b/app/single-tenant/personal-space/demoapp/.gitignore deleted file mode 100644 index c161f228e..000000000 --- a/app/single-tenant/personal-space/demoapp/.gitignore +++ /dev/null @@ -1,31 +0,0 @@ -**/gen/ -**/edmx/ -*.db -*.sqlite -*.sqlite-wal -*.sqlite-shm -schema*.sql -default-env.json - -**/bin/ -**/target/ -.flattened-pom.xml -.classpath -.project -.settings - -**/node/ -**/node_modules/ - -**/.mta/ -*.mtar - -*.log* -gc_history* -hs_err* -*.tgz -*.iml - -.vscode -.idea -.reloadtrigger