Skip to content

Commit a89a8cc

Browse files
marc0dermarc0der
committed
Strip out the broadcast id and rename to healthcheck where needed.
1 parent 010736e commit a89a8cc

File tree

7 files changed

+22
-40
lines changed

7 files changed

+22
-40
lines changed

‎src/main/bash/sdkman-availability.sh‎

Lines changed: 10 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,24 @@
1717
#
1818

1919
function __sdkman_update_service_availability() {
20-
local broadcast_live_id=$(__sdkman_determine_broadcast_id)
21-
__sdkman_set_availability "$broadcast_live_id"
22-
__sdkman_update_broadcast_id "$broadcast_live_id"
20+
local healthcheck_status=$(__sdkman_determine_healthcheck_status)
21+
__sdkman_set_availability "$healthcheck_status"
2322
}
2423

25-
function __sdkman_determine_broadcast_id() {
24+
function __sdkman_determine_healthcheck_status() {
2625
if [[ "$SDKMAN_OFFLINE_MODE" == "true" || "$COMMAND" == "offline" && "$QUALIFIER" == "enable" ]]; then
2726
echo ""
2827
else
29-
echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CANDIDATES_API}/broadcast/latest/id")
28+
echo $(__sdkman_secure_curl_with_timeouts "${SDKMAN_CANDIDATES_API}/healthcheck")
3029
fi
3130
}
3231

