- Fixed go imports

- Added trimmed space condition for key

Author: cx-anjali-deore

internal/commands/root.go

@@ -2,7 +2,7 @@ package commands
 
 import (
 	"fmt"
-	"github.com/checkmarx/ast-cli/internal/wrappers/utils"
+
 	"io"
 	"log"
 	"os"
@@ -16,6 +16,7 @@ import (
 	"github.com/checkmarx/ast-cli/internal/params"
 	"github.com/checkmarx/ast-cli/internal/wrappers/bitbucketserver"
 	"github.com/checkmarx/ast-cli/internal/wrappers/configuration"
+	"github.com/checkmarx/ast-cli/internal/wrappers/utils"
 	"github.com/pkg/errors"
 
 	"github.com/checkmarx/ast-cli/internal/wrappers"

internal/services/asca.go

@@ -3,6 +3,12 @@ package services
 import (
 	"encoding/json"
 	"fmt"
+	"net"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"strings"
+	"time"
 
 	"github.com/checkmarx/ast-cli/internal/commands/asca/ascaconfig"
 	"github.com/checkmarx/ast-cli/internal/logger"
@@ -15,12 +21,6 @@ import (
 	getport "github.com/jsumners/go-getport"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
 )
 
 const (

internal/services/osinstaller/os-installer-structs.go

@@ -1,9 +1,10 @@
 package osinstaller
 
 import (
-	"github.com/checkmarx/ast-cli/internal/logger"
 	"os"
 	"path/filepath"
+
+	"github.com/checkmarx/ast-cli/internal/logger"
 )
 
 type InstallationConfiguration struct {

internal/wrappers/utils/utils.go

@@ -48,7 +48,8 @@ func SetOptionalParam(key, value string) {
 	mutex.Lock()
 	defer mutex.Unlock()
 	value = strings.TrimSpace(value)
-	if _, ok := allowedOptionalKeys[strings.TrimSpace(key)]; ok {
+	key = strings.TrimSpace(key)
+	if _, ok := allowedOptionalKeys[key]; ok {
 		optionalParams[key] = value
 	}
 }
@@ -63,9 +64,9 @@ func hasOptionalParam(key string) bool {
 func GetOptionalParam(key string) string {
 	mutex.RLock()
 	defer mutex.RUnlock()
-	key = strings.TrimSpace(key)
-	if hasOptionalParam(key) {
-		return optionalParams[key]
+	trimmedKey := strings.TrimSpace(key)
+	if hasOptionalParam(trimmedKey) {
+		return optionalParams[trimmedKey]
 	}
 	return ""
 }

internal/wrappers/utils/utils_test.go

@@ -6,6 +6,10 @@ import (
 	"testing"
 )
 
+const (
+	ascaLocationKey = "asca-location"
+)
+
 func TestCleanURL_CleansCorrectly(t *testing.T) {
 	uri := "https://codebashing.checkmarx.com/courses/java/////lessons/sql_injection/////"
 	want := "https://codebashing.checkmarx.com/courses/java/lessons/sql_injection"
@@ -170,7 +174,7 @@ func clearOptionalParams() {
 
 func TestSetAndGetAllowedKey(t *testing.T) {
 	clearOptionalParams()
-	key := "asca-location"
+	key := ascaLocationKey
 	value := "location-1"
 
 	SetOptionalParam(key, value)
@@ -206,23 +210,17 @@ func TestSetWithTrimmedKeyBehavior(t *testing.T) {
 	clearOptionalParams()
 
 	originalKey := "  asca-location  "
-	trimmedKey := "asca-location"
+	trimmedKey := ascaLocationKey
 	value := "trimmed-value"
 
 	SetOptionalParam(originalKey, value)
 
-	if !hasOptionalParam(originalKey) {
-		t.Fatalf("expected hasOptionalParam(%q) to be true", originalKey)
-	}
 	if got := GetOptionalParam(originalKey); got != value {
 		t.Fatalf("expected GetOptionalParam(%q) == %q, got %q", originalKey, value, got)
 	}
 
-	if hasOptionalParam(trimmedKey) {
-		t.Fatalf("did not expect hasOptionalParam(%q) to be true", trimmedKey)
-	}
-	if got := GetOptionalParam(trimmedKey); got != "" {
-		t.Fatalf("expected GetOptionalParam(%q) == empty, got %q", trimmedKey, got)
+	if got := GetOptionalParam(trimmedKey); got != value {
+		t.Fatalf("expected GetOptionalParam(%q) == %q, got %q", originalKey, value, got)
 	}
 }
 
@@ -235,16 +233,16 @@ func TestConcurrentSetOptionalParam(t *testing.T) {
 		wg.Add(1)
 		go func(i int) {
 			defer wg.Done()
-			SetOptionalParam("asca-location", "v")
+			SetOptionalParam(ascaLocationKey, "v")
 			SetOptionalParam("not-allowed", "x")
 		}(i)
 	}
 	wg.Wait()
 
-	if !hasOptionalParam("asca-location") {
+	if !hasOptionalParam(ascaLocationKey) {
 		t.Fatalf("expected hasOptionalParam(%q) to be true after concurrent sets", "asca-location")
 	}
 	if GetOptionalParam("asca-location") != "v" {
-		t.Fatalf("expected GetOptionalParam(%q) == %q", "asca-location", "v")
+		t.Fatalf("expected GetOptionalParam(%q) == %q", ascaLocationKey, "v")
 	}
 }