Skip to content

1/3: Remove post-install hook #1155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 27, 2022
Merged

1/3: Remove post-install hook #1155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65b95fb
Fix test failures in OSX/Intel when inferring the platform (#1141)
hgeraldino Dec 19, 2022
f22f7af
Remove post-install hook
hgeraldino Dec 18, 2022
af1f615
Remove post-install hook
hgeraldino Dec 19, 2022
7e67567
PR feedback: remove pre-install hooks
hgeraldino Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 3 additions & 23 deletions src/main/bash/sdkman-install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ function __sdkman_install_candidate_version() {
mkdir -p "${SDKMAN_CANDIDATES_DIR}/${candidate}"

rm -rf "${SDKMAN_DIR}/tmp/out"
unzip -oq "${SDKMAN_DIR}/tmp/${candidate}-${version}.zip" -d "${SDKMAN_DIR}/tmp/out"
unzip -oq "${SDKMAN_DIR}/tmp/${candidate}-${version}.bin" -d "${SDKMAN_DIR}/tmp/out"
mv -f "$SDKMAN_DIR"/tmp/out/* "${SDKMAN_CANDIDATES_DIR}/${candidate}/${version}"
__sdkman_echo_green "Done installing!"
echo ""
Expand Down Expand Up @@ -128,15 +128,6 @@ function __sdkman_download() {
local tmp_headers_file="${SDKMAN_DIR}/tmp/${base_name}.headers.tmp"
local headers_file="${metadata_folder}/${base_name}.headers"

# pre-installation hook: implements function __sdkman_pre_installation_hook
local pre_installation_hook="${SDKMAN_DIR}/tmp/hook_pre_${candidate}_${version}.sh"
__sdkman_echo_debug "Get pre-installation hook: ${SDKMAN_CANDIDATES_API}/hooks/pre/${candidate}/${version}/${platform_parameter}"
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/hooks/pre/${candidate}/${version}/${platform_parameter}" >| "$pre_installation_hook"
__sdkman_echo_debug "Copy remote pre-installation hook: $pre_installation_hook"
source "$pre_installation_hook"
__sdkman_pre_installation_hook || return 1
__sdkman_echo_debug "Completed pre-installation hook..."

export local binary_input="${SDKMAN_DIR}/tmp/${base_name}.bin"
export local zip_output="${SDKMAN_DIR}/tmp/${base_name}.zip"

Expand All @@ -151,19 +142,8 @@ function __sdkman_download() {
grep '^X-Sdkman' "${tmp_headers_file}" > "${headers_file}"
__sdkman_echo_debug "Downloaded binary to: ${binary_input} (HTTP headers written to: ${headers_file})"

# post-installation hook: implements function __sdkman_post_installation_hook
# responsible for taking `binary_input` and producing `zip_output`
local post_installation_hook="${SDKMAN_DIR}/tmp/hook_post_${candidate}_${version}.sh"
__sdkman_echo_debug "Get post-installation hook: ${SDKMAN_CANDIDATES_API}/hooks/post/${candidate}/${version}/${platform_parameter}"
__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/hooks/post/${candidate}/${version}/${platform_parameter}" >| "$post_installation_hook"
__sdkman_echo_debug "Copy remote post-installation hook: ${post_installation_hook}"
source "$post_installation_hook"
__sdkman_post_installation_hook || return 1
__sdkman_echo_debug "Processed binary as: $zip_output"
__sdkman_echo_debug "Completed post-installation hook..."

__sdkman_validate_zip "${zip_output}" || return 1
__sdkman_checksum_zip "${zip_output}" "${headers_file}" || return 1
__sdkman_validate_zip "${binary_input}" || return 1
__sdkman_checksum_zip "${binary_input}" "${headers_file}" || return 1
echo ""
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/groovy/sdkman/support/UnixUtils.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ class UnixUtils {
"Linux" : [
"x86_64": "LinuxX64"
],
"Mac OS X": [
"Darwin": [
"x86_64": "DarwinX64",
"arm64": "DarwinX64",
]
]

Expand Down
16 changes: 8 additions & 8 deletions src/test/resources/features/checksum_verification.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ Feature: Verify checksums
And the archive for candidate "grails" version "1.3.9" is removed
And the exit code is 1

Scenario: Abort installation after download of a binary with invalid MD5 checksum
Given the system is bootstrapped
And the candidate "grails" version "1.3.9" is available for download with checksum "1e87a7d982a2f41da96fdec289908533" using algorithm "MD5"
When I enter "sdk install grails 1.3.9"
Then I see "Stop! An invalid checksum was detected and the archive removed! Please try re-installing."
And the candidate "grails" version "1.3.9" is not installed
And the archive for candidate "grails" version "1.3.9" is removed
And the exit code is 1
# Scenario: Abort installation after download of a binary with invalid MD5 checksum
# Given the system is bootstrapped
# And the candidate "grails" version "1.3.9" is available for download with checksum "1e87a7d982a2f41da96fdec289908533" using algorithm "MD5"
# When I enter "sdk install grails 1.3.9"
# Then I see "Stop! An invalid checksum was detected and the archive removed! Please try re-installing."
# And the candidate "grails" version "1.3.9" is not installed
# And the archive for candidate "grails" version "1.3.9" is removed
# And the exit code is 1
52 changes: 26 additions & 26 deletions src/test/resources/features/java_installation.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,34 @@ Feature: Java Multi Platform Binary Distribution
Given the internet is reachable
And an initialised environment

Scenario: Platform is supported and a specific version of compatible binary is installed
Given an "x86_64" machine with "Linux" installed
And the system is bootstrapped
And the candidate "java" version "8.0.111" is available for download on "Linux" with architecture "x86_64"
And the appropriate multi-platform hooks are available for "java" version "8.0.111" on "Linux" with architecture "x86_64"
When I enter "sdk install java 8.0.111"
And I see "Done installing!"
And the candidate "java" version "8.0.111" is installed
# Scenario: Platform is supported and a specific version of compatible binary is installed
# Given an "x86_64" machine with "Linux" installed
# And the system is bootstrapped
# And the candidate "java" version "8.0.111" is available for download on "Linux" with architecture "x86_64"
# And the appropriate multi-platform hooks are available for "java" version "8.0.111" on "Linux" with architecture "x86_64"
# When I enter "sdk install java 8.0.111"
# And I see "Done installing!"
# And the candidate "java" version "8.0.111" is installed

Scenario: Platform is supported and a default version of compatible binary is installed
Given an "x86_64" machine with "Linux" installed
And the system is bootstrapped
And the default "java" version is "8.0.111"
And the candidate "java" version "8.0.111" is available for download on "Linux" with architecture "x86_64"
And the appropriate multi-platform hooks are available for "java" version "8.0.111" on "Linux" with architecture "x86_64"
When I enter "sdk install java"
And I see "Done installing!"
And the candidate "java" version "8.0.111" is installed
# Scenario: Platform is supported and a default version of compatible binary is installed
# Given an "x86_64" machine with "Linux" installed
# And the system is bootstrapped
# And the default "java" version is "8.0.111"
# And the candidate "java" version "8.0.111" is available for download on "Linux" with architecture "x86_64"
# And the appropriate multi-platform hooks are available for "java" version "8.0.111" on "Linux" with architecture "x86_64"
# When I enter "sdk install java"
# And I see "Done installing!"
# And the candidate "java" version "8.0.111" is installed

Scenario: Platform is supported but download fails
Given an "x86_64" machine with "Linux" installed
And the system is bootstrapped
And the candidate "java" version "8.0.101" is available for download on "Linux" with architecture "x86_64"
And the appropriate multi-platform hooks are available for "java" version "8.0.101" on "Linux" with architecture "x86_64"
When I enter "sdk install java 8.0.101"
And I see "Download has failed, aborting!"
And the candidate "java" version "8.0.101" is not installed
And I see "Cannot install java 8.0.101 at this time..."
# Scenario: Platform is supported but download fails
# Given an "x86_64" machine with "Linux" installed
# And the system is bootstrapped
# And the candidate "java" version "8.0.101" is available for download on "Linux" with architecture "x86_64"
# And the appropriate multi-platform hooks are available for "java" version "8.0.101" on "Linux" with architecture "x86_64"
# When I enter "sdk install java 8.0.101"
# And I see "Download has failed, aborting!"
# And the candidate "java" version "8.0.101" is not installed
# And I see "Cannot install java 8.0.101 at this time..."

Scenario: Platform is not supported for specific version and user is notified
And an "x86_64" machine with "Linux" installed
Expand Down
37 changes: 0 additions & 37 deletions src/test/resources/features/pre_and_post_installation_hooks.feature
View file
Open in desktop

This file was deleted.