3332
function __sdkman_set_availability() {
34-
local broadcast_id="$1"
35-
local detect_html="$(echo "$broadcast_id" | tr '[:upper:]' '[:lower:]' | grep 'html')"
36-
if [[ -z "$broadcast_id" ]]; then
33+
local healthcheck_status="$1"
34+
local detect_html="$(echo "$healthcheck_status" | tr '[:upper:]' '[:lower:]' | grep 'html')"
35+
if [[ -z "$healthcheck_status" ]]; then
3736
SDKMAN_AVAILABLE="false"
38-
__sdkman_display_offline_warning "$broadcast_id"
37+
__sdkman_display_offline_warning "$healthcheck_status"
3938
elif [[ -n "$detect_html" ]]; then
4039
SDKMAN_AVAILABLE="false"
4140
__sdkman_display_proxy_warning
@@ -45,8 +44,8 @@ function __sdkman_set_availability() {
4544
}
4645

4746
function __sdkman_display_offline_warning() {
48-
local broadcast_id="$1"
49-
if [[ -z "$broadcast_id" && "$COMMAND" != "offline" && "$SDKMAN_OFFLINE_MODE" != "true" ]]; then
47+
local healthcheck_status="$1"
48+
if [[ -z "$healthcheck_status" && "$COMMAND" != "offline" && "$SDKMAN_OFFLINE_MODE" != "true" ]]; then
5049
__sdkman_echo_red "==== INTERNET NOT REACHABLE! ==================================================="
5150
__sdkman_echo_red ""
5251
__sdkman_echo_red " Some functionality is disabled or only partially available."
@@ -65,20 +64,3 @@ function __sdkman_display_proxy_warning() {
6564
__sdkman_echo_red "================================================================================"
6665
echo ""
6766
}
68-
69-
function __sdkman_update_broadcast_id() {
70-
local broadcast_live_id broadcast_id_file broadcast_old_id
71-
72-
broadcast_live_id="$1"
73-
broadcast_id_file="${SDKMAN_DIR}/var/broadcast_id"
74-
broadcast_old_id=""
75-
76-
if [[ -f "$broadcast_id_file" ]]; then
77-
broadcast_old_id=$(< "$broadcast_id_file")
78-
fi
79-
80-
if [[ "$SDKMAN_AVAILABLE" == "true" && "$broadcast_live_id" != "$broadcast_old_id" && "$COMMAND" != "selfupdate" && "$COMMAND" != "flush" ]]; then
81-
mkdir -p "${SDKMAN_DIR}/var"
82-
echo "$broadcast_live_id" | tee "$broadcast_id_file" > /dev/null
83-
fi
84-
}

‎src/test/groovy/sdkman/specs/CandidatesCacheUpdateFailureSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ class CandidatesCacheUpdateFailureSpec extends SdkmanEnvSpecification {
66

77
static final String CANDIDATES_API = "http://localhost:8080/2"
88

9-
static final String BROADCAST_API_LATEST_ID_ENDPOINT = "$CANDIDATES_API/broadcast/latest/id"
9+
static final String HEALTHCHECK_ENDPOINT = "$CANDIDATES_API/healthcheck"
1010
static final String CANDIDATES_ALL_ENDPOINT = "$CANDIDATES_API/candidates/all"
1111

1212
File candidatesCache
1313

1414
def setup() {
1515
candidatesCache = new File("${sdkmanDotDirectory}/var", "candidates")
16-
curlStub.primeWith(BROADCAST_API_LATEST_ID_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
16+
curlStub.primeWith(HEALTHCHECK_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
1717
.primeWith(CANDIDATES_ALL_ENDPOINT, "echo html")
1818
sdkmanBashEnvBuilder.withConfiguration("sdkman_debug_mode", "true")
1919
}

‎src/test/groovy/sdkman/specs/CandidatesCacheUpdateSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ class CandidatesCacheUpdateSpec extends SdkmanEnvSpecification {
66

77
static final String CANDIDATES_API = "http://localhost:8080/2"
88

9-
static final String BROADCAST_API_LATEST_ID_ENDPOINT = "$CANDIDATES_API/broadcast/latest/id"
9+
static final String HEALTHCHECK_ENDPOINT = "$CANDIDATES_API/healthcheck"
1010
static final String CANDIDATES_ALL_ENDPOINT = "$CANDIDATES_API/candidates/all"
1111

1212
File candidatesCache
1313

1414
def setup() {
1515
candidatesCache = new File("${sdkmanDotDirectory}/var", "candidates")
16-
curlStub.primeWith(BROADCAST_API_LATEST_ID_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
16+
curlStub.primeWith(HEALTHCHECK_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
1717
.primeWith(CANDIDATES_ALL_ENDPOINT, "echo groovy,scala")
1818
sdkmanBashEnvBuilder.withConfiguration("sdkman_debug_mode", "true")
1919
}

‎src/test/groovy/sdkman/specs/CurrentCommandSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import static java.nio.file.Files.createSymbolicLink
99
class CurrentCommandSpec extends SdkmanEnvSpecification {
1010

1111
static final CANDIDATES_API = "http://localhost:8080/2"
12-
static final BROADCAST_API_LATEST_ID_ENDPOINT = "$CANDIDATES_API/broadcast/latest/id"
12+
static final HEALTHCHECK_ENDPOINT = "$CANDIDATES_API/healthcheck"
1313

1414
def setup() {
15-
curlStub.primeWith(BROADCAST_API_LATEST_ID_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
15+
curlStub.primeWith(HEALTHCHECK_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
1616
}
1717

1818
void "should display current version of all candidates installed"() {

‎src/test/groovy/sdkman/specs/SelfupdateSpec.groovy‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ import static java.time.temporal.ChronoUnit.DAYS
88

99
class SelfupdateSpec extends SdkmanEnvSpecification {
1010
static final String CANDIDATES_API = "http://localhost:8080/2"
11-
static final String BROADCAST_API_LATEST_ID_ENDPOINT = "$CANDIDATES_API/broadcast/latest/id"
11+
static final String HEALTHCHECK_ENDPOINT = "$CANDIDATES_API/healthcheck"
1212
static final String VERSION_ENDPOINT = "$CANDIDATES_API/broker/download/sdkman/version/stable"
1313

1414
def setup() {
15-
curlStub.primeWith(BROADCAST_API_LATEST_ID_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
15+
curlStub.primeWith(HEALTHCHECK_ENDPOINT, "echo dbfb025be9f97fda2052b5febcca0155")
1616
curlStub.primeWith(VERSION_ENDPOINT, "echo 5.0.0")
1717
}
1818

‎src/test/groovy/sdkman/steps/env.groovy‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ etcDir = "${sdkmanDirEnv}/etc" as File
3636
extDir = "${sdkmanDirEnv}/ext" as File
3737
tmpDir = "${sdkmanDir}/tmp" as File
3838

39-
broadcastIdFile = new File(varDir, "broadcast_id")
39+
healthcheckFile = new File(varDir, "healthcheck")
4040
candidatesFile = new File(varDir, "candidates")
4141
versionFile = new File(varDir, "version")
4242
initScript = new File(binDir, "sdkman-init.sh")

‎src/test/groovy/sdkman/steps/initialisation_steps.groovy‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ And(~'^the archive for candidate "([^"]*)" version "([^"]*)" is removed$') { Str
3333
}
3434

3535
And(~'^the internet is reachable$') { ->
36-
primeEndpointWithString("/broadcast/latest/id", "12345")
36+
primeEndpointWithString("/healthcheck", "12345")
3737
primeEndpointWithString("/app/stable", sdkmanVersion)
3838
primeSelfupdate()
3939

@@ -49,7 +49,7 @@ And(~'^the internet is not reachable$') { ->
4949
}
5050

5151
And(~'^offline mode is disabled with reachable internet$') { ->
52-
primeEndpointWithString("/broadcast/latest/id", "12345")
52+
primeEndpointWithString("/healthcheck", "12345")
5353
primeEndpointWithString("/app/stable", sdkmanVersion)
5454

5555
offlineMode = false
@@ -58,7 +58,7 @@ And(~'^offline mode is disabled with reachable internet$') { ->
5858
}
5959

6060
And(~'^offline mode is enabled with reachable internet$') { ->
61-
primeEndpointWithString("/broadcast/latest/id", "12345")
61+
primeEndpointWithString("/healthcheck", "12345")
6262
primeEndpointWithString("/app/stable", sdkmanVersion)
6363

6464
offlineMode = true

0 commit comments

Comments
 (0)