@sap/cds-mtx
Advanced tools
Comparing version 2.6.4 to 2.6.5
@@ -9,2 +9,10 @@ # Change Log | ||
## Version 2.6.5 - 2023-09-04 | ||
### Changed | ||
- All available HDI deployment parameters can now be passed for tenant deployment. | ||
### Added | ||
- Container creation now adds parameters needed for HANA encryption | ||
## Version 2.6.4 - 2022-11-17 | ||
@@ -11,0 +19,0 @@ |
@@ -25,2 +25,11 @@ const APPLICATION_META_DATA_TAG = "_application_"; | ||
static getInstanceManagerOptions(tenantMetadata) { | ||
const mergedOptions = tenantMetadata ? { | ||
provisioning_parameters: { | ||
subscriptionContext: { | ||
globalAccountID: tenantMetadata.globalAccountGUID, | ||
subAccountID: tenantMetadata.subscribedSubaccountId, | ||
applicationName: tenantMetadata.subscriptionAppName | ||
} | ||
} | ||
} : {}; | ||
let options = this._getFromJson([APPLICATION_META_DATA_TAG, 'sap', 'service-manager'], tenantMetadata) || {}; | ||
@@ -30,3 +39,4 @@ if (Object.keys(options).length === 0) { | ||
} | ||
return options; | ||
mergedOptions.provisioning_parameters = { ...mergedOptions.provisioning_parameters, ...options.provisioning_parameters } | ||
return mergedOptions; | ||
} | ||
@@ -33,0 +43,0 @@ |
@@ -157,3 +157,3 @@ const path = require('path'); | ||
} | ||
}, intervalTimeout); | ||
}, intervalTimeout).unref(); | ||
} | ||
@@ -160,0 +160,0 @@ |
@@ -19,19 +19,2 @@ const fs = require('fs'); | ||
// subset of https://help.sap.com/viewer/4505d0bdaf4948449b7f7379d24d0f0d/2.0.05/en-US/a4bbc2dd8a20442387dc7b706e8d3070.html | ||
const ALLOWED_HDI_OPTIONS = [ | ||
'undeploy', | ||
'path_parameter', | ||
'path-parameter', // leave it for now in case someone has used it (without impact) so that the deployment does not break | ||
'include_filter', | ||
'exclude_filter', | ||
'write_timeout', | ||
'write-timeout', // see above | ||
'connection_timeout', | ||
'connection-timeout', // see above | ||
'trace', | ||
'lock_container_timeout', | ||
'lock-container-timeout', // see above | ||
'working_set' | ||
] | ||
class HdiDeployment extends Deployment { | ||
@@ -131,11 +114,2 @@ | ||
static _verifyAdvancedOptions(advancedOptions) { | ||
for (const option in advancedOptions) { | ||
if (!ALLOWED_HDI_OPTIONS.includes(option)) { | ||
throw new DeploymentError(`HDI deployment option '${option}' cannot be used with mtx deployment`); | ||
} | ||
} | ||
return; | ||
} | ||
static _getDeployOptionsFromEnv() { | ||
@@ -157,3 +131,2 @@ const jsonEnv = process.env.HDI_DEPLOY_OPTIONS; | ||
if (!ignoreOptions) { | ||
HdiDeployment._verifyAdvancedOptions(advancedOptions); | ||
@@ -163,3 +136,2 @@ //first get and check deploy options from env | ||
if (deployOptionsFromEnv) { | ||
HdiDeployment._verifyAdvancedOptions(deployOptionsFromEnv); | ||
Object.assign(deployOptions, deployOptionsFromEnv); | ||
@@ -166,0 +138,0 @@ } |
{ | ||
"name": "@sap/cds-mtx", | ||
"version": "2.6.4", | ||
"version": "2.6.5", | ||
"homepage": "https://cap.cloud.sap/", | ||
@@ -5,0 +5,0 @@ "author": "SAP SE (https://www.sap.com)", |
318228
5884