Skip to content

[Fix] Improve validation for service parameters in MtaTransformer and correct error logging in util #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anirudhprasad-sap merged 5 commits into from
Feb 25, 2026
Merged

[Fix] Improve validation for service parameters in MtaTransformer and correct error logging in util #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9eb71c2
[Fix] Improve validation for service parameters in MtaTransformer and…
anirudhprasad-sap Feb 23, 2026
7935d55
Merge branch 'main' into improv
anirudhprasad-sap Feb 23, 2026
ae9a912
[Fix] Rename service parameter to serviceOffering for clarity in MtaT…
anirudhprasad-sap Feb 24, 2026
9fe13af
[Fix] Update serviceInstanceKey construction to use serviceOffering f…
anirudhprasad-sap Feb 24, 2026
0884892
[Fix] Refactor code for consistency and readability in MtaTransformer
anirudhprasad-sap Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bin/cap-op-plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async function capOperatorPlugin(cmd, option, yamlPath) {
if (option === '--with-input-yaml' && !yamlPath)
return _usage(`Input yaml path is missing.`)

if (option === '--with-input-yaml' && !yamlPath && cds.utils.exists(cds.utils.path.join(cds.root, yamlPath)))
if (option === '--with-input-yaml' && yamlPath && !cds.utils.exists(cds.utils.path.join(cds.root, yamlPath)))
return _usage(`Input yaml path ${yamlPath} does not exist.`)

await generateRuntimeValues(option, yamlPath)
Expand All @@ -46,7 +46,7 @@ async function capOperatorPlugin(cmd, option, yamlPath) {
if (option === '--with-runtime-yaml' && !yamlPath)
return _usage(`Input runtime yaml path is missing.`)

if (option === '--with-runtime-yaml' && !yamlPath && cds.utils.exists(cds.utils.path.join(cds.root, yamlPath)))
if (option === '--with-runtime-yaml' && yamlPath && !cds.utils.exists(cds.utils.path.join(cds.root, yamlPath)))
return _usage(`Input runtime yaml path ${yamlPath} does not exist.`)

await convertToconfigurableTemplateChart(option, yamlPath)
Expand Down
69 changes: 37 additions & 32 deletions lib/mta-transformer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,16 @@ module.exports = class MtaTransformer {

async readMtaExtensions() {
let mtaExtensions = []
for(let file of this.mtaExtensionPaths) {
let mtaExt = cds.parse.yaml(await cds.utils.read(cds.utils.path.join(cds.root, file)))
if (mtaExt && mtaExt["_schema-version"].split(".")[0] === this.mta["_schema-version"].split(".")[0] && mtaExt["extends"] === this.mta["ID"]) {
mtaExtensions.push(mtaExt)
} else {
console.log(`⚠️ ${file} is not a valid mta extension file. _schema major version or extends doesn't match. Skipping...`)
}
for (let file of this.mtaExtensionPaths) {
let mtaExt = cds.parse.yaml(await cds.utils.read(cds.utils.path.join(cds.root, file)))
if (mtaExt && mtaExt["_schema-version"].split(".")[0] === this.mta["_schema-version"].split(".")[0] && mtaExt["extends"] === this.mta["ID"]) {
mtaExtensions.push(mtaExt)
} else {
console.log(`⚠️ ${file} is not a valid mta extension file. _schema major version or extends doesn't match. Skipping...`)
}
}
return mtaExtensions
}
}

async getMta() {
this.mta = cds.parse.yaml(await cds.utils.read(join(cds.root, this.mtaFilePath)))
Expand All @@ -41,7 +41,7 @@ module.exports = class MtaTransformer {

this.mergedMta = this.merge(this.mta, this.mtaExtensions)

if (this.mergedMta.parameters){
if (this.mergedMta.parameters) {
this.mergedMta.modules = replacePlaceholders(this.mergedMta.modules, this.mergedMta.parameters)
this.mergedMta.resources = replacePlaceholders(this.mergedMta.resources, this.mergedMta.parameters)
}
Expand Down Expand Up @@ -78,7 +78,7 @@ module.exports = class MtaTransformer {
merge(mta, mtaExtensions) {
let mergedMta = mta

for(let mtaExtension of mtaExtensions) {
for (let mtaExtension of mtaExtensions) {
// Merge parameters
mergedMta.parameters = mergeObj(mergedMta.parameters, mtaExtension.parameters)

Expand All @@ -94,21 +94,26 @@ module.exports = class MtaTransformer {
}

async getServiceInstances() {
if(this.serviceInstances.size !== 0) return this.serviceInstances
if (this.serviceInstances.size !== 0) return this.serviceInstances

if(!this.mergedMta) await this.getMta()
if (!this.mergedMta) await this.getMta()

let managedSvcs = this.mergedMta?.resources.filter(r => r.type === 'org.cloudfoundry.managed-service') || []
for(let svc of managedSvcs) {
this.serviceInstances.set(
svc.parameters["service"] && svc.parameters["service-plan"] ? convertHypenNameToCamelcase(svc.parameters["service"] + "-" +svc.parameters["service-plan"]) : null,
{
name: svc.name,
serviceOfferingName: svc.parameters["service"] ? svc.parameters["service"] : null,
servicePlanName: svc.parameters["service-plan"] ? svc.parameters["service-plan"] : null,
parameters: svc.parameters["config"] ? svc.parameters["config"] : {}
}
)
for (let svc of managedSvcs) {
try {
this.serviceInstances.set(
convertHypenNameToCamelcase(svc.parameters["service"] + "-" + svc.parameters["service-plan"]),
{
name: svc.name,
serviceOfferingName: svc.parameters["service"],
servicePlanName: svc.parameters["service-plan"],
parameters: svc.parameters["config"] || {}
}
)
} catch (err) {
console.warn(`⚠️ Error processing service instance ${svc.name} - ${err.message}. Skipping...`)
continue
}
}

// for xsuaa service instance, remove oauth2-configuration -> redirect-uris as it is filled by service-instance.yaml template
Expand Down Expand Up @@ -151,7 +156,7 @@ module.exports = class MtaTransformer {
async getServiceBindings() {
if (this.serviceBindings.size !== 0) return this.serviceBindings

if (this.workloads.size === 0 ) await this.getWorkloads()
if (this.workloads.size === 0) await this.getWorkloads()

return this.serviceBindings
}
Expand Down Expand Up @@ -181,9 +186,9 @@ module.exports = class MtaTransformer {
serviceInstanceName: consumedBTPService.name,
}
if (this.serviceBindings.has(serviceBindingNameKey) &&
md5(JSON.stringify(this.serviceBindings.get(serviceBindingNameKey))) !== md5(JSON.stringify(serviceBindingValue))) {
md5(JSON.stringify(this.serviceBindings.get(serviceBindingNameKey))) !== md5(JSON.stringify(serviceBindingValue))) {

let serviceBindingNewName = consumedBTPService.name +"-"+ module.name + this.serviceBindingNameSuffix
let serviceBindingNewName = consumedBTPService.name + "-" + module.name + this.serviceBindingNameSuffix
let serviceBindingNewNameKey = convertHypenNameToCamelcase(serviceBindingNewName)
this.serviceBindings.set(serviceBindingNewNameKey, {
name: serviceBindingNewName,
Expand All @@ -194,14 +199,14 @@ module.exports = class MtaTransformer {
})
workloadServiceBindings.push(serviceBindingNewName)
} else if (this.serviceBindings.has(serviceBindingNameKey) &&
md5(JSON.stringify(this.serviceBindings.get(serviceBindingNameKey))) === md5(JSON.stringify(serviceBindingValue))) {
md5(JSON.stringify(this.serviceBindings.get(serviceBindingNameKey))) === md5(JSON.stringify(serviceBindingValue))) {

workloadServiceBindings.push(serviceBindingName)
continue
}
else {
workloadServiceBindings.push(serviceBindingName)
this.serviceBindings.set(serviceBindingNameKey,serviceBindingValue)
this.serviceBindings.set(serviceBindingNameKey, serviceBindingValue)
}
}
return workloadServiceBindings
Expand All @@ -212,7 +217,7 @@ module.exports = class MtaTransformer {
for (const [key, value] of Object.entries(properties)) {
env.push({
name: key,
value: typeof value === 'string'? value : JSON.stringify(value)
value: typeof value === 'string' ? value : JSON.stringify(value)
})
}
return env
Expand All @@ -231,7 +236,7 @@ module.exports = class MtaTransformer {
}
if (module.path?.includes("gen/mtx/sidecar") || module.type === 'com.sap.application.content') {
workload.jobDefinition = {
type: module.type === 'com.sap.application.content'? "Content": "TenantOperation",
type: module.type === 'com.sap.application.content' ? "Content" : "TenantOperation",
image: null
}
} else if (module.path?.includes("gen/srv")) {
Expand All @@ -255,9 +260,9 @@ module.exports = class MtaTransformer {
// delete existing TENANT_HOST_PATTERN if any; Handled in cap-operator-cro.yaml template
if (workload.deploymentDefinition?.type == "Router") {
if (workload.deploymentDefinition.env) {
const index = workload.deploymentDefinition.env.findIndex(e => e.name === "TENANT_HOST_PATTERN")
if (index != -1)
workload.deploymentDefinition.env.splice(index, 1)
const index = workload.deploymentDefinition.env.findIndex(e => e.name === "TENANT_HOST_PATTERN")
if (index != -1)
workload.deploymentDefinition.env.splice(index, 1)
}
}

Expand Down
2 changes: 1 addition & 1 deletion lib/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ function extractAndReplaceHanaInstanceId(env, valuesYaml) {
env[index].value = JSON.stringify(cdsConfig)
}
} catch (err) {
console.warn(`Failed to parse CDS_CONFIG: ${error.message}`)
console.warn(`Failed to parse CDS_CONFIG: ${err.message}`)
}
}

Expand Down
Loading