mirror/sdkman-cli
1
0
Fork 0
mirror of https://github.com/sdkman/sdkman-cli.git synced 2026-05-24 08:27:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cut validation over to new candidate validation endpoint.

Browse Source
This commit is contained in:
Marco Vermeulen
2016-11-04 18:11:28 +00:00
parent 1dd522172e
commit 36788730b0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/bash/sdkman-env-helpers.sh
View File

@@ -62,7 +62,7 @@ function __sdkman_determine_version {
VERSION=$(__sdkman_secure_curl "${SDKMAN_LEGACY_API}/candidates/${candidate}/default")
else
local validation_url="${SDKMAN_LEGACY_API}/candidates/${candidate}/${version}/$(echo $SDKMAN_PLATFORM | tr '[:upper:]' '[:lower:]')"
local validation_url="${SDKMAN_CURRENT_API}/candidates/validate/${candidate}/${version}/$(echo $SDKMAN_PLATFORM | tr '[:upper:]' '[:lower:]')"
VERSION_VALID=$(__sdkman_secure_curl "$validation_url")
__sdkman_echo_debug "Validate $candidate $version for $SDKMAN_PLATFORM: $VERSION_VALID"
__sdkman_echo_debug "Validation URL: $validation_url"

12
src/test/groovy/sdkman/steps/stub_steps.groovy
View File

@@ -18,25 +18,25 @@ And(~'^an available selfupdate$') { ->
}
And(~'^the candidate "([^"]*)" version "([^"]*)" is available for download$') { String candidate, String version ->
primeEndpointWithString("/candidates/${candidate}/${version}/${PLATFORM}", "valid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${PLATFORM}", "valid")
primeDownloadFor(SERVICE_UP_URL, candidate, version, PLATFORM)
primeEndpointWithString("/hooks/post/${candidate}/${version}/${PLATFORM}", 'mv $binary_input $zip_output') //bash command
}
And(~'^the candidate "([^"]*)" version "([^"]*)" is not available for download$') { String candidate, String version ->
primeEndpointWithString("/candidates/${candidate}/${version}/${PLATFORM}", "invalid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${PLATFORM}", "invalid")
}
And(~/^the candidate "(.*?)" version "(.*?)" is available for download on "(.*?)"$/) { String candidate, String version, String platform ->
String lowerCaseUname = UnixUtils.asUname(platform).toLowerCase()
primeEndpointWithString("/candidates/${candidate}/${version}/${lowerCaseUname}", "valid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${lowerCaseUname}", "valid")
primeEndpointWithString("/hooks/post/${candidate}/${version}/${lowerCaseUname}", 'mv $binary_input $zip_output') //bash command
primeDownloadFor(SERVICE_UP_URL, candidate, version, lowerCaseUname)
}
And(~/^the candidate "(.*?)" version "(.*?)" is not available for download on "(.*?)"$/) { String candidate, String version, String platform ->
String lowerCaseUname = UnixUtils.asUname(platform).toLowerCase()
primeEndpointWithString("/candidates/${candidate}/${version}/${lowerCaseUname}", "invalid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${lowerCaseUname}", "invalid")
}
And(~'^a "([^"]*)" list view is available for consumption$') { String candidate ->
@@ -44,11 +44,11 @@ And(~'^a "([^"]*)" list view is available for consumption$') { String candidate
}
And(~'^the candidate "([^"]*)" version "([^"]*)" is a valid candidate version$') { String candidate, String version ->
primeEndpointWithString("/candidates/${candidate}/${version}/${PLATFORM}", "valid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${PLATFORM}", "valid")
}
And(~'^the candidate "([^"]*)" version "([^"]*)" is not a valid candidate version$') { String candidate, String version ->
primeEndpointWithString("/candidates/${candidate}/${version}/${PLATFORM}", "invalid")
primeEndpointWithString("/candidates/validate/${candidate}/${version}/${PLATFORM}", "invalid")
}
And(~/^the candidate "(.*?)" has a version list available$/) { String candidate ->