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

Skip to content

fix(compute/serve): always set verbose mode for viceroy #924

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 2 commits into from
Apr 26, 2023
Merged

fix(compute/serve): always set verbose mode for viceroy #924

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
aec1e57
fix(compute/serve): always set verbose mode for viceroy
Integralist Apr 26, 2023
222fea2
fix(manifest): always omit Args field
Integralist Apr 26, 2023
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
8 changes: 5 additions & 3 deletions pkg/commands/compute/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,11 @@ func local(bin, file, addr, env string, debug, watch bool, watchDir cmd.Optional
}

manifestPath := filepath.Join(wd, fmt.Sprintf("fastly%s.toml", env))
args := []string{"-C", manifestPath, "--addr", addr, file}

// NOTE: Viceroy no longer displays errors unless in verbose mode.
// This can cause confusion for customers: https://github.com/fastly/cli/issues/913
// So regardless of CLI --verbose flag we'll always set verbose for Viceroy.
args := []string{"-v", "-C", manifestPath, "--addr", addr, file}

if debug {
args = append(args, "--debug")
Expand All @@ -599,8 +603,6 @@ func local(bin, file, addr, env string, debug, watch bool, watchDir cmd.Optional
if output, err := c.Output(); err == nil {
text.Output(out, "%s:\n%s", text.BoldYellow("Viceroy version"), string(output))
}

args = append(args, "-v")
} else {
// IMPORTANT: Viceroy 0.4.0 changed its INFO log output behind a -v flag.
// We display the address unless in verbose mode to avoid duplicate output.
Expand Down
2 changes: 1 addition & 1 deletion pkg/manifest/file.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
// manifest file schema.
type File struct {
// Args is necessary to track the subcommand called (see: File.Read method).
Args []string `toml:",omitempty"`
Args []string `toml:"-"`
Authors []string `toml:"authors"`
Description string `toml:"description"`
Language string `toml:"language"`
Expand Down