From ac55ddf525b0845784a261692abf34c94ef24242 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tilo=20K=C3=B6rner?= <70266685+tiloKo@users.noreply.github.com> Date: Fri, 10 May 2024 08:58:46 +0200 Subject: [PATCH] support trustedCerts for cloneGitRepo (#4909) * support trustedCerts for cloneGitRepo * some more steps * Update sap_com_0948.go * remove warning for config value type * updated description for certificateNames * go generate artifacts * variable order and space in "[]interface {}" --- ...apEnvironmentAssemblePackages_generated.go | 2 +- cmd/abapEnvironmentBuild_generated.go | 2 +- cmd/abapEnvironmentCheckoutBranch.go | 1 + ...abapEnvironmentCheckoutBranch_generated.go | 33 ++++++++++----- cmd/abapEnvironmentCloneGitRepo.go | 1 + cmd/abapEnvironmentCloneGitRepo_generated.go | 33 ++++++++++----- cmd/abapEnvironmentCreateTag.go | 1 + cmd/abapEnvironmentCreateTag_generated.go | 41 ++++++++++++------- cmd/abapEnvironmentPullGitRepo.go | 1 + cmd/abapEnvironmentPullGitRepo_generated.go | 11 +++++ pkg/abaputils/abaputils.go | 11 ++--- pkg/abaputils/sap_com_0510.go | 1 + pkg/abaputils/sap_com_0948.go | 1 + pkg/config/config.go | 12 +++++- .../abapEnvironmentAssemblePackages.yaml | 2 +- resources/metadata/abapEnvironmentBuild.yaml | 2 +- .../abapEnvironmentCheckoutBranch.yaml | 9 ++++ .../metadata/abapEnvironmentCloneGitRepo.yaml | 9 ++++ .../metadata/abapEnvironmentCreateTag.yaml | 9 ++++ .../metadata/abapEnvironmentPullGitRepo.yaml | 9 ++++ 20 files changed, 144 insertions(+), 47 deletions(-) diff --git a/cmd/abapEnvironmentAssemblePackages_generated.go b/cmd/abapEnvironmentAssemblePackages_generated.go index 7eff152de7..256f85a79a 100644 --- a/cmd/abapEnvironmentAssemblePackages_generated.go +++ b/cmd/abapEnvironmentAssemblePackages_generated.go @@ -175,7 +175,7 @@ func addAbapEnvironmentAssemblePackagesFlags(cmd *cobra.Command, stepConfig *aba cmd.Flags().StringVar(&stepConfig.AddonDescriptor, "addonDescriptor", os.Getenv("PIPER_addonDescriptor"), "Structure in the commonPipelineEnvironment containing information about the Product Version and corresponding Software Component Versions") cmd.Flags().IntVar(&stepConfig.MaxRuntimeInMinutes, "maxRuntimeInMinutes", 360, "maximal runtime of the step in minutes") cmd.Flags().IntVar(&stepConfig.PollIntervalsInMilliseconds, "pollIntervalsInMilliseconds", 60000, "wait time in milliseconds till next status request in the backend system") - cmd.Flags().StringSliceVar(&stepConfig.CertificateNames, "certificateNames", []string{}, "certificates for the backend system, this certificates needs to be stored in .pipeline/trustStore") + cmd.Flags().StringSliceVar(&stepConfig.CertificateNames, "certificateNames", []string{}, "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore") cmd.MarkFlagRequired("username") cmd.MarkFlagRequired("password") diff --git a/cmd/abapEnvironmentBuild_generated.go b/cmd/abapEnvironmentBuild_generated.go index ad1fe3ed8b..ed84c605d4 100644 --- a/cmd/abapEnvironmentBuild_generated.go +++ b/cmd/abapEnvironmentBuild_generated.go @@ -197,7 +197,7 @@ func addAbapEnvironmentBuildFlags(cmd *cobra.Command, stepConfig *abapEnvironmen cmd.Flags().BoolVar(&stepConfig.TreatWarningsAsError, "treatWarningsAsError", false, "If a warrning occures, the step will be set to unstable") cmd.Flags().IntVar(&stepConfig.MaxRuntimeInMinutes, "maxRuntimeInMinutes", 360, "maximal runtime of the step in minutes") cmd.Flags().IntVar(&stepConfig.PollingIntervalInSeconds, "pollingIntervalInSeconds", 60, "wait time in seconds till next status request in the backend system") - cmd.Flags().StringSliceVar(&stepConfig.CertificateNames, "certificateNames", []string{}, "certificates for the backend system, this certificates needs to be stored in .pipeline/trustStore") + cmd.Flags().StringSliceVar(&stepConfig.CertificateNames, "certificateNames", []string{}, "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore") cmd.Flags().StringVar(&stepConfig.CpeValues, "cpeValues", os.Getenv("PIPER_cpeValues"), "Values taken from the previous step, if a value was also specified in the config file, the value from cpe will be discarded") cmd.Flags().StringVar(&stepConfig.UseFieldsOfAddonDescriptor, "useFieldsOfAddonDescriptor", os.Getenv("PIPER_useFieldsOfAddonDescriptor"), "use fields of the addonDescriptor in the cpe as input values. Please enter in the format '[{\"use\":\"Name\",\"renameTo\":\"SWC\"}]'") cmd.Flags().StringVar(&stepConfig.ConditionOnAddonDescriptor, "conditionOnAddonDescriptor", os.Getenv("PIPER_conditionOnAddonDescriptor"), "normally if useFieldsOfAddonDescriptor is not initial, a build is triggered for each repository in the addonDescriptor. This can be changed by posing conditions. Please enter in the format '[{\"field\":\"Status\",\"operator\":\"==\",\"value\":\"P\"}]'") diff --git a/cmd/abapEnvironmentCheckoutBranch.go b/cmd/abapEnvironmentCheckoutBranch.go index a1c7bd9642..684b03a2da 100644 --- a/cmd/abapEnvironmentCheckoutBranch.go +++ b/cmd/abapEnvironmentCheckoutBranch.go @@ -47,6 +47,7 @@ func runAbapEnvironmentCheckoutBranch(options *abapEnvironmentCheckoutBranchOpti if errorGetInfo != nil { log.Entry().WithError(errorGetInfo).Fatal("Parameters for the ABAP Connection not available") } + connectionDetails.CertificateNames = options.CertificateNames repositories := []abaputils.Repository{} err = checkCheckoutBranchRepositoryConfiguration(*options) diff --git a/cmd/abapEnvironmentCheckoutBranch_generated.go b/cmd/abapEnvironmentCheckoutBranch_generated.go index 7c19d333f8..4939e41a0a 100644 --- a/cmd/abapEnvironmentCheckoutBranch_generated.go +++ b/cmd/abapEnvironmentCheckoutBranch_generated.go @@ -16,17 +16,18 @@ import ( ) type abapEnvironmentCheckoutBranchOptions struct { - Username string `json:"username,omitempty"` - Password string `json:"password,omitempty"` - RepositoryName string `json:"repositoryName,omitempty"` - BranchName string `json:"branchName,omitempty"` - Host string `json:"host,omitempty"` - Repositories string `json:"repositories,omitempty"` - CfAPIEndpoint string `json:"cfApiEndpoint,omitempty"` - CfOrg string `json:"cfOrg,omitempty"` - CfSpace string `json:"cfSpace,omitempty"` - CfServiceInstance string `json:"cfServiceInstance,omitempty"` - CfServiceKeyName string `json:"cfServiceKeyName,omitempty"` + Username string `json:"username,omitempty"` + Password string `json:"password,omitempty"` + RepositoryName string `json:"repositoryName,omitempty"` + BranchName string `json:"branchName,omitempty"` + Host string `json:"host,omitempty"` + Repositories string `json:"repositories,omitempty"` + CfAPIEndpoint string `json:"cfApiEndpoint,omitempty"` + CfOrg string `json:"cfOrg,omitempty"` + CfSpace string `json:"cfSpace,omitempty"` + CfServiceInstance string `json:"cfServiceInstance,omitempty"` + CfServiceKeyName string `json:"cfServiceKeyName,omitempty"` + CertificateNames []string `json:"certificateNames,omitempty"` } // AbapEnvironmentCheckoutBranchCommand Switches between branches of a git repository on a SAP BTP ABAP Environment system @@ -146,6 +147,7 @@ func addAbapEnvironmentCheckoutBranchFlags(cmd *cobra.Command, stepConfig *abapE cmd.Flags().StringVar(&stepConfig.CfSpace, "cfSpace", os.Getenv("PIPER_cfSpace"), "Cloud Foundry target space") cmd.Flags().StringVar(&stepConfig.CfServiceInstance, "cfServiceInstance", os.Getenv("PIPER_cfServiceInstance"), "Cloud Foundry Service Instance") cmd.Flags().StringVar(&stepConfig.CfServiceKeyName, "cfServiceKeyName", os.Getenv("PIPER_cfServiceKeyName"), "Cloud Foundry Service Key") + cmd.Flags().StringSliceVar(&stepConfig.CertificateNames, "certificateNames", []string{}, "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore") cmd.MarkFlagRequired("username") cmd.MarkFlagRequired("password") @@ -276,6 +278,15 @@ func abapEnvironmentCheckoutBranchMetadata() config.StepData { Aliases: []config.Alias{{Name: "cloudFoundry/serviceKey"}, {Name: "cloudFoundry/serviceKeyName"}, {Name: "cfServiceKeyName"}}, Default: os.Getenv("PIPER_cfServiceKeyName"), }, + { + Name: "certificateNames", + ResourceRef: []config.ResourceReference{}, + Scope: []string{"PARAMETERS", "STAGES", "STEPS", "GENERAL"}, + Type: "[]string", + Mandatory: false, + Aliases: []config.Alias{}, + Default: []string{}, + }, }, }, Containers: []config.Container{ diff --git a/cmd/abapEnvironmentCloneGitRepo.go b/cmd/abapEnvironmentCloneGitRepo.go index 9776312b2e..687044dd77 100644 --- a/cmd/abapEnvironmentCloneGitRepo.go +++ b/cmd/abapEnvironmentCloneGitRepo.go @@ -52,6 +52,7 @@ func runAbapEnvironmentCloneGitRepo(config *abapEnvironmentCloneGitRepoOptions, if errorGetInfo != nil { return errors.Wrap(errorGetInfo, "Parameters for the ABAP Connection not available") } + connectionDetails.CertificateNames = config.CertificateNames log.Entry().Infof("Start cloning %v repositories", len(repositories)) for _, repo := range repositories { diff --git a/cmd/abapEnvironmentCloneGitRepo_generated.go b/cmd/abapEnvironmentCloneGitRepo_generated.go index ca08f51007..8f37662939 100644 --- a/cmd/abapEnvironmentCloneGitRepo_generated.go +++ b/cmd/abapEnvironmentCloneGitRepo_generated.go @@ -16,17 +16,18 @@ import ( ) type abapEnvironmentCloneGitRepoOptions struct { - Username string `json:"username,omitempty"` - Password string `json:"password,omitempty"` - Repositories string `json:"repositories,omitempty"` - RepositoryName string `json:"repositoryName,omitempty"` - BranchName string `json:"branchName,omitempty"` - Host string `json:"host,omitempty"` - CfAPIEndpoint string `json:"cfApiEndpoint,omitempty"` - CfOrg string `json:"cfOrg,omitempty"` - CfSpace string `json:"cfSpace,omitempty"` - CfServiceInstance string `json:"cfServiceInstance,omitempty"` - CfServiceKeyName string `json:"cfServiceKeyName,omitempty"` + Username string `json:"username,omitempty"` + Password string `json:"password,omitempty"` + Repositories string `json:"repositories,omitempty"` + RepositoryName string `json:"repositoryName,omitempty"` + BranchName string `json:"branchName,omitempty"` + Host string `json:"host,omitempty"` + CfAPIEndpoint string `json:"cfApiEndpoint,omitempty"` + CfOrg string `json:"cfOrg,omitempty"` + CfSpace string `json:"cfSpace,omitempty"` + CfServiceInstance string `json:"cfServiceInstance,omitempty"` + CfServiceKeyName string `json:"cfServiceKeyName,omitempty"` + CertificateNames []string `json:"certificateNames,omitempty"` } // AbapEnvironmentCloneGitRepoCommand Clones a git repository to a SAP BTP ABAP Environment system @@ -146,6 +147,7 @@ func addAbapEnvironmentCloneGitRepoFlags(cmd *cobra.Command, stepConfig *abapEnv cmd.Flags().StringVar(&stepConfig.CfSpace, "cfSpace", os.Getenv("PIPER_cfSpace"), "Cloud Foundry target space") cmd.Flags().StringVar(&stepConfig.CfServiceInstance, "cfServiceInstance", os.Getenv("PIPER_cfServiceInstance"), "Cloud Foundry Service Instance") cmd.Flags().StringVar(&stepConfig.CfServiceKeyName, "cfServiceKeyName", os.Getenv("PIPER_cfServiceKeyName"), "Cloud Foundry Service Key") + cmd.Flags().StringSliceVar(&stepConfig.CertificateNames, "certificateNames", []string{}, "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore") cmd.MarkFlagRequired("username") cmd.MarkFlagRequired("password") @@ -276,6 +278,15 @@ func abapEnvironmentCloneGitRepoMetadata() config.StepData { Aliases: []config.Alias{{Name: "cloudFoundry/serviceKey"}, {Name: "cloudFoundry/serviceKeyName"}, {Name: "cfServiceKey"}}, Default: os.Getenv("PIPER_cfServiceKeyName"), }, + { + Name: "certificateNames", + ResourceRef: []config.ResourceReference{}, + Scope: []string{"PARAMETERS", "STAGES", "STEPS", "GENERAL"}, + Type: "[]string", + Mandatory: false, + Aliases: []config.Alias{}, + Default: []string{}, + }, }, }, Containers: []config.Container{ diff --git a/cmd/abapEnvironmentCreateTag.go b/cmd/abapEnvironmentCreateTag.go index 961b062f42..5adebcda7d 100644 --- a/cmd/abapEnvironmentCreateTag.go +++ b/cmd/abapEnvironmentCreateTag.go @@ -40,6 +40,7 @@ func runAbapEnvironmentCreateTag(config *abapEnvironmentCreateTagOptions, com ab if errorGetInfo != nil { return errors.Wrap(errorGetInfo, "Parameters for the ABAP Connection not available") } + connectionDetails.CertificateNames = config.CertificateNames backlog, errorPrepare := prepareBacklog(config) if errorPrepare != nil { diff --git a/cmd/abapEnvironmentCreateTag_generated.go b/cmd/abapEnvironmentCreateTag_generated.go index cb25dc6f4d..86886f8a72 100644 --- a/cmd/abapEnvironmentCreateTag_generated.go +++ b/cmd/abapEnvironmentCreateTag_generated.go @@ -16,21 +16,22 @@ import ( ) type abapEnvironmentCreateTagOptions struct { - Username string `json:"username,omitempty"` - Password string `json:"password,omitempty"` - Repositories string `json:"repositories,omitempty"` - RepositoryName string `json:"repositoryName,omitempty"` - CommitID string `json:"commitID,omitempty"` - TagName string `json:"tagName,omitempty"` - TagDescription string `json:"tagDescription,omitempty"` - GenerateTagForAddonProductVersion bool `json:"generateTagForAddonProductVersion,omitempty"` - GenerateTagForAddonComponentVersion bool `json:"generateTagForAddonComponentVersion,omitempty"` - Host string `json:"host,omitempty"` - CfAPIEndpoint string `json:"cfApiEndpoint,omitempty"` - CfOrg string `json:"cfOrg,omitempty"` - CfSpace string `json:"cfSpace,omitempty"` - CfServiceInstance string `json:"cfServiceInstance,omitempty"` - CfServiceKeyName string `json:"cfServiceKeyName,omitempty"` + Username string `json:"username,omitempty"` + Password string `json:"password,omitempty"` + Repositories string `json:"repositories,omitempty"` + RepositoryName string `json:"repositoryName,omitempty"` + CommitID string `json:"commitID,omitempty"` + TagName string `json:"tagName,omitempty"` + TagDescription string `json:"tagDescription,omitempty"` + GenerateTagForAddonProductVersion bool `json:"generateTagForAddonProductVersion,omitempty"` + GenerateTagForAddonComponentVersion bool `json:"generateTagForAddonComponentVersion,omitempty"` + Host string `json:"host,omitempty"` + CfAPIEndpoint string `json:"cfApiEndpoint,omitempty"` + CfOrg string `json:"cfOrg,omitempty"` + CfSpace string `json:"cfSpace,omitempty"` + CfServiceInstance string `json:"cfServiceInstance,omitempty"` + CfServiceKeyName string `json:"cfServiceKeyName,omitempty"` + CertificateNames []string `json:"certificateNames,omitempty"` } // AbapEnvironmentCreateTagCommand Creates a tag for a git repository to a SAP BTP ABAP Environment system @@ -154,6 +155,7 @@ func addAbapEnvironmentCreateTagFlags(cmd *cobra.Command, stepConfig *abapEnviro cmd.Flags().StringVar(&stepConfig.CfSpace, "cfSpace", os.Getenv("PIPER_cfSpace"), "Cloud Foundry target space") cmd.Flags().StringVar(&stepConfig.CfServiceInstance, "cfServiceInstance", os.Getenv("PIPER_cfServiceInstance"), "Cloud Foundry Service Instance") cmd.Flags().StringVar(&stepConfig.CfServiceKeyName, "cfServiceKeyName", os.Getenv("PIPER_cfServiceKeyName"), "Cloud Foundry Service Key") + cmd.Flags().StringSliceVar(&stepConfig.CertificateNames, "certificateNames", []string{}, "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore") cmd.MarkFlagRequired("username") cmd.MarkFlagRequired("password") @@ -320,6 +322,15 @@ func abapEnvironmentCreateTagMetadata() config.StepData { Aliases: []config.Alias{{Name: "cloudFoundry/serviceKey"}, {Name: "cloudFoundry/serviceKeyName"}, {Name: "cfServiceKey"}}, Default: os.Getenv("PIPER_cfServiceKeyName"), }, + { + Name: "certificateNames", + ResourceRef: []config.ResourceReference{}, + Scope: []string{"PARAMETERS", "STAGES", "STEPS", "GENERAL"}, + Type: "[]string", + Mandatory: false, + Aliases: []config.Alias{}, + Default: []string{}, + }, }, }, Containers: []config.Container{ diff --git a/cmd/abapEnvironmentPullGitRepo.go b/cmd/abapEnvironmentPullGitRepo.go index 8c93a2d55c..93e51a3048 100644 --- a/cmd/abapEnvironmentPullGitRepo.go +++ b/cmd/abapEnvironmentPullGitRepo.go @@ -45,6 +45,7 @@ func runAbapEnvironmentPullGitRepo(options *abapEnvironmentPullGitRepoOptions, c if err != nil { return errors.Wrap(err, "Parameters for the ABAP Connection not available") } + connectionDetails.CertificateNames = options.CertificateNames var repositories []abaputils.Repository err = checkPullRepositoryConfiguration(*options) diff --git a/cmd/abapEnvironmentPullGitRepo_generated.go b/cmd/abapEnvironmentPullGitRepo_generated.go index 3056f544a5..547deaec7a 100644 --- a/cmd/abapEnvironmentPullGitRepo_generated.go +++ b/cmd/abapEnvironmentPullGitRepo_generated.go @@ -29,6 +29,7 @@ type abapEnvironmentPullGitRepoOptions struct { CfServiceInstance string `json:"cfServiceInstance,omitempty"` CfServiceKeyName string `json:"cfServiceKeyName,omitempty"` IgnoreCommit bool `json:"ignoreCommit,omitempty"` + CertificateNames []string `json:"certificateNames,omitempty"` } // AbapEnvironmentPullGitRepoCommand Pulls a git repository to a SAP BTP ABAP Environment system @@ -150,6 +151,7 @@ func addAbapEnvironmentPullGitRepoFlags(cmd *cobra.Command, stepConfig *abapEnvi cmd.Flags().StringVar(&stepConfig.CfServiceInstance, "cfServiceInstance", os.Getenv("PIPER_cfServiceInstance"), "Cloud Foundry Service Instance") cmd.Flags().StringVar(&stepConfig.CfServiceKeyName, "cfServiceKeyName", os.Getenv("PIPER_cfServiceKeyName"), "Cloud Foundry Service Key") cmd.Flags().BoolVar(&stepConfig.IgnoreCommit, "ignoreCommit", false, "ingores a commit provided via the repositories file") + cmd.Flags().StringSliceVar(&stepConfig.CertificateNames, "certificateNames", []string{}, "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore") cmd.MarkFlagRequired("username") cmd.MarkFlagRequired("password") @@ -298,6 +300,15 @@ func abapEnvironmentPullGitRepoMetadata() config.StepData { Aliases: []config.Alias{}, Default: false, }, + { + Name: "certificateNames", + ResourceRef: []config.ResourceReference{}, + Scope: []string{"PARAMETERS", "STAGES", "STEPS", "GENERAL"}, + Type: "[]string", + Mandatory: false, + Aliases: []config.Alias{}, + Default: []string{}, + }, }, }, Containers: []config.Container{ diff --git a/pkg/abaputils/abaputils.go b/pkg/abaputils/abaputils.go index d548ee8a30..6f3d20bf35 100644 --- a/pkg/abaputils/abaputils.go +++ b/pkg/abaputils/abaputils.go @@ -300,11 +300,12 @@ type AbapMetadata struct { // ConnectionDetailsHTTP contains fields for HTTP connections including the XCSRF token type ConnectionDetailsHTTP struct { - Host string - User string `json:"user"` - Password string `json:"password"` - URL string `json:"url"` - XCsrfToken string `json:"xcsrftoken"` + Host string + User string `json:"user"` + Password string `json:"password"` + URL string `json:"url"` + XCsrfToken string `json:"xcsrftoken"` + CertificateNames []string `json:"-"` } // AbapError contains the error code and the error message for ABAP errors diff --git a/pkg/abaputils/sap_com_0510.go b/pkg/abaputils/sap_com_0510.go index ae88b467a6..f543c9ff6f 100644 --- a/pkg/abaputils/sap_com_0510.go +++ b/pkg/abaputils/sap_com_0510.go @@ -330,6 +330,7 @@ func (api *SAP_COM_0510) initialRequest() error { CookieJar: cookieJar, Username: api.con.User, Password: api.con.Password, + TrustedCerts: api.con.CertificateNames, }) headConnection := api.con diff --git a/pkg/abaputils/sap_com_0948.go b/pkg/abaputils/sap_com_0948.go index 18fd7bb672..de1ac13eba 100644 --- a/pkg/abaputils/sap_com_0948.go +++ b/pkg/abaputils/sap_com_0948.go @@ -339,6 +339,7 @@ func (api *SAP_COM_0948) initialRequest() error { CookieJar: cookieJar, Username: api.con.User, Password: api.con.Password, + TrustedCerts: api.con.CertificateNames, }) // HEAD request to the root is not sufficient, as an unauthorized called is allowed to do so diff --git a/pkg/config/config.go b/pkg/config/config.go index 14f65686a8..65803ec296 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -510,7 +510,17 @@ func merge(base, overlay map[string]interface{}, metadata StepData) map[string]i for _, v := range metadata.Spec.Inputs.Parameters { tVal := reflect.TypeOf(value).String() if v.Name == key && tVal != v.Type { - log.Entry().Warn("config value provided for ", v.Name, " is of wrong type ", tVal, " should be of type ", v.Type) + if tVal == "[]interface {}" && v.Type == "[]string" { + //json Unmarshal genertes arrays of interface{} for string arrays + for _, interfaceValue := range value.([]interface{}) { + arrayValueType := reflect.TypeOf(interfaceValue).String() + if arrayValueType != "string" { + log.Entry().Warnf("config id %s should only contain strings but contains a %s", v.Name, arrayValueType) + } + } + } else { + log.Entry().Warnf("config value provided for %s is of wrong type %s should be of type %s", v.Name, tVal, v.Type) + } } } } diff --git a/resources/metadata/abapEnvironmentAssemblePackages.yaml b/resources/metadata/abapEnvironmentAssemblePackages.yaml index 9ef2c70de2..d252d8e193 100644 --- a/resources/metadata/abapEnvironmentAssemblePackages.yaml +++ b/resources/metadata/abapEnvironmentAssemblePackages.yaml @@ -129,7 +129,7 @@ spec: - STEPS - name: certificateNames type: "[]string" - description: certificates for the backend system, this certificates needs to be stored in .pipeline/trustStore + description: "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore" mandatory: false scope: - PARAMETERS diff --git a/resources/metadata/abapEnvironmentBuild.yaml b/resources/metadata/abapEnvironmentBuild.yaml index b67b372671..3aee96ae9e 100644 --- a/resources/metadata/abapEnvironmentBuild.yaml +++ b/resources/metadata/abapEnvironmentBuild.yaml @@ -203,7 +203,7 @@ spec: - STEPS - name: certificateNames type: "[]string" - description: certificates for the backend system, this certificates needs to be stored in .pipeline/trustStore + description: "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore" mandatory: false scope: - PARAMETERS diff --git a/resources/metadata/abapEnvironmentCheckoutBranch.yaml b/resources/metadata/abapEnvironmentCheckoutBranch.yaml index 8290313cdd..65f0aeb8b6 100644 --- a/resources/metadata/abapEnvironmentCheckoutBranch.yaml +++ b/resources/metadata/abapEnvironmentCheckoutBranch.yaml @@ -127,6 +127,15 @@ spec: - name: cloudFoundry/serviceKey - name: cloudFoundry/serviceKeyName - name: cfServiceKeyName + - name: certificateNames + type: "[]string" + description: "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore" + mandatory: false + scope: + - PARAMETERS + - STAGES + - STEPS + - GENERAL containers: - name: cf image: ppiper/cf-cli:v12 diff --git a/resources/metadata/abapEnvironmentCloneGitRepo.yaml b/resources/metadata/abapEnvironmentCloneGitRepo.yaml index 9f3fb2360d..e4d4035cf0 100644 --- a/resources/metadata/abapEnvironmentCloneGitRepo.yaml +++ b/resources/metadata/abapEnvironmentCloneGitRepo.yaml @@ -127,6 +127,15 @@ spec: - name: cloudFoundry/serviceKey - name: cloudFoundry/serviceKeyName - name: cfServiceKey + - name: certificateNames + type: "[]string" + description: "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore" + mandatory: false + scope: + - PARAMETERS + - STAGES + - STEPS + - GENERAL containers: - name: cf image: ppiper/cf-cli:v12 diff --git a/resources/metadata/abapEnvironmentCreateTag.yaml b/resources/metadata/abapEnvironmentCreateTag.yaml index a5b25cde74..58403f3add 100644 --- a/resources/metadata/abapEnvironmentCreateTag.yaml +++ b/resources/metadata/abapEnvironmentCreateTag.yaml @@ -157,6 +157,15 @@ spec: - name: cloudFoundry/serviceKey - name: cloudFoundry/serviceKeyName - name: cfServiceKey + - name: certificateNames + type: "[]string" + description: "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore" + mandatory: false + scope: + - PARAMETERS + - STAGES + - STEPS + - GENERAL containers: - name: cf image: ppiper/cf-cli:v12 diff --git a/resources/metadata/abapEnvironmentPullGitRepo.yaml b/resources/metadata/abapEnvironmentPullGitRepo.yaml index f9e2d910e7..576a4e7652 100644 --- a/resources/metadata/abapEnvironmentPullGitRepo.yaml +++ b/resources/metadata/abapEnvironmentPullGitRepo.yaml @@ -140,6 +140,15 @@ spec: scope: - PARAMETERS default: false + - name: certificateNames + type: "[]string" + description: "file names of trusted (self-signed) server certificates - need to be stored in .pipeline/trustStore" + mandatory: false + scope: + - PARAMETERS + - STAGES + - STEPS + - GENERAL containers: - name: cf image: ppiper/cf-cli:v12