Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(compute): don't validate js-compute-runtime binary location #731

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
Integralist merged 1 commit into from
Dec 12, 2022
Merged

fix(compute): don't validate js-compute-runtime binary location #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 18 additions & 32 deletions pkg/commands/compute/language_javascript.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"encoding/json"
"fmt"
"io"
"path/filepath"
"strings"

fsterr "github.com/fastly/cli/pkg/errors"
Expand Down Expand Up @@ -78,37 +77,24 @@ func NewJavaScript(
postBuild: fastlyManifest.Scripts.PostBuild,
timeout: timeout,
validator: ToolchainValidator{
Compilation: JsCompilation,
CompilationDirectPath: func() (string, error) {
p, err := getJsToolchainBinPath(JsToolchain)
if err != nil {
errlog.Add(err)
remediation := "npm install --global npm@latest"
return "", fsterr.RemediationError{
Inner: fmt.Errorf("could not determine %s bin path", JsToolchain),
Remediation: fmt.Sprintf(fsterr.FormatTemplate, text.Bold(remediation)),
}
}

return filepath.Join(p, JsCompilation), nil
},
CompilationCommandRemediation: fmt.Sprintf(JsCompilationCommandRemediation, JsSDK),
CompilationSkipVersion: true,
CompilationURL: JsCompilationURL,
DefaultBuildCommand: JsDefaultBuildCommand,
ErrLog: errlog,
FastlyManifestFile: fastlyManifest,
Installer: JsInstaller,
Manifest: JsManifest,
ManifestRemediation: JsManifestRemediation,
Output: out,
PatchedManifestNotifier: ch,
SDK: JsSDK,
SDKCustomValidator: validateJsSDK,
Toolchain: JsToolchain,
ToolchainLanguage: "JavaScript",
ToolchainSkipVersion: true,
ToolchainURL: JsToolchainURL,
Compilation: JsCompilation,
CompilationIntegrated: true,
CompilationSkipVersion: true,
CompilationURL: JsCompilationURL,
DefaultBuildCommand: JsDefaultBuildCommand,
ErrLog: errlog,
FastlyManifestFile: fastlyManifest,
Installer: JsInstaller,
Manifest: JsManifest,
ManifestRemediation: JsManifestRemediation,
Output: out,
PatchedManifestNotifier: ch,
SDK: JsSDK,
SDKCustomValidator: validateJsSDK,
Toolchain: JsToolchain,
ToolchainLanguage: "JavaScript",
ToolchainSkipVersion: true,
ToolchainURL: JsToolchainURL,
},
}
}
Expand Down
8 changes: 7 additions & 1 deletion pkg/commands/compute/language_toolchain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,13 @@ func (tv ToolchainValidator) installDependencies() error {
// toolchain. If an external command, we lookup the command on the $PATH and
// check its version meets any defined constraints.
func (tv ToolchainValidator) compilation() error {
fmt.Fprintf(tv.Output, "\nChecking if '%s' is installed...\n", tv.Compilation)
if !tv.CompilationIntegrated && !tv.CompilationSkipVersion {
// For example JavaScript's SDK js-compute has an integrated runtime
// js-compute-runtime binary that is installed via the prior
// `installDependencies` step and so we don't want to display a message to
// say we're checking for it, nor will we check its version.
fmt.Fprintf(tv.Output, "\nChecking if '%s' is installed...\n", tv.Compilation)
}

// Lookup the compilation target as an executable binary.
if !tv.CompilationIntegrated {
Expand Down