diff --git a/.changeset/thin-lizards-melt.md b/.changeset/thin-lizards-melt.md new file mode 100644 index 00000000000..3b311c48459 --- /dev/null +++ b/.changeset/thin-lizards-melt.md @@ -0,0 +1,5 @@ +--- +'@sap-ux/cf-deploy-config-writer': patch +--- + +Align mta.yaml for standalone and ensure external package.json changes are refected diff --git a/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.abapservice.yaml b/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.abapservice.yaml index 79f786c7c4c..8c5488395ba 100644 --- a/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.abapservice.yaml +++ b/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.abapservice.yaml @@ -26,7 +26,9 @@ resources: config: tenant-mode: dedicated xsappname: sap-ux-test-${space-guid} + path: ./xs-security.json service: xsuaa + service-name: sap-ux-test-xsuaa-service service-plan: application - name: sap-ux-test-html5-repo-runtime type: org.cloudfoundry.managed-service diff --git a/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.connectivity.yaml b/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.connectivity.yaml index 50ee008e319..9dedbae659b 100644 --- a/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.connectivity.yaml +++ b/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.connectivity.yaml @@ -26,7 +26,9 @@ resources: config: tenant-mode: dedicated xsappname: sap-ux-test-${space-guid} + path: ./xs-security.json service: xsuaa + service-name: sap-ux-test-xsuaa-service service-plan: application - name: sap-ux-test-html5-repo-runtime type: org.cloudfoundry.managed-service diff --git a/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.maximum.yaml b/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.maximum.yaml index b00a7710c24..c6416124ffa 100644 --- a/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.maximum.yaml +++ b/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.maximum.yaml @@ -27,7 +27,9 @@ resources: config: tenant-mode: dedicated xsappname: sap-ux-test-${space-guid} + path: ./xs-security.json service: xsuaa + service-name: sap-ux-test-xsuaa-service service-plan: application - name: sap-ux-test-html5-repo-runtime type: org.cloudfoundry.managed-service diff --git a/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.minimum.yaml b/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.minimum.yaml index a76bc8f5521..706b5043ca7 100644 --- a/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.minimum.yaml +++ b/packages/cf-deploy-config-sub-generator/test/fixtures/sap-ux-test/mta.minimum.yaml @@ -25,7 +25,9 @@ resources: config: tenant-mode: dedicated xsappname: sap-ux-test-${space-guid} + path: ./xs-security.json service: xsuaa + service-name: sap-ux-test-xsuaa-service service-plan: application - name: sap-ux-test-html5-repo-runtime type: org.cloudfoundry.managed-service diff --git a/packages/cf-deploy-config-writer/src/mta-config/mta.ts b/packages/cf-deploy-config-writer/src/mta-config/mta.ts index edb6dcc51ea..26c5086fde1 100644 --- a/packages/cf-deploy-config-writer/src/mta-config/mta.ts +++ b/packages/cf-deploy-config-writer/src/mta-config/mta.ts @@ -202,8 +202,10 @@ export class MtaConfig { name: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-uaa`, type: 'org.cloudfoundry.managed-service', parameters: { - 'service-plan': 'application', service: 'xsuaa', + 'service-plan': 'application', + path: './xs-security.json', + 'service-name': `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}-xsuaa-service`, config: { xsappname: `${this.prefix?.slice(0, MAX_MTA_PREFIX_LENGTH)}` + '-${space-guid}', 'tenant-mode': 'dedicated' diff --git a/packages/cf-deploy-config-writer/test/unit/__snapshots__/index-base.test.ts.snap b/packages/cf-deploy-config-writer/test/unit/__snapshots__/index-base.test.ts.snap index 83339f9714a..afbe10fe9c4 100644 --- a/packages/cf-deploy-config-writer/test/unit/__snapshots__/index-base.test.ts.snap +++ b/packages/cf-deploy-config-writer/test/unit/__snapshots__/index-base.test.ts.snap @@ -328,8 +328,10 @@ resources: - name: standalonewithabapserviceprovider-uaa type: org.cloudfoundry.managed-service parameters: - service-plan: application service: xsuaa + service-plan: application + path: ./xs-security.json + service-name: standalonewithabapserviceprovider-xsuaa-service config: xsappname: 'standalonewithabapserviceprovider-\${space-guid}' tenant-mode: dedicated @@ -478,8 +480,10 @@ resources: - name: standalone-with-connectivity-service-uaa type: org.cloudfoundry.managed-service parameters: - service-plan: application service: xsuaa + service-plan: application + path: ./xs-security.json + service-name: standalone-with-connectivity-service-xsuaa-service config: xsappname: 'standalone-with-connectivity-service-\${space-guid}' tenant-mode: dedicated diff --git a/packages/cf-deploy-config-writer/test/unit/__snapshots__/index-cap.test.ts.snap b/packages/cf-deploy-config-writer/test/unit/__snapshots__/index-cap.test.ts.snap index ff4496be6a0..59d6e3d255c 100644 --- a/packages/cf-deploy-config-writer/test/unit/__snapshots__/index-cap.test.ts.snap +++ b/packages/cf-deploy-config-writer/test/unit/__snapshots__/index-cap.test.ts.snap @@ -313,8 +313,10 @@ resources: - name: captestproject-uaa type: org.cloudfoundry.managed-service parameters: - service-plan: application service: xsuaa + service-plan: application + path: ./xs-security.json + service-name: captestproject-xsuaa-service config: xsappname: 'captestproject-\${space-guid}' tenant-mode: dedicated diff --git a/packages/cf-deploy-config-writer/test/unit/__snapshots__/mta.test.ts.snap b/packages/cf-deploy-config-writer/test/unit/__snapshots__/mta.test.ts.snap index c6a3df572c8..8eb63366d78 100644 --- a/packages/cf-deploy-config-writer/test/unit/__snapshots__/mta.test.ts.snap +++ b/packages/cf-deploy-config-writer/test/unit/__snapshots__/mta.test.ts.snap @@ -302,8 +302,10 @@ resources: - name: standaloneBasic-uaa type: org.cloudfoundry.managed-service parameters: - service-plan: application service: xsuaa + service-plan: application + path: ./xs-security.json + service-name: standaloneBasic-xsuaa-service config: xsappname: 'standaloneBasic-\${space-guid}' tenant-mode: dedicated