@@ -64,7 +64,7 @@ type ServeCommand struct {
6464 addr string
6565 debug bool
6666 env argparser.OptionalString
67- file string
67+ file argparser. OptionalString
6868 profileGuest bool
6969 profileGuestDir argparser.OptionalString
7070 projectDir string
@@ -85,7 +85,7 @@ func NewServeCommand(parent argparser.Registerer, g *global.Data, build *BuildCo
8585 c .CmdClause .Flag ("debug" , "Run the server in Debug Adapter mode" ).Hidden ().BoolVar (& c .debug )
8686 c .CmdClause .Flag ("dir" , "Project directory to build (default: current directory)" ).Short ('C' ).Action (c .dir .Set ).StringVar (& c .dir .Value )
8787 c .CmdClause .Flag ("env" , "The manifest environment config to use (e.g. 'stage' will attempt to read 'fastly.stage.toml')" ).Action (c .env .Set ).StringVar (& c .env .Value )
88- c .CmdClause .Flag ("file" , fmt . Sprintf ( "The Wasm file to run (causes validation checks for %s to be skipped)" , binWasmPath )). Default ( binWasmPath ).StringVar (& c .file )
88+ c .CmdClause .Flag ("file" , "The Wasm file to run (causes build process to be skipped)" ). Action ( c . file . Set ).StringVar (& c .file . Value )
8989 c .CmdClause .Flag ("include-source" , "Include source code in built package" ).Action (c .includeSrc .Set ).BoolVar (& c .includeSrc .Value )
9090 c .CmdClause .Flag ("language" , "Language type" ).Action (c .lang .Set ).StringVar (& c .lang .Value )
9191 c .CmdClause .Flag ("metadata-disable" , "Disable Wasm binary metadata annotations" ).Action (c .metadataDisable .Set ).BoolVar (& c .metadataDisable .Value )
@@ -145,7 +145,16 @@ func (c *ServeCommand) Exec(in io.Reader, out io.Writer) (err error) {
145145 manifestPath = filepath .Join (c .projectDir , manifestFilename )
146146 }
147147
148- if ! c .skipBuild {
148+ wasmBinaryToRun := binWasmPath
149+ if c .file .WasSet {
150+ wasmBinaryToRun = c .file .Value
151+ }
152+
153+ // We skip the build if explicitly told to with --skip-build but also when the
154+ // user sets --file to specify their own wasm binary to pass to Viceroy. This
155+ // is typically for users who compile a Wasm binary using an unsupported
156+ // programming language for the Fastly Compute platform.
157+ if ! c .skipBuild && ! c .file .WasSet {
149158 err = c .Build (in , out )
150159 if err != nil {
151160 return err
@@ -169,13 +178,16 @@ func (c *ServeCommand) Exec(in io.Reader, out io.Writer) (err error) {
169178 // If the user doesn't set --skip-build then `compute serve` will call
170179 // `compute build` and the logic there will update the manifest in-memory data
171180 // with the relevant project directory and environment manifest content.
172- if c .skipBuild {
181+ if c .skipBuild || c . file . WasSet {
173182 err := c .Globals .Manifest .File .Read (manifestPath )
174183 if err != nil {
175184 return fmt .Errorf ("failed to parse manifest '%s': %w" , manifestPath , err )
176185 }
177186 c .ViceroyVersioner .SetRequestedVersion (c .Globals .Manifest .File .LocalServer .ViceroyVersion )
178187 if c .Globals .Verbose () {
188+ if c .skipBuild || c .file .WasSet {
189+ text .Break (out )
190+ }
179191 text .Info (out , "Fastly manifest set to: %s\n \n " , manifestPath )
180192 }
181193 }
@@ -210,13 +222,13 @@ func (c *ServeCommand) Exec(in io.Reader, out io.Writer) (err error) {
210222 debug : c .debug ,
211223 errLog : c .Globals .ErrLog ,
212224 extraArgs : c .ViceroyBinExtraArgs ,
213- file : c .file ,
214225 manifestPath : manifestPath ,
215226 out : out ,
216227 profileGuest : c .profileGuest ,
217228 profileGuestDir : c .profileGuestDir ,
218229 restarted : restart ,
219230 verbose : c .Globals .Verbose (),
231+ wasmBinPath : wasmBinaryToRun ,
220232 watch : c .watch ,
221233 watchDir : c .watchDir ,
222234 })
@@ -276,9 +288,6 @@ func (c *ServeCommand) Build(in io.Reader, out io.Writer) error {
276288 if c .projectDir != "" {
277289 c .build .SkipChangeDir = true // we've already changed directory
278290 }
279- if c .file != "" {
280- c .build .ServeFile = true
281- }
282291 return c .build .Exec (in , out )
283292}
284293
@@ -548,13 +557,13 @@ type localOpts struct {
548557 debug bool
549558 errLog fsterr.LogInterface
550559 extraArgs string
551- file string
552560 manifestPath string
553561 out io.Writer
554562 profileGuest bool
555563 profileGuestDir argparser.OptionalString
556564 restarted bool
557565 verbose bool
566+ wasmBinPath string
558567 watch bool
559568 watchDir argparser.OptionalString
560569}
@@ -564,7 +573,7 @@ func local(opts localOpts) error {
564573 // NOTE: Viceroy no longer displays errors unless in verbose mode.
565574 // This can cause confusion for customers: https://github.com/fastly/cli/issues/913
566575 // So regardless of CLI --verbose flag we'll always set verbose for Viceroy.
567- args := []string {"-v" , "-C" , opts .manifestPath , "--addr" , opts .addr , opts .file }
576+ args := []string {"-v" , "-C" , opts .manifestPath , "--addr" , opts .addr , opts .wasmBinPath }
568577
569578 if opts .debug {
570579 args = append (args , "--debug" )
@@ -591,7 +600,8 @@ func local(opts localOpts) error {
591600 text .Break (opts .out )
592601 }
593602 text .Output (opts .out , "%s: %s" , text .BoldYellow ("Manifest" ), opts .manifestPath )
594- text .Output (opts .out , "%s: %s" , text .BoldYellow ("Wasm binary" ), opts .file )
603+ text .Output (opts .out , "%s: %s" , text .BoldYellow ("Wasm binary" ), opts .wasmBinPath )
604+ text .Output (opts .out , "%s: %s" , text .BoldYellow ("Viceroy command" ), strings .Join (args , " " ))
595605 text .Output (opts .out , "%s: %s" , text .BoldYellow ("Viceroy binary" ), opts .bin )
596606
597607 // gosec flagged this:
0 commit comments