From 7f5d5643e5f8dfbb71cb4a924551bca180aa8ad3 Mon Sep 17 00:00:00 2001 From: Jeffrey Kinard Date: Wed, 31 Jan 2024 11:00:10 -0500 Subject: [PATCH] add privateConnectivity to TestProperties for Datastream IT's Signed-off-by: Jeffrey Kinard --- cicd/internal/flags/it-flags.go | 2 +- cicd/internal/workflows/maven-workflows.go | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cicd/internal/flags/it-flags.go b/cicd/internal/flags/it-flags.go index 91edd2942e..3e55e0af61 100644 --- a/cicd/internal/flags/it-flags.go +++ b/cicd/internal/flags/it-flags.go @@ -76,7 +76,7 @@ func HostIp() string { } func PrivateConnectivity() string { - if dPrivateConnectivity == "" { + if dPrivateConnectivity != "" { return "-DprivateConnectivity=" + dPrivateConnectivity } return "" diff --git a/cicd/internal/workflows/maven-workflows.go b/cicd/internal/workflows/maven-workflows.go index e9721ccfb6..47f38a28a2 100644 --- a/cicd/internal/workflows/maven-workflows.go +++ b/cicd/internal/workflows/maven-workflows.go @@ -204,6 +204,13 @@ func RunForChangedModules(cmd string, args ...string) error { return nil } + parsedArgs := []string{} + for _, arg := range args { + if arg != "" { + parsedArgs = append(parsedArgs, arg) + } + } + // Collect the modules together for a single call. Maven can work out the install order. modules := make([]string, 0) @@ -265,7 +272,7 @@ func RunForChangedModules(cmd string, args ...string) error { modules = append(modules, "plugins/templates-maven-plugin") - return op.RunMavenOnModule(unifiedPom, cmd, strings.Join(modules, ","), args...) + return op.RunMavenOnModule(unifiedPom, cmd, strings.Join(modules, ","), parsedArgs...) } type spotlessCheckWorkflow struct{}