Skip to content

Commit

Permalink
.
Browse files Browse the repository at this point in the history
  • Loading branch information
eranturgeman committed Dec 19, 2024
1 parent b790857 commit 076d9dd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -118,12 +118,12 @@ require (
gopkg.in/warnings.v0 v0.1.2 // indirect
)

replace github.com/jfrog/jfrog-cli-security => github.com/eranturgeman/jfrog-cli-security v0.0.0-20241215123059-0360f8d1edc9
replace github.com/jfrog/jfrog-cli-security => github.com/eranturgeman/jfrog-cli-security v0.0.0-20241218120723-5c6c28c0bcd9

// replace github.com/jfrog/jfrog-cli-core/v2 => github.com/jfrog/jfrog-cli-core/v2 dev

// replace github.com/jfrog/build-info-go => github.com/jfrog/build-info-go dev

replace github.com/jfrog/jfrog-client-go => github.com/eranturgeman/jfrog-client-go v0.0.0-20241215103234-87d1da5743ae
replace github.com/jfrog/jfrog-client-go => github.com/jfrog/jfrog-client-go v1.28.1-0.20241216153836-80abb8e2edb4

// replace github.com/jfrog/froggit-go => github.com/jfrog/froggit-go dev
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,8 @@ github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcej
github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
github.com/eranturgeman/jfrog-cli-security v0.0.0-20241215123059-0360f8d1edc9 h1:vBxqllyH8PJAcYTRsN/I4w0LdPCXog4qIaiBkPoIdCc=
github.com/eranturgeman/jfrog-cli-security v0.0.0-20241215123059-0360f8d1edc9/go.mod h1:AVv4Eztjc9b8CwbHCiwUoOWKvtftjOQB+OzxXEzfZQI=
github.com/eranturgeman/jfrog-client-go v0.0.0-20241215103234-87d1da5743ae h1:QR8i/yWR7MShinW6oRPt+xm9lfWMS2ZkdQiAv+pUwC8=
github.com/eranturgeman/jfrog-client-go v0.0.0-20241215103234-87d1da5743ae/go.mod h1:3rdSCzKoN1l3wklL33D7nu+nB3089rIgxwyoprFdCaw=
github.com/eranturgeman/jfrog-cli-security v0.0.0-20241218120723-5c6c28c0bcd9 h1:Wnac4+shtUUse14Ru/jiOVP4S07bFL1pdkUsxPWEnZk=
github.com/eranturgeman/jfrog-cli-security v0.0.0-20241218120723-5c6c28c0bcd9/go.mod h1:AVv4Eztjc9b8CwbHCiwUoOWKvtftjOQB+OzxXEzfZQI=
github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
github.com/forPelevin/gomoji v1.2.0 h1:9k4WVSSkE1ARO/BWywxgEUBvR/jMnao6EZzrql5nxJ8=
Expand Down Expand Up @@ -135,6 +133,8 @@ github.com/jfrog/jfrog-apps-config v1.0.1 h1:mtv6k7g8A8BVhlHGlSveapqf4mJfonwvXYL
github.com/jfrog/jfrog-apps-config v1.0.1/go.mod h1:8AIIr1oY9JuH5dylz2S6f8Ym2MaadPLR6noCBO4C22w=
github.com/jfrog/jfrog-cli-core/v2 v2.57.0 h1:3ON0J6Sjc2+4HZrzh4eSbdciXx3sJsJUIJ3TPQXh/5c=
github.com/jfrog/jfrog-cli-core/v2 v2.57.0/go.mod h1:SThaC/fniC96oN8YgCsHjvOxp5rBM7IppuIybn1oxT0=
github.com/jfrog/jfrog-client-go v1.28.1-0.20241216153836-80abb8e2edb4 h1:dThQv9Y5WdWxID1x3SOLF6NaIlBqQBkUj+MKrFYSvwM=
github.com/jfrog/jfrog-client-go v1.28.1-0.20241216153836-80abb8e2edb4/go.mod h1:3rdSCzKoN1l3wklL33D7nu+nB3089rIgxwyoprFdCaw=
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible h1:jdpOPRN1zP63Td1hDQbZW73xKmzDvZHzVdNYxhnTMDA=
github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k=
Expand Down
4 changes: 2 additions & 2 deletions utils/params.go
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ func getConfigProfileIfExistsAndValid(xrayVersion, xscVersion string, jfrogServe
return
}

// We first try to get a config profile by profile's name
// Attempt to get the config profile by profile's name
profileName := getTrimmedEnv(JfrogConfigProfileEnv)
if profileName != "" {
log.Debug(fmt.Sprintf("Configuration profile was requested. Searching profile by provided name '%s'", profileName))
Expand All @@ -821,7 +821,7 @@ func getConfigProfileIfExistsAndValid(xrayVersion, xscVersion string, jfrogServe
return nil, err
}

// If no profile was found by name, we check if a profile is associated to the repo URL
// Attempt to get a config profile associated with the repo URL
log.Debug(fmt.Sprintf("Configuration profile was requested. Searching profile associated to repository '%s'", jfrogServer.Url))
if configProfile, err = xsc.GetConfigProfileByUrl(xrayVersion, jfrogServer, repositoryInfo.CloneInfo.HTTP); err != nil || configProfile == nil {
return
Expand Down

0 comments on commit 076d9dd

Please sign in to comment.