1
0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-12 10:55:20 +02:00

Remove platform from triggerIntegration step (#2957)

This commit is contained in:
Linda Siebert 2021-06-30 17:00:49 +02:00 committed by GitHub
parent b68f549923
commit 7a8f4f06eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 28 deletions

View File

@ -17,7 +17,6 @@ import (
type integrationArtifactTriggerIntegrationTestOptions struct { type integrationArtifactTriggerIntegrationTestOptions struct {
IFlowServiceKey string `json:"iFlowServiceKey,omitempty"` IFlowServiceKey string `json:"iFlowServiceKey,omitempty"`
IntegrationFlowID string `json:"integrationFlowId,omitempty"` IntegrationFlowID string `json:"integrationFlowId,omitempty"`
Platform string `json:"platform,omitempty"`
IFlowServiceEndpointURL string `json:"iFlowServiceEndpointUrl,omitempty"` IFlowServiceEndpointURL string `json:"iFlowServiceEndpointUrl,omitempty"`
ContentType string `json:"contentType,omitempty"` ContentType string `json:"contentType,omitempty"`
MessageBodyPath string `json:"messageBodyPath,omitempty"` MessageBodyPath string `json:"messageBodyPath,omitempty"`
@ -99,7 +98,6 @@ func IntegrationArtifactTriggerIntegrationTestCommand() *cobra.Command {
func addIntegrationArtifactTriggerIntegrationTestFlags(cmd *cobra.Command, stepConfig *integrationArtifactTriggerIntegrationTestOptions) { func addIntegrationArtifactTriggerIntegrationTestFlags(cmd *cobra.Command, stepConfig *integrationArtifactTriggerIntegrationTestOptions) {
cmd.Flags().StringVar(&stepConfig.IFlowServiceKey, "iFlowServiceKey", os.Getenv("PIPER_iFlowServiceKey"), "User to authenticate to the SAP Cloud Platform Integration Service") cmd.Flags().StringVar(&stepConfig.IFlowServiceKey, "iFlowServiceKey", os.Getenv("PIPER_iFlowServiceKey"), "User to authenticate to the SAP Cloud Platform Integration Service")
cmd.Flags().StringVar(&stepConfig.IntegrationFlowID, "integrationFlowId", os.Getenv("PIPER_integrationFlowId"), "Specifies the ID of the Integration Flow artifact") cmd.Flags().StringVar(&stepConfig.IntegrationFlowID, "integrationFlowId", os.Getenv("PIPER_integrationFlowId"), "Specifies the ID of the Integration Flow artifact")
cmd.Flags().StringVar(&stepConfig.Platform, "platform", `cf`, "Specifies the running platform of the SAP Cloud platform integraion service")
cmd.Flags().StringVar(&stepConfig.IFlowServiceEndpointURL, "iFlowServiceEndpointUrl", os.Getenv("PIPER_iFlowServiceEndpointUrl"), "Specifies the URL endpoint of the iFlow. Please provide in the format `<protocol>://<host>:<port>`. Supported protocols are `http` and `https`.") cmd.Flags().StringVar(&stepConfig.IFlowServiceEndpointURL, "iFlowServiceEndpointUrl", os.Getenv("PIPER_iFlowServiceEndpointUrl"), "Specifies the URL endpoint of the iFlow. Please provide in the format `<protocol>://<host>:<port>`. Supported protocols are `http` and `https`.")
cmd.Flags().StringVar(&stepConfig.ContentType, "contentType", os.Getenv("PIPER_contentType"), "Specifies the content type of the file defined in messageBodyPath e.g. application/json") cmd.Flags().StringVar(&stepConfig.ContentType, "contentType", os.Getenv("PIPER_contentType"), "Specifies the content type of the file defined in messageBodyPath e.g. application/json")
cmd.Flags().StringVar(&stepConfig.MessageBodyPath, "messageBodyPath", os.Getenv("PIPER_messageBodyPath"), "Speficfies the relative file path to the message body.") cmd.Flags().StringVar(&stepConfig.MessageBodyPath, "messageBodyPath", os.Getenv("PIPER_messageBodyPath"), "Speficfies the relative file path to the message body.")
@ -147,15 +145,6 @@ func integrationArtifactTriggerIntegrationTestMetadata() config.StepData {
Aliases: []config.Alias{}, Aliases: []config.Alias{},
Default: os.Getenv("PIPER_integrationFlowId"), Default: os.Getenv("PIPER_integrationFlowId"),
}, },
{
Name: "platform",
ResourceRef: []config.ResourceReference{},
Scope: []string{"PARAMETERS", "STAGES", "STEPS"},
Type: "string",
Mandatory: false,
Aliases: []config.Alias{},
Default: `cf`,
},
{ {
Name: "iFlowServiceEndpointUrl", Name: "iFlowServiceEndpointUrl",
ResourceRef: []config.ResourceReference{ ResourceRef: []config.ResourceReference{

View File

@ -37,7 +37,6 @@ func TestRunIntegrationArtifactTriggerIntegrationTest(t *testing.T) {
config := integrationArtifactTriggerIntegrationTestOptions{ config := integrationArtifactTriggerIntegrationTestOptions{
IFlowServiceKey: iFlowServiceKey, IFlowServiceKey: iFlowServiceKey,
IntegrationFlowID: "CPI_IFlow_Call_using_Cert", IntegrationFlowID: "CPI_IFlow_Call_using_Cert",
Platform: "cf",
MessageBodyPath: "/file.txt", MessageBodyPath: "/file.txt",
ContentType: "", ContentType: "",
} }
@ -66,7 +65,6 @@ func TestRunIntegrationArtifactTriggerIntegrationTest(t *testing.T) {
config := integrationArtifactTriggerIntegrationTestOptions{ config := integrationArtifactTriggerIntegrationTestOptions{
IFlowServiceKey: iFlowServiceKey, IFlowServiceKey: iFlowServiceKey,
IntegrationFlowID: "CPI_IFlow_Call_using_Cert", IntegrationFlowID: "CPI_IFlow_Call_using_Cert",
Platform: "cf",
MessageBodyPath: "test.txt", MessageBodyPath: "test.txt",
ContentType: "txt", ContentType: "txt",
} }
@ -98,7 +96,6 @@ func TestRunIntegrationArtifactTriggerIntegrationTest(t *testing.T) {
config := integrationArtifactTriggerIntegrationTestOptions{ config := integrationArtifactTriggerIntegrationTestOptions{
IFlowServiceKey: iFlowServiceKey, IFlowServiceKey: iFlowServiceKey,
IntegrationFlowID: "CPI_IFlow_Call_using_Cert", IntegrationFlowID: "CPI_IFlow_Call_using_Cert",
Platform: "cf",
MessageBodyPath: filepath.Join(dir, "test.txt"), MessageBodyPath: filepath.Join(dir, "test.txt"),
ContentType: "txt", ContentType: "txt",
} }
@ -130,7 +127,6 @@ func TestRunIntegrationArtifactTriggerIntegrationTest(t *testing.T) {
config := integrationArtifactTriggerIntegrationTestOptions{ config := integrationArtifactTriggerIntegrationTestOptions{
IFlowServiceKey: iFlowServiceKey, IFlowServiceKey: iFlowServiceKey,
IntegrationFlowID: "CPI_IFlow_Call_using_Cert", IntegrationFlowID: "CPI_IFlow_Call_using_Cert",
Platform: "cf",
MessageBodyPath: "", MessageBodyPath: "",
ContentType: "txt", ContentType: "txt",
} }
@ -166,7 +162,6 @@ func TestRunIntegrationArtifactTriggerIntegrationTest(t *testing.T) {
config := integrationArtifactTriggerIntegrationTestOptions{ config := integrationArtifactTriggerIntegrationTestOptions{
IFlowServiceKey: iFlowServiceKey, IFlowServiceKey: iFlowServiceKey,
IntegrationFlowID: "CPI_IFlow_Call_using_Cert", IntegrationFlowID: "CPI_IFlow_Call_using_Cert",
Platform: "cf",
MessageBodyPath: filepath.Join(dir, "test.txt"), MessageBodyPath: filepath.Join(dir, "test.txt"),
ContentType: "txt", ContentType: "txt",
} }

View File

@ -31,18 +31,6 @@ spec:
- STEPS - STEPS
- GENERAL - GENERAL
mandatory: true mandatory: true
- name: platform
type: string
description: Specifies the running platform of the SAP Cloud platform integraion service
scope:
- PARAMETERS
- STAGES
- STEPS
mandatory: false
default: cf
possibleValues:
- cf
- neo
- name: iFlowServiceEndpointUrl - name: iFlowServiceEndpointUrl
resourceRef: resourceRef:
- name: commonPipelineEnvironment - name: commonPipelineEnvironment