jenkins/sap-jenkins-library
1
0
Fork 0
mirror of https://github.com/SAP/jenkins-library.git synced 2025-01-16 05:16:08 +02:00
Code Issues Releases Activity

Add parent_saas_appname (#2434)

Browse Source
This commit is contained in:
Daniel Mieg 2020-11-30 10:50:43 +01:00 committed by GitHub
parent c9e2a09ca1
commit 518d2fe88d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/abapEnvironmentCreateSystem.go
View File

@ -73,6 +73,7 @@ func runAbapEnvironmentCreateSystem(config *abapEnvironmentCreateSystemOptions,
func generateManifestYAML(config *abapEnvironmentCreateSystemOptions) ([]byte, error) {
addonProduct := ""
addonVersion := ""
parentSaaSAppName := ""
if config.AddonDescriptorFileName != "" && config.IncludeAddon {
descriptor, err := abaputils.ReadAddonDescriptor(config.AddonDescriptorFileName)
if err != nil {
@ -80,6 +81,8 @@ func generateManifestYAML(config *abapEnvironmentCreateSystemOptions) ([]byte, e
}
addonProduct = descriptor.AddonProduct
addonVersion = descriptor.AddonVersionYAML
parentSaaSAppName = "addon_test"
}
params := abapSystemParameters{
AdminEmail: config.AbapSystemAdminEmail,
@ -90,6 +93,7 @@ func generateManifestYAML(config *abapEnvironmentCreateSystemOptions) ([]byte, e
SizeOfRuntime: config.AbapSystemSizeOfRuntime,
AddonProductName: addonProduct,
AddonProductVersion: addonVersion,
ParentSaaSAppName: parentSaaSAppName,
}
serviceParameters, err := json.Marshal(params)
@ -138,6 +142,7 @@ type abapSystemParameters struct {
SizeOfRuntime int `json:"size_of_runtime,omitempty"`
AddonProductName string `json:"addon_product_name,omitempty"`
AddonProductVersion string `json:"addon_product_version,omitempty"`
ParentSaaSAppName string `json:"parent_saas_appname,omitempty"`
}
type serviceManifest struct {

2
cmd/abapEnvironmentCreateSystem_test.go
View File

@ -189,7 +189,7 @@ repositories:
expectedResult := `create-services:
- broker: testService
name: testName
parameters: '{"admin_email":"user@example.com","is_development_allowed":true,"sapsystemname":"H02","size_of_persistence":4,"size_of_runtime":4,"addon_product_name":"myProduct","addon_product_version":"1.2.3"}'
parameters: '{"admin_email":"user@example.com","is_development_allowed":true,"sapsystemname":"H02","size_of_persistence":4,"size_of_runtime":4,"addon_product_name":"myProduct","addon_product_version":"1.2.3","parent_saas_appname":"addon_test"}'
plan: testPlan
`