Skip to content
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

More CLI fixes #1288

Merged
merged 2 commits into from
Jul 2, 2020
Merged

More CLI fixes #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fea47d1
update zip file download URL and shasum in shell script
designatednerd Jul 2, 2020
4143477
add check that the downloaded file has a valid shasum before trying t…
designatednerd Jul 2, 2020
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
6 changes: 6 additions & 0 deletions Sources/ApolloCodegenLib/ApolloCLI.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@ public struct ApolloCLI {
/// - timeout: The maximum time to wait before indicating that the download timed out, in seconds.
public static func createCLI(cliFolderURL: URL, timeout: Double) throws -> ApolloCLI {
try CLIDownloader.downloadIfNeeded(cliFolderURL: cliFolderURL, timeout: timeout)

if !(try CLIExtractor.validateSHASUMOfDownloadedFile(in: cliFolderURL)) {
CodegenLogger.log("Downloaded zip file has incorrect SHASUM, forcing redownolad")
try CLIDownloader.forceRedownload(cliFolderURL: cliFolderURL, timeout: timeout)
}

let binaryFolderURL = try CLIExtractor.extractCLIIfNeeded(from: cliFolderURL)
return ApolloCLI(binaryFolderURL: binaryFolderURL)
}
Expand Down
18 changes: 17 additions & 1 deletion Sources/ApolloCodegenLib/CLIExtractor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,22 @@ struct CLIExtractor {
return true
}

static func validateSHASUMOfDownloadedFile(in cliFolderURL: URL, expected: String = CLIExtractor.expectedSHASUM) throws -> Bool {
let zipFileURL = ApolloFilePathHelper.zipFileURL(fromCLIFolder: cliFolderURL)

do {
try self.validateZipFileSHASUM(at: zipFileURL)
return true
} catch {
switch error {
case CLIExtractorError.zipFileHasInvalidSHASUM:
return false
default:
throw error
}
}
}

/// Writes the SHASUM of the extracted version of the CLI to a file for faster checks to ensure we have the correct version.
///
/// - Parameter apolloFolderURL: The URL to the extracted apollo folder.
Expand Down Expand Up @@ -119,7 +135,7 @@ struct CLIExtractor {
/// - Parameter expected: The expected SHASUM. Defaults to the real expected SHASUM. This parameter exists mostly for testing.
static func validateZipFileSHASUM(at zipFileURL: URL, expected: String = CLIExtractor.expectedSHASUM) throws {
let shasum = try FileManager.default.apollo.shasum(at: zipFileURL)
print("SHASUM: \(shasum)")
print("SHASUM of downloaded file: \(shasum)")
guard shasum == expected else {
throw CLIExtractorError.zipFileHasInvalidSHASUM(expectedSHASUM: expected, gotSHASUM: shasum)
}
Expand Down
4 changes: 2 additions & 2 deletions scripts/run-bundled-codegen.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SCRIPT_DIR="$(dirname "$0")"

# Get the SHASUM of the tarball
ZIP_FILE="${SCRIPT_DIR}/apollo.tar.gz"
ZIP_FILE_DOWNLOAD_URL="https://install.apollographql.com/legacy-cli/darwin/2.28.0"
ZIP_FILE_DOWNLOAD_URL="https://install.apollographql.com/legacy-cli/darwin/2.28.3"
SHASUM_FILE="${SCRIPT_DIR}/apollo/.shasum"
APOLLO_DIR="${SCRIPT_DIR}"/apollo
IS_RETRY="false"
Expand Down Expand Up @@ -58,7 +58,7 @@ extract_cli() {

validate_codegen_and_extract_if_needed() {
# Make sure the SHASUM matches the release for this version
EXPECTED_SHASUM="060d893aea4ebc2effa74b20433f5d0f586b31fec0d0f73c210ee152c032185e"
EXPECTED_SHASUM="cb2f4b9f53eb8443661e7658e407a3837da3d781649f8bc66a1c6cf7d32acef1"
update_shasum

if [[ ${SHASUM} = ${EXPECTED_SHASUM}* ]]; then
Expand Down