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

Cut over to use new stable/beta version endpoints.

Browse Source
This commit is contained in:
Marco Vermeulen
2017-10-30 21:28:27 +00:00
parent 58f77b3897
commit 0161d8e1d5
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/bash/sdkman-init.sh
View File

@@ -127,10 +127,10 @@ else
__sdkman_echo_debug "Version cache needs updating..."
if [[ "$sdkman_beta_channel" == "true" ]]; then
__sdkman_echo_debug "Refreshing version cache with BETA version."
VERSION_URL="${SDKMAN_LEGACY_API}/candidates/app/beta"
VERSION_URL="${SDKMAN_CURRENT_API}/broker/download/sdkman/version/beta"
else
__sdkman_echo_debug "Refreshing version cache with STABLE version."
VERSION_URL="${SDKMAN_LEGACY_API}/candidates/app/stable"
VERSION_URL="${SDKMAN_CURRENT_API}/broker/download/sdkman/version/stable"
fi
SDKMAN_REMOTE_VERSION=$(__sdkman_secure_curl_with_timeouts "$VERSION_URL")

14
src/test/groovy/sdkman/specs/BetaChannelBootstrapSpec.groovy
View File

@@ -5,9 +5,9 @@ import sdkman.support.SdkmanEnvSpecification
class BetaChannelBootstrapSpec extends SdkmanEnvSpecification {
static final TWO_DAYS_AGO = System.currentTimeMillis() - (48 * 60 * 60 * 1000)
static final LEGACY_API = "http://localhost:8080/1"
static final CLI_STABLE_ENDPOINT = "$LEGACY_API/candidates/app/stable"
static final CLI_BETA_ENDPOINT = "$LEGACY_API/candidates/app/beta"
static final CURRENT_API = "http://localhost:8080/2"
static final CLI_STABLE_ENDPOINT = "$CURRENT_API/broker/download/sdkman/version/stable"
static final CLI_BETA_ENDPOINT = "$CURRENT_API/broker/download/sdkman/version/beta"
File versionCache
@@ -21,7 +21,7 @@ class BetaChannelBootstrapSpec extends SdkmanEnvSpecification {
def betaVersion = "x.y.c"
curlStub.primeWith(CLI_BETA_ENDPOINT, "echo $betaVersion")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withConfiguration("sdkman_beta_channel", "true")
.withVersionCache("x.y.b")
.build()
@@ -42,7 +42,7 @@ class BetaChannelBootstrapSpec extends SdkmanEnvSpecification {
def stableVersion = "x.y.b"
curlStub.primeWith(CLI_STABLE_ENDPOINT, "echo $stableVersion")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withConfiguration("sdkman_beta_channel", "false")
.withVersionCache("x.y.c")
.build()
@@ -64,7 +64,7 @@ class BetaChannelBootstrapSpec extends SdkmanEnvSpecification {
def newerBetaVersion = "x.y.d"
curlStub.primeWith(CLI_BETA_ENDPOINT, "echo $newerBetaVersion")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withConfiguration("sdkman_beta_channel", "true")
.withVersionCache("x.y.c")
.build()
@@ -85,7 +85,7 @@ class BetaChannelBootstrapSpec extends SdkmanEnvSpecification {
def newerStableVersion = "x.y.d"
curlStub.primeWith(CLI_STABLE_ENDPOINT, "echo $newerStableVersion")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withConfiguration("sdkman_beta_channel", "false")
.withVersionCache("x.y.c")
.build()

20
src/test/groovy/sdkman/specs/VersionCacheBootstrapSpec.groovy
View File

@@ -8,10 +8,10 @@ class VersionCacheBootstrapSpec extends SdkmanEnvSpecification {
static final MORE_THAN_A_DAY_IN_MILLIS = 24 * 61 * 60 * 1000
static final LEGACY_API = "http://localhost:8080/1"
static final CLI_VERSION_STABLE_ENDPOINT = "$LEGACY_API/candidates/app/stable"
static final CLI_VERSION_BETA_ENDPOINT = "$LEGACY_API/candidates/app/beta"
static final CANDIDATES_ENDPOINT = "$LEGACY_API/candidates"
static final CURRENT_API = "http://localhost:8080/2"
static final CLI_VERSION_STABLE_ENDPOINT = "$CURRENT_API/broker/download/sdkman/version/stable"
static final CLI_VERSION_BETA_ENDPOINT = "$CURRENT_API/broker/download/sdkman/version/beta"
static final CANDIDATES_ENDPOINT = "$CURRENT_API/candidates"
File versionCache
@@ -24,7 +24,7 @@ class VersionCacheBootstrapSpec extends SdkmanEnvSpecification {
given:
curlStub.primeWith(CLI_VERSION_STABLE_ENDPOINT, "echo x.y.b")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.build()
and:
@@ -60,7 +60,7 @@ class VersionCacheBootstrapSpec extends SdkmanEnvSpecification {
given:
curlStub.primeWith(CLI_VERSION_STABLE_ENDPOINT, "echo x.y.b")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withVersionCache("x.y.a")
.build()
@@ -82,7 +82,7 @@ class VersionCacheBootstrapSpec extends SdkmanEnvSpecification {
given:
curlStub.primeWith(CLI_VERSION_STABLE_ENDPOINT, "echo ''")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withVersionCache("x.y.z")
.build()
@@ -103,7 +103,7 @@ class VersionCacheBootstrapSpec extends SdkmanEnvSpecification {
given:
curlStub.primeWith(CLI_VERSION_STABLE_ENDPOINT, "echo ''")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withVersionCache("x.y.z")
.build()
@@ -125,7 +125,7 @@ class VersionCacheBootstrapSpec extends SdkmanEnvSpecification {
def sdkmanVersion = "x.y.z"
curlStub.primeWith(CLI_VERSION_STABLE_ENDPOINT, "echo '<html><title>sorry</title></html>'")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withVersionCache(sdkmanVersion)
.build()
@@ -146,7 +146,7 @@ class VersionCacheBootstrapSpec extends SdkmanEnvSpecification {
given:
curlStub.primeWith(CLI_VERSION_BETA_ENDPOINT, "echo x.y.z")
bash = sdkmanBashEnvBuilder
.withLegacyService(LEGACY_API)
.withLegacyService(CURRENT_API)
.withVersionCache("x.y.w")
.withConfiguration("sdkman_beta_channel", "true")
.build()