Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
### Bug Fixes:

- fix(auth): accept SSO JWT audiences with or without a trailing slash when validating the Fastly API endpoint. ([#1837](https://github.com/fastly/cli/pull/1837))
- feat(compute): add `install-tools` command to pre-install the Viceroy binary ([#1833](https://github.com/fastly/cli/pull/1833))

### Enhancements:
- feat(ngwaf/timeseries): add support for account and workspace times series commands ([#1823](https://github.com/fastly/cli/pull/1823))
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-go
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-node
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-rust
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,13 @@ RUN rustup target add wasm32-wasip1 \

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/run.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -753,7 +753,7 @@ func commandRequiresToken(command argparser.Command) bool {
return text.IsFastlyID(initCmd.CloneFrom)
}
return false
case "compute build", "compute hash-files", "compute metadata", "compute pack", "compute serve", "compute validate":
case "compute build", "compute hash-files", "compute install-tools", "compute metadata", "compute pack", "compute serve", "compute validate":
return false
}
commandName = strings.Split(commandName, " ")[0]
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,7 @@ func Define( // nolint:revive // function-length
computeDeploy := compute.NewDeployCommand(computeCmdRoot.CmdClause, data)
computeHashFiles := compute.NewHashFilesCommand(computeCmdRoot.CmdClause, data, computeBuild)
computeInit := compute.NewInitCommand(computeCmdRoot.CmdClause, data)
computeInstallTools := compute.NewInstallCommand(computeCmdRoot.CmdClause, data)
computeMetadata := compute.NewMetadataCommand(computeCmdRoot.CmdClause, data)
computePack := compute.NewPackCommand(computeCmdRoot.CmdClause, data)
computePublish := compute.NewPublishCommand(computeCmdRoot.CmdClause, data, computeBuild, computeDeploy)
Expand DownExpand Up@@ -1147,6 +1148,7 @@ func Define( // nolint:revive // function-length
computeDeploy,
computeHashFiles,
computeInit,
computeInstallTools,
computeMetadata,
computePack,
computePublish,
Expand Down
60 changes: 60 additions & 0 deletions pkg/commands/compute/install.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
package compute

import (
"errors"
"io"
"runtime"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/manifest"
"github.com/fastly/cli/pkg/text"
)

// InstallCommand pre-installs the tools that `compute` subcommands otherwise
// download on first use. Today that's the Viceroy binary used by
// `compute serve` (installed via viceroyInstaller, see viceroy.go); it's
// intended to be extended to cover other tooling (e.g. wasm-tools for
// `compute build`) so container images can be pre-warmed and don't need
// network access at runtime.
type InstallCommand struct {
argparser.Base
}

// NewInstallCommand returns a usable command registered under the parent.
func NewInstallCommand(parent argparser.Registerer, g *global.Data) *InstallCommand {
var c InstallCommand
c.Globals = g
c.CmdClause = parent.Command("install-tools", "Download and install the tools used by `compute` subcommands (currently the Viceroy binary used by `compute serve`)")
return &c
}

// Exec implements the command interface.
func (c *InstallCommand) Exec(_ io.Reader, out io.Writer) error {
if runtime.GOARCH == "386" {
return fsterr.RemediationError{
Inner: errors.New("this command doesn't support the '386' architecture"),
Remediation: "Although the Fastly CLI supports '386', https://github.com/fastly/Viceroy does not.",
}
}

spinner, err := text.NewSpinner(out)
if err != nil {
return err
}

// The versioner is already seeded from the manifest's viceroy_version at
// startup, so a pinned version is honored when run inside a project. The
// manifest path is only used in messages, hence the default filename.
bin, err := viceroyInstaller{
Globals: c.Globals,
Versioner: c.Globals.Versioners.Viceroy,
}.get(spinner, out, manifest.Filename)
if err != nil {
return err
}

text.Success(out, "Installed Viceroy to: %s", bin)
return nil
}
106 changes: 106 additions & 0 deletions pkg/commands/compute/install_test.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
package compute_test

import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"

"github.com/fastly/cli/pkg/argparser"
"github.com/fastly/cli/pkg/commands/compute"
"github.com/fastly/cli/pkg/config"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/github"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/mock"
"github.com/fastly/cli/pkg/testutil"
)

// TestInstallTools validates that `compute install-tools` installs Viceroy
// to the appropriate directory using the same install path as `compute serve`.
//
// As with TestGetViceroy, there isn't an executable binary in the test
// environment, so the `<binary> --version` subprocess call errors and the
// installer downloads the (mocked) latest release, which `os.Rename()` then
// moves into the install directory.
func TestInstallTools(t *testing.T) {
wd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}

viceroyBinName := "foo"
installDirName := "install"

rootdir := testutil.NewEnv(testutil.EnvOpts{
T: t,
Dirs: []string{
installDirName,
},
Write: []testutil.FileIO{
{Src: "...", Dst: viceroyBinName},

// NOTE: Created so the in-memory config can be written back to disk
// without failing because no such file existed.
{Src: "", Dst: config.FileName},
},
})
installDir := filepath.Join(rootdir, installDirName)
binPath := filepath.Join(rootdir, viceroyBinName)
configPath := filepath.Join(rootdir, config.FileName)
defer os.RemoveAll(rootdir)

if err := os.Chdir(rootdir); err != nil {
t.Fatal(err)
}
defer func() {
_ = os.Chdir(wd)
}()

github.InstallDir = installDir

var out bytes.Buffer

av := mock.AssetVersioner{
AssetVersion: "1.2.3",
BinaryFilename: viceroyBinName,
DownloadOK: true,
DownloadedFile: binPath,
}

var file config.File

// NOTE: We purposefully provide a nonsensical path, which we expect to fail,
// but the function call should fallback to using the stubbed static config.
err = file.Read("example", strings.NewReader("yes"), &out, fsterr.MockLog{}, false)
if err != nil {
t.Fatal(err)
}

cmd := &compute.InstallCommand{
Base: argparser.Base{
Globals: &global.Data{
Config: file,
ConfigPath: configPath,
ErrLog: fsterr.MockLog{},
Versioners: global.Versioners{
Viceroy: av,
},
},
},
}
if err := cmd.Exec(nil, &out); err != nil {
t.Fatal(err)
}

if !strings.Contains(out.String(), "Fetching Viceroy release: ") {
t.Fatalf("expected Viceroy to be downloaded successfully")
}

movedPath := filepath.Join(installDir, viceroyBinName)

if _, err := os.Stat(movedPath); err != nil {
t.Fatalf("binary was not moved to the install directory: %s", err)
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
### Bug Fixes:

- fix(auth): accept SSO JWT audiences with or without a trailing slash when validating the Fastly API endpoint. ([#1837](https://github.com/fastly/cli/pull/1837))
- feat(compute): add `install-tools` command to pre-install the Viceroy binary ([#1833](https://github.com/fastly/cli/pull/1833))

### Enhancements:
- feat(ngwaf/timeseries): add support for account and workspace times series commands ([#1823](https://github.com/fastly/cli/pull/1823))
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-go
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-node
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-rust
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,13 @@ RUN rustup target add wasm32-wasip1 \

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/run.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -753,7 +753,7 @@ func commandRequiresToken(command argparser.Command) bool {
return text.IsFastlyID(initCmd.CloneFrom)
}
return false
case "compute build", "compute hash-files", "compute metadata", "compute pack", "compute serve", "compute validate":
case "compute build", "compute hash-files", "compute install-tools", "compute metadata", "compute pack", "compute serve", "compute validate":
return false
}
commandName = strings.Split(commandName, " ")[0]
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,7 @@ func Define( // nolint:revive // function-length
computeDeploy := compute.NewDeployCommand(computeCmdRoot.CmdClause, data)
computeHashFiles := compute.NewHashFilesCommand(computeCmdRoot.CmdClause, data, computeBuild)
computeInit := compute.NewInitCommand(computeCmdRoot.CmdClause, data)
computeInstallTools := compute.NewInstallCommand(computeCmdRoot.CmdClause, data)
computeMetadata := compute.NewMetadataCommand(computeCmdRoot.CmdClause, data)
computePack := compute.NewPackCommand(computeCmdRoot.CmdClause, data)
computePublish := compute.NewPublishCommand(computeCmdRoot.CmdClause, data, computeBuild, computeDeploy)
Expand DownExpand Up@@ -1147,6 +1148,7 @@ func Define( // nolint:revive // function-length
computeDeploy,
computeHashFiles,
computeInit,
computeInstallTools,
computeMetadata,
computePack,
computePublish,
Expand Down
60 changes: 60 additions & 0 deletions pkg/commands/compute/install.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
package compute

import (
"errors"
"io"
"runtime"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/manifest"
"github.com/fastly/cli/pkg/text"
)

// InstallCommand pre-installs the tools that `compute` subcommands otherwise
// download on first use. Today that's the Viceroy binary used by
// `compute serve` (installed via viceroyInstaller, see viceroy.go); it's
// intended to be extended to cover other tooling (e.g. wasm-tools for
// `compute build`) so container images can be pre-warmed and don't need
// network access at runtime.
type InstallCommand struct {
argparser.Base
}

// NewInstallCommand returns a usable command registered under the parent.
func NewInstallCommand(parent argparser.Registerer, g *global.Data) *InstallCommand {
var c InstallCommand
c.Globals = g
c.CmdClause = parent.Command("install-tools", "Download and install the tools used by `compute` subcommands (currently the Viceroy binary used by `compute serve`)")
return &c
}

// Exec implements the command interface.
func (c *InstallCommand) Exec(_ io.Reader, out io.Writer) error {
if runtime.GOARCH == "386" {
return fsterr.RemediationError{
Inner: errors.New("this command doesn't support the '386' architecture"),
Remediation: "Although the Fastly CLI supports '386', https://github.com/fastly/Viceroy does not.",
}
}

spinner, err := text.NewSpinner(out)
if err != nil {
return err
}

// The versioner is already seeded from the manifest's viceroy_version at
// startup, so a pinned version is honored when run inside a project. The
// manifest path is only used in messages, hence the default filename.
bin, err := viceroyInstaller{
Globals: c.Globals,
Versioner: c.Globals.Versioners.Viceroy,
}.get(spinner, out, manifest.Filename)
if err != nil {
return err
}

text.Success(out, "Installed Viceroy to: %s", bin)
return nil
}
106 changes: 106 additions & 0 deletions pkg/commands/compute/install_test.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
package compute_test

import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"

"github.com/fastly/cli/pkg/argparser"
"github.com/fastly/cli/pkg/commands/compute"
"github.com/fastly/cli/pkg/config"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/github"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/mock"
"github.com/fastly/cli/pkg/testutil"
)

// TestInstallTools validates that `compute install-tools` installs Viceroy
// to the appropriate directory using the same install path as `compute serve`.
//
// As with TestGetViceroy, there isn't an executable binary in the test
// environment, so the `<binary> --version` subprocess call errors and the
// installer downloads the (mocked) latest release, which `os.Rename()` then
// moves into the install directory.
func TestInstallTools(t *testing.T) {
wd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}

viceroyBinName := "foo"
installDirName := "install"

rootdir := testutil.NewEnv(testutil.EnvOpts{
T: t,
Dirs: []string{
installDirName,
},
Write: []testutil.FileIO{
{Src: "...", Dst: viceroyBinName},

// NOTE: Created so the in-memory config can be written back to disk
// without failing because no such file existed.
{Src: "", Dst: config.FileName},
},
})
installDir := filepath.Join(rootdir, installDirName)
binPath := filepath.Join(rootdir, viceroyBinName)
configPath := filepath.Join(rootdir, config.FileName)
defer os.RemoveAll(rootdir)

if err := os.Chdir(rootdir); err != nil {
t.Fatal(err)
}
defer func() {
_ = os.Chdir(wd)
}()

github.InstallDir = installDir

var out bytes.Buffer

av := mock.AssetVersioner{
AssetVersion: "1.2.3",
BinaryFilename: viceroyBinName,
DownloadOK: true,
DownloadedFile: binPath,
}

var file config.File

// NOTE: We purposefully provide a nonsensical path, which we expect to fail,
// but the function call should fallback to using the stubbed static config.
err = file.Read("example", strings.NewReader("yes"), &out, fsterr.MockLog{}, false)
if err != nil {
t.Fatal(err)
}

cmd := &compute.InstallCommand{
Base: argparser.Base{
Globals: &global.Data{
Config: file,
ConfigPath: configPath,
ErrLog: fsterr.MockLog{},
Versioners: global.Versioners{
Viceroy: av,
},
},
},
}
if err := cmd.Exec(nil, &out); err != nil {
t.Fatal(err)
}

if !strings.Contains(out.String(), "Fetching Viceroy release: ") {
t.Fatalf("expected Viceroy to be downloaded successfully")
}

movedPath := filepath.Join(installDir, viceroyBinName)

if _, err := os.Stat(movedPath); err != nil {
t.Fatalf("binary was not moved to the install directory: %s", err)
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
### Bug Fixes:

- fix(auth): accept SSO JWT audiences with or without a trailing slash when validating the Fastly API endpoint. ([#1837](https://github.com/fastly/cli/pull/1837))
- feat(compute): add `install-tools` command to pre-install the Viceroy binary ([#1833](https://github.com/fastly/cli/pull/1833))

### Enhancements:
- feat(ngwaf/timeseries): add support for account and workspace times series commands ([#1823](https://github.com/fastly/cli/pull/1823))
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-go
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-node
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-rust
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,13 @@ RUN rustup target add wasm32-wasip1 \

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/run.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -753,7 +753,7 @@ func commandRequiresToken(command argparser.Command) bool {
return text.IsFastlyID(initCmd.CloneFrom)
}
return false
case "compute build", "compute hash-files", "compute metadata", "compute pack", "compute serve", "compute validate":
case "compute build", "compute hash-files", "compute install-tools", "compute metadata", "compute pack", "compute serve", "compute validate":
return false
}
commandName = strings.Split(commandName, " ")[0]
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,7 @@ func Define( // nolint:revive // function-length
computeDeploy := compute.NewDeployCommand(computeCmdRoot.CmdClause, data)
computeHashFiles := compute.NewHashFilesCommand(computeCmdRoot.CmdClause, data, computeBuild)
computeInit := compute.NewInitCommand(computeCmdRoot.CmdClause, data)
computeInstallTools := compute.NewInstallCommand(computeCmdRoot.CmdClause, data)
computeMetadata := compute.NewMetadataCommand(computeCmdRoot.CmdClause, data)
computePack := compute.NewPackCommand(computeCmdRoot.CmdClause, data)
computePublish := compute.NewPublishCommand(computeCmdRoot.CmdClause, data, computeBuild, computeDeploy)
Expand DownExpand Up@@ -1147,6 +1148,7 @@ func Define( // nolint:revive // function-length
computeDeploy,
computeHashFiles,
computeInit,
computeInstallTools,
computeMetadata,
computePack,
computePublish,
Expand Down
60 changes: 60 additions & 0 deletions pkg/commands/compute/install.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
package compute

import (
"errors"
"io"
"runtime"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/manifest"
"github.com/fastly/cli/pkg/text"
)

// InstallCommand pre-installs the tools that `compute` subcommands otherwise
// download on first use. Today that's the Viceroy binary used by
// `compute serve` (installed via viceroyInstaller, see viceroy.go); it's
// intended to be extended to cover other tooling (e.g. wasm-tools for
// `compute build`) so container images can be pre-warmed and don't need
// network access at runtime.
type InstallCommand struct {
argparser.Base
}

// NewInstallCommand returns a usable command registered under the parent.
func NewInstallCommand(parent argparser.Registerer, g *global.Data) *InstallCommand {
var c InstallCommand
c.Globals = g
c.CmdClause = parent.Command("install-tools", "Download and install the tools used by `compute` subcommands (currently the Viceroy binary used by `compute serve`)")
return &c
}

// Exec implements the command interface.
func (c *InstallCommand) Exec(_ io.Reader, out io.Writer) error {
if runtime.GOARCH == "386" {
return fsterr.RemediationError{
Inner: errors.New("this command doesn't support the '386' architecture"),
Remediation: "Although the Fastly CLI supports '386', https://github.com/fastly/Viceroy does not.",
}
}

spinner, err := text.NewSpinner(out)
if err != nil {
return err
}

// The versioner is already seeded from the manifest's viceroy_version at
// startup, so a pinned version is honored when run inside a project. The
// manifest path is only used in messages, hence the default filename.
bin, err := viceroyInstaller{
Globals: c.Globals,
Versioner: c.Globals.Versioners.Viceroy,
}.get(spinner, out, manifest.Filename)
if err != nil {
return err
}

text.Success(out, "Installed Viceroy to: %s", bin)
return nil
}
106 changes: 106 additions & 0 deletions pkg/commands/compute/install_test.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
package compute_test

import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"

"github.com/fastly/cli/pkg/argparser"
"github.com/fastly/cli/pkg/commands/compute"
"github.com/fastly/cli/pkg/config"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/github"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/mock"
"github.com/fastly/cli/pkg/testutil"
)

// TestInstallTools validates that `compute install-tools` installs Viceroy
// to the appropriate directory using the same install path as `compute serve`.
//
// As with TestGetViceroy, there isn't an executable binary in the test
// environment, so the `<binary> --version` subprocess call errors and the
// installer downloads the (mocked) latest release, which `os.Rename()` then
// moves into the install directory.
func TestInstallTools(t *testing.T) {
wd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}

viceroyBinName := "foo"
installDirName := "install"

rootdir := testutil.NewEnv(testutil.EnvOpts{
T: t,
Dirs: []string{
installDirName,
},
Write: []testutil.FileIO{
{Src: "...", Dst: viceroyBinName},

// NOTE: Created so the in-memory config can be written back to disk
// without failing because no such file existed.
{Src: "", Dst: config.FileName},
},
})
installDir := filepath.Join(rootdir, installDirName)
binPath := filepath.Join(rootdir, viceroyBinName)
configPath := filepath.Join(rootdir, config.FileName)
defer os.RemoveAll(rootdir)

if err := os.Chdir(rootdir); err != nil {
t.Fatal(err)
}
defer func() {
_ = os.Chdir(wd)
}()

github.InstallDir = installDir

var out bytes.Buffer

av := mock.AssetVersioner{
AssetVersion: "1.2.3",
BinaryFilename: viceroyBinName,
DownloadOK: true,
DownloadedFile: binPath,
}

var file config.File

// NOTE: We purposefully provide a nonsensical path, which we expect to fail,
// but the function call should fallback to using the stubbed static config.
err = file.Read("example", strings.NewReader("yes"), &out, fsterr.MockLog{}, false)
if err != nil {
t.Fatal(err)
}

cmd := &compute.InstallCommand{
Base: argparser.Base{
Globals: &global.Data{
Config: file,
ConfigPath: configPath,
ErrLog: fsterr.MockLog{},
Versioners: global.Versioners{
Viceroy: av,
},
},
},
}
if err := cmd.Exec(nil, &out); err != nil {
t.Fatal(err)
}

if !strings.Contains(out.String(), "Fetching Viceroy release: ") {
t.Fatalf("expected Viceroy to be downloaded successfully")
}

movedPath := filepath.Join(installDir, viceroyBinName)

if _, err := os.Stat(movedPath); err != nil {
t.Fatalf("binary was not moved to the install directory: %s", err)
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
### Bug Fixes:

- fix(auth): accept SSO JWT audiences with or without a trailing slash when validating the Fastly API endpoint. ([#1837](https://github.com/fastly/cli/pull/1837))
- feat(compute): add `install-tools` command to pre-install the Viceroy binary ([#1833](https://github.com/fastly/cli/pull/1833))

### Enhancements:
- feat(ngwaf/timeseries): add support for account and workspace times series commands ([#1823](https://github.com/fastly/cli/pull/1823))
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-go
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-node
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-rust
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,13 @@ RUN rustup target add wasm32-wasip1 \

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/run.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -753,7 +753,7 @@ func commandRequiresToken(command argparser.Command) bool {
return text.IsFastlyID(initCmd.CloneFrom)
}
return false
case "compute build", "compute hash-files", "compute metadata", "compute pack", "compute serve", "compute validate":
case "compute build", "compute hash-files", "compute install-tools", "compute metadata", "compute pack", "compute serve", "compute validate":
return false
}
commandName = strings.Split(commandName, " ")[0]
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,7 @@ func Define( // nolint:revive // function-length
computeDeploy := compute.NewDeployCommand(computeCmdRoot.CmdClause, data)
computeHashFiles := compute.NewHashFilesCommand(computeCmdRoot.CmdClause, data, computeBuild)
computeInit := compute.NewInitCommand(computeCmdRoot.CmdClause, data)
computeInstallTools := compute.NewInstallCommand(computeCmdRoot.CmdClause, data)
computeMetadata := compute.NewMetadataCommand(computeCmdRoot.CmdClause, data)
computePack := compute.NewPackCommand(computeCmdRoot.CmdClause, data)
computePublish := compute.NewPublishCommand(computeCmdRoot.CmdClause, data, computeBuild, computeDeploy)
Expand DownExpand Up@@ -1147,6 +1148,7 @@ func Define( // nolint:revive // function-length
computeDeploy,
computeHashFiles,
computeInit,
computeInstallTools,
computeMetadata,
computePack,
computePublish,
Expand Down
60 changes: 60 additions & 0 deletions pkg/commands/compute/install.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
package compute

import (
"errors"
"io"
"runtime"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/manifest"
"github.com/fastly/cli/pkg/text"
)

// InstallCommand pre-installs the tools that `compute` subcommands otherwise
// download on first use. Today that's the Viceroy binary used by
// `compute serve` (installed via viceroyInstaller, see viceroy.go); it's
// intended to be extended to cover other tooling (e.g. wasm-tools for
// `compute build`) so container images can be pre-warmed and don't need
// network access at runtime.
type InstallCommand struct {
argparser.Base
}

// NewInstallCommand returns a usable command registered under the parent.
func NewInstallCommand(parent argparser.Registerer, g *global.Data) *InstallCommand {
var c InstallCommand
c.Globals = g
c.CmdClause = parent.Command("install-tools", "Download and install the tools used by `compute` subcommands (currently the Viceroy binary used by `compute serve`)")
return &c
}

// Exec implements the command interface.
func (c *InstallCommand) Exec(_ io.Reader, out io.Writer) error {
if runtime.GOARCH == "386" {
return fsterr.RemediationError{
Inner: errors.New("this command doesn't support the '386' architecture"),
Remediation: "Although the Fastly CLI supports '386', https://github.com/fastly/Viceroy does not.",
}
}

spinner, err := text.NewSpinner(out)
if err != nil {
return err
}

// The versioner is already seeded from the manifest's viceroy_version at
// startup, so a pinned version is honored when run inside a project. The
// manifest path is only used in messages, hence the default filename.
bin, err := viceroyInstaller{
Globals: c.Globals,
Versioner: c.Globals.Versioners.Viceroy,
}.get(spinner, out, manifest.Filename)
if err != nil {
return err
}

text.Success(out, "Installed Viceroy to: %s", bin)
return nil
}
106 changes: 106 additions & 0 deletions pkg/commands/compute/install_test.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
package compute_test

import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"

"github.com/fastly/cli/pkg/argparser"
"github.com/fastly/cli/pkg/commands/compute"
"github.com/fastly/cli/pkg/config"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/github"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/mock"
"github.com/fastly/cli/pkg/testutil"
)

// TestInstallTools validates that `compute install-tools` installs Viceroy
// to the appropriate directory using the same install path as `compute serve`.
//
// As with TestGetViceroy, there isn't an executable binary in the test
// environment, so the `<binary> --version` subprocess call errors and the
// installer downloads the (mocked) latest release, which `os.Rename()` then
// moves into the install directory.
func TestInstallTools(t *testing.T) {
wd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}

viceroyBinName := "foo"
installDirName := "install"

rootdir := testutil.NewEnv(testutil.EnvOpts{
T: t,
Dirs: []string{
installDirName,
},
Write: []testutil.FileIO{
{Src: "...", Dst: viceroyBinName},

// NOTE: Created so the in-memory config can be written back to disk
// without failing because no such file existed.
{Src: "", Dst: config.FileName},
},
})
installDir := filepath.Join(rootdir, installDirName)
binPath := filepath.Join(rootdir, viceroyBinName)
configPath := filepath.Join(rootdir, config.FileName)
defer os.RemoveAll(rootdir)

if err := os.Chdir(rootdir); err != nil {
t.Fatal(err)
}
defer func() {
_ = os.Chdir(wd)
}()

github.InstallDir = installDir

var out bytes.Buffer

av := mock.AssetVersioner{
AssetVersion: "1.2.3",
BinaryFilename: viceroyBinName,
DownloadOK: true,
DownloadedFile: binPath,
}

var file config.File

// NOTE: We purposefully provide a nonsensical path, which we expect to fail,
// but the function call should fallback to using the stubbed static config.
err = file.Read("example", strings.NewReader("yes"), &out, fsterr.MockLog{}, false)
if err != nil {
t.Fatal(err)
}

cmd := &compute.InstallCommand{
Base: argparser.Base{
Globals: &global.Data{
Config: file,
ConfigPath: configPath,
ErrLog: fsterr.MockLog{},
Versioners: global.Versioners{
Viceroy: av,
},
},
},
}
if err := cmd.Exec(nil, &out); err != nil {
t.Fatal(err)
}

if !strings.Contains(out.String(), "Fetching Viceroy release: ") {
t.Fatalf("expected Viceroy to be downloaded successfully")
}

movedPath := filepath.Join(installDir, viceroyBinName)

if _, err := os.Stat(movedPath); err != nil {
t.Fatalf("binary was not moved to the install directory: %s", err)
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
### Bug Fixes:

- fix(auth): accept SSO JWT audiences with or without a trailing slash when validating the Fastly API endpoint. ([#1837](https://github.com/fastly/cli/pull/1837))
- feat(compute): add `install-tools` command to pre-install the Viceroy binary ([#1833](https://github.com/fastly/cli/pull/1833))

### Enhancements:
- feat(ngwaf/timeseries): add support for account and workspace times series commands ([#1823](https://github.com/fastly/cli/pull/1823))
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-go
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-node
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-rust
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,13 @@ RUN rustup target add wasm32-wasip1 \

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/run.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -753,7 +753,7 @@ func commandRequiresToken(command argparser.Command) bool {
return text.IsFastlyID(initCmd.CloneFrom)
}
return false
case "compute build", "compute hash-files", "compute metadata", "compute pack", "compute serve", "compute validate":
case "compute build", "compute hash-files", "compute install-tools", "compute metadata", "compute pack", "compute serve", "compute validate":
return false
}
commandName = strings.Split(commandName, " ")[0]
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,7 @@ func Define( // nolint:revive // function-length
computeDeploy := compute.NewDeployCommand(computeCmdRoot.CmdClause, data)
computeHashFiles := compute.NewHashFilesCommand(computeCmdRoot.CmdClause, data, computeBuild)
computeInit := compute.NewInitCommand(computeCmdRoot.CmdClause, data)
computeInstallTools := compute.NewInstallCommand(computeCmdRoot.CmdClause, data)
computeMetadata := compute.NewMetadataCommand(computeCmdRoot.CmdClause, data)
computePack := compute.NewPackCommand(computeCmdRoot.CmdClause, data)
computePublish := compute.NewPublishCommand(computeCmdRoot.CmdClause, data, computeBuild, computeDeploy)
Expand DownExpand Up@@ -1147,6 +1148,7 @@ func Define( // nolint:revive // function-length
computeDeploy,
computeHashFiles,
computeInit,
computeInstallTools,
computeMetadata,
computePack,
computePublish,
Expand Down
60 changes: 60 additions & 0 deletions pkg/commands/compute/install.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
package compute

import (
"errors"
"io"
"runtime"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/manifest"
"github.com/fastly/cli/pkg/text"
)

// InstallCommand pre-installs the tools that `compute` subcommands otherwise
// download on first use. Today that's the Viceroy binary used by
// `compute serve` (installed via viceroyInstaller, see viceroy.go); it's
// intended to be extended to cover other tooling (e.g. wasm-tools for
// `compute build`) so container images can be pre-warmed and don't need
// network access at runtime.
type InstallCommand struct {
argparser.Base
}

// NewInstallCommand returns a usable command registered under the parent.
func NewInstallCommand(parent argparser.Registerer, g *global.Data) *InstallCommand {
var c InstallCommand
c.Globals = g
c.CmdClause = parent.Command("install-tools", "Download and install the tools used by `compute` subcommands (currently the Viceroy binary used by `compute serve`)")
return &c
}

// Exec implements the command interface.
func (c *InstallCommand) Exec(_ io.Reader, out io.Writer) error {
if runtime.GOARCH == "386" {
return fsterr.RemediationError{
Inner: errors.New("this command doesn't support the '386' architecture"),
Remediation: "Although the Fastly CLI supports '386', https://github.com/fastly/Viceroy does not.",
}
}

spinner, err := text.NewSpinner(out)
if err != nil {
return err
}

// The versioner is already seeded from the manifest's viceroy_version at
// startup, so a pinned version is honored when run inside a project. The
// manifest path is only used in messages, hence the default filename.
bin, err := viceroyInstaller{
Globals: c.Globals,
Versioner: c.Globals.Versioners.Viceroy,
}.get(spinner, out, manifest.Filename)
if err != nil {
return err
}

text.Success(out, "Installed Viceroy to: %s", bin)
return nil
}
106 changes: 106 additions & 0 deletions pkg/commands/compute/install_test.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
package compute_test

import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"

"github.com/fastly/cli/pkg/argparser"
"github.com/fastly/cli/pkg/commands/compute"
"github.com/fastly/cli/pkg/config"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/github"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/mock"
"github.com/fastly/cli/pkg/testutil"
)

// TestInstallTools validates that `compute install-tools` installs Viceroy
// to the appropriate directory using the same install path as `compute serve`.
//
// As with TestGetViceroy, there isn't an executable binary in the test
// environment, so the `<binary> --version` subprocess call errors and the
// installer downloads the (mocked) latest release, which `os.Rename()` then
// moves into the install directory.
func TestInstallTools(t *testing.T) {
wd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}

viceroyBinName := "foo"
installDirName := "install"

rootdir := testutil.NewEnv(testutil.EnvOpts{
T: t,
Dirs: []string{
installDirName,
},
Write: []testutil.FileIO{
{Src: "...", Dst: viceroyBinName},

// NOTE: Created so the in-memory config can be written back to disk
// without failing because no such file existed.
{Src: "", Dst: config.FileName},
},
})
installDir := filepath.Join(rootdir, installDirName)
binPath := filepath.Join(rootdir, viceroyBinName)
configPath := filepath.Join(rootdir, config.FileName)
defer os.RemoveAll(rootdir)

if err := os.Chdir(rootdir); err != nil {
t.Fatal(err)
}
defer func() {
_ = os.Chdir(wd)
}()

github.InstallDir = installDir

var out bytes.Buffer

av := mock.AssetVersioner{
AssetVersion: "1.2.3",
BinaryFilename: viceroyBinName,
DownloadOK: true,
DownloadedFile: binPath,
}

var file config.File

// NOTE: We purposefully provide a nonsensical path, which we expect to fail,
// but the function call should fallback to using the stubbed static config.
err = file.Read("example", strings.NewReader("yes"), &out, fsterr.MockLog{}, false)
if err != nil {
t.Fatal(err)
}

cmd := &compute.InstallCommand{
Base: argparser.Base{
Globals: &global.Data{
Config: file,
ConfigPath: configPath,
ErrLog: fsterr.MockLog{},
Versioners: global.Versioners{
Viceroy: av,
},
},
},
}
if err := cmd.Exec(nil, &out); err != nil {
t.Fatal(err)
}

if !strings.Contains(out.String(), "Fetching Viceroy release: ") {
t.Fatalf("expected Viceroy to be downloaded successfully")
}

movedPath := filepath.Join(installDir, viceroyBinName)

if _, err := os.Stat(movedPath); err != nil {
t.Fatalf("binary was not moved to the install directory: %s", err)
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
### Bug Fixes:

- fix(auth): accept SSO JWT audiences with or without a trailing slash when validating the Fastly API endpoint. ([#1837](https://github.com/fastly/cli/pull/1837))
- feat(compute): add `install-tools` command to pre-install the Viceroy binary ([#1833](https://github.com/fastly/cli/pull/1833))

### Enhancements:
- feat(ngwaf/timeseries): add support for account and workspace times series commands ([#1823](https://github.com/fastly/cli/pull/1823))
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-go
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-node
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-rust
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,13 @@ RUN rustup target add wasm32-wasip1 \

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/run.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -753,7 +753,7 @@ func commandRequiresToken(command argparser.Command) bool {
return text.IsFastlyID(initCmd.CloneFrom)
}
return false
case "compute build", "compute hash-files", "compute metadata", "compute pack", "compute serve", "compute validate":
case "compute build", "compute hash-files", "compute install-tools", "compute metadata", "compute pack", "compute serve", "compute validate":
return false
}
commandName = strings.Split(commandName, " ")[0]
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,7 @@ func Define( // nolint:revive // function-length
computeDeploy := compute.NewDeployCommand(computeCmdRoot.CmdClause, data)
computeHashFiles := compute.NewHashFilesCommand(computeCmdRoot.CmdClause, data, computeBuild)
computeInit := compute.NewInitCommand(computeCmdRoot.CmdClause, data)
computeInstallTools := compute.NewInstallCommand(computeCmdRoot.CmdClause, data)
computeMetadata := compute.NewMetadataCommand(computeCmdRoot.CmdClause, data)
computePack := compute.NewPackCommand(computeCmdRoot.CmdClause, data)
computePublish := compute.NewPublishCommand(computeCmdRoot.CmdClause, data, computeBuild, computeDeploy)
Expand DownExpand Up@@ -1147,6 +1148,7 @@ func Define( // nolint:revive // function-length
computeDeploy,
computeHashFiles,
computeInit,
computeInstallTools,
computeMetadata,
computePack,
computePublish,
Expand Down
60 changes: 60 additions & 0 deletions pkg/commands/compute/install.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
package compute

import (
"errors"
"io"
"runtime"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/manifest"
"github.com/fastly/cli/pkg/text"
)

// InstallCommand pre-installs the tools that `compute` subcommands otherwise
// download on first use. Today that's the Viceroy binary used by
// `compute serve` (installed via viceroyInstaller, see viceroy.go); it's
// intended to be extended to cover other tooling (e.g. wasm-tools for
// `compute build`) so container images can be pre-warmed and don't need
// network access at runtime.
type InstallCommand struct {
argparser.Base
}

// NewInstallCommand returns a usable command registered under the parent.
func NewInstallCommand(parent argparser.Registerer, g *global.Data) *InstallCommand {
var c InstallCommand
c.Globals = g
c.CmdClause = parent.Command("install-tools", "Download and install the tools used by `compute` subcommands (currently the Viceroy binary used by `compute serve`)")
return &c
}

// Exec implements the command interface.
func (c *InstallCommand) Exec(_ io.Reader, out io.Writer) error {
if runtime.GOARCH == "386" {
return fsterr.RemediationError{
Inner: errors.New("this command doesn't support the '386' architecture"),
Remediation: "Although the Fastly CLI supports '386', https://github.com/fastly/Viceroy does not.",
}
}

spinner, err := text.NewSpinner(out)
if err != nil {
return err
}

// The versioner is already seeded from the manifest's viceroy_version at
// startup, so a pinned version is honored when run inside a project. The
// manifest path is only used in messages, hence the default filename.
bin, err := viceroyInstaller{
Globals: c.Globals,
Versioner: c.Globals.Versioners.Viceroy,
}.get(spinner, out, manifest.Filename)
if err != nil {
return err
}

text.Success(out, "Installed Viceroy to: %s", bin)
return nil
}
106 changes: 106 additions & 0 deletions pkg/commands/compute/install_test.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
package compute_test

import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"

"github.com/fastly/cli/pkg/argparser"
"github.com/fastly/cli/pkg/commands/compute"
"github.com/fastly/cli/pkg/config"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/github"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/mock"
"github.com/fastly/cli/pkg/testutil"
)

// TestInstallTools validates that `compute install-tools` installs Viceroy
// to the appropriate directory using the same install path as `compute serve`.
//
// As with TestGetViceroy, there isn't an executable binary in the test
// environment, so the `<binary> --version` subprocess call errors and the
// installer downloads the (mocked) latest release, which `os.Rename()` then
// moves into the install directory.
func TestInstallTools(t *testing.T) {
wd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}

viceroyBinName := "foo"
installDirName := "install"

rootdir := testutil.NewEnv(testutil.EnvOpts{
T: t,
Dirs: []string{
installDirName,
},
Write: []testutil.FileIO{
{Src: "...", Dst: viceroyBinName},

// NOTE: Created so the in-memory config can be written back to disk
// without failing because no such file existed.
{Src: "", Dst: config.FileName},
},
})
installDir := filepath.Join(rootdir, installDirName)
binPath := filepath.Join(rootdir, viceroyBinName)
configPath := filepath.Join(rootdir, config.FileName)
defer os.RemoveAll(rootdir)

if err := os.Chdir(rootdir); err != nil {
t.Fatal(err)
}
defer func() {
_ = os.Chdir(wd)
}()

github.InstallDir = installDir

var out bytes.Buffer

av := mock.AssetVersioner{
AssetVersion: "1.2.3",
BinaryFilename: viceroyBinName,
DownloadOK: true,
DownloadedFile: binPath,
}

var file config.File

// NOTE: We purposefully provide a nonsensical path, which we expect to fail,
// but the function call should fallback to using the stubbed static config.
err = file.Read("example", strings.NewReader("yes"), &out, fsterr.MockLog{}, false)
if err != nil {
t.Fatal(err)
}

cmd := &compute.InstallCommand{
Base: argparser.Base{
Globals: &global.Data{
Config: file,
ConfigPath: configPath,
ErrLog: fsterr.MockLog{},
Versioners: global.Versioners{
Viceroy: av,
},
},
},
}
if err := cmd.Exec(nil, &out); err != nil {
t.Fatal(err)
}

if !strings.Contains(out.String(), "Fetching Viceroy release: ") {
t.Fatalf("expected Viceroy to be downloaded successfully")
}

movedPath := filepath.Join(installDir, viceroyBinName)

if _, err := os.Stat(movedPath); err != nil {
t.Fatalf("binary was not moved to the install directory: %s", err)
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
### Bug Fixes:

- fix(auth): accept SSO JWT audiences with or without a trailing slash when validating the Fastly API endpoint. ([#1837](https://github.com/fastly/cli/pull/1837))
- feat(compute): add `install-tools` command to pre-install the Viceroy binary ([#1833](https://github.com/fastly/cli/pull/1833))

### Enhancements:
- feat(ngwaf/timeseries): add support for account and workspace times series commands ([#1823](https://github.com/fastly/cli/pull/1823))
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-go
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-node
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-rust
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,13 @@ RUN rustup target add wasm32-wasip1 \

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/run.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -753,7 +753,7 @@ func commandRequiresToken(command argparser.Command) bool {
return text.IsFastlyID(initCmd.CloneFrom)
}
return false
case "compute build", "compute hash-files", "compute metadata", "compute pack", "compute serve", "compute validate":
case "compute build", "compute hash-files", "compute install-tools", "compute metadata", "compute pack", "compute serve", "compute validate":
return false
}
commandName = strings.Split(commandName, " ")[0]
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,7 @@ func Define( // nolint:revive // function-length
computeDeploy := compute.NewDeployCommand(computeCmdRoot.CmdClause, data)
computeHashFiles := compute.NewHashFilesCommand(computeCmdRoot.CmdClause, data, computeBuild)
computeInit := compute.NewInitCommand(computeCmdRoot.CmdClause, data)
computeInstallTools := compute.NewInstallCommand(computeCmdRoot.CmdClause, data)
computeMetadata := compute.NewMetadataCommand(computeCmdRoot.CmdClause, data)
computePack := compute.NewPackCommand(computeCmdRoot.CmdClause, data)
computePublish := compute.NewPublishCommand(computeCmdRoot.CmdClause, data, computeBuild, computeDeploy)
Expand DownExpand Up@@ -1147,6 +1148,7 @@ func Define( // nolint:revive // function-length
computeDeploy,
computeHashFiles,
computeInit,
computeInstallTools,
computeMetadata,
computePack,
computePublish,
Expand Down
60 changes: 60 additions & 0 deletions pkg/commands/compute/install.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
package compute

import (
"errors"
"io"
"runtime"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/manifest"
"github.com/fastly/cli/pkg/text"
)

// InstallCommand pre-installs the tools that `compute` subcommands otherwise
// download on first use. Today that's the Viceroy binary used by
// `compute serve` (installed via viceroyInstaller, see viceroy.go); it's
// intended to be extended to cover other tooling (e.g. wasm-tools for
// `compute build`) so container images can be pre-warmed and don't need
// network access at runtime.
type InstallCommand struct {
argparser.Base
}

// NewInstallCommand returns a usable command registered under the parent.
func NewInstallCommand(parent argparser.Registerer, g *global.Data) *InstallCommand {
var c InstallCommand
c.Globals = g
c.CmdClause = parent.Command("install-tools", "Download and install the tools used by `compute` subcommands (currently the Viceroy binary used by `compute serve`)")
return &c
}

// Exec implements the command interface.
func (c *InstallCommand) Exec(_ io.Reader, out io.Writer) error {
if runtime.GOARCH == "386" {
return fsterr.RemediationError{
Inner: errors.New("this command doesn't support the '386' architecture"),
Remediation: "Although the Fastly CLI supports '386', https://github.com/fastly/Viceroy does not.",
}
}

spinner, err := text.NewSpinner(out)
if err != nil {
return err
}

// The versioner is already seeded from the manifest's viceroy_version at
// startup, so a pinned version is honored when run inside a project. The
// manifest path is only used in messages, hence the default filename.
bin, err := viceroyInstaller{
Globals: c.Globals,
Versioner: c.Globals.Versioners.Viceroy,
}.get(spinner, out, manifest.Filename)
if err != nil {
return err
}

text.Success(out, "Installed Viceroy to: %s", bin)
return nil
}
106 changes: 106 additions & 0 deletions pkg/commands/compute/install_test.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
package compute_test

import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"

"github.com/fastly/cli/pkg/argparser"
"github.com/fastly/cli/pkg/commands/compute"
"github.com/fastly/cli/pkg/config"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/github"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/mock"
"github.com/fastly/cli/pkg/testutil"
)

// TestInstallTools validates that `compute install-tools` installs Viceroy
// to the appropriate directory using the same install path as `compute serve`.
//
// As with TestGetViceroy, there isn't an executable binary in the test
// environment, so the `<binary> --version` subprocess call errors and the
// installer downloads the (mocked) latest release, which `os.Rename()` then
// moves into the install directory.
func TestInstallTools(t *testing.T) {
wd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}

viceroyBinName := "foo"
installDirName := "install"

rootdir := testutil.NewEnv(testutil.EnvOpts{
T: t,
Dirs: []string{
installDirName,
},
Write: []testutil.FileIO{
{Src: "...", Dst: viceroyBinName},

// NOTE: Created so the in-memory config can be written back to disk
// without failing because no such file existed.
{Src: "", Dst: config.FileName},
},
})
installDir := filepath.Join(rootdir, installDirName)
binPath := filepath.Join(rootdir, viceroyBinName)
configPath := filepath.Join(rootdir, config.FileName)
defer os.RemoveAll(rootdir)

if err := os.Chdir(rootdir); err != nil {
t.Fatal(err)
}
defer func() {
_ = os.Chdir(wd)
}()

github.InstallDir = installDir

var out bytes.Buffer

av := mock.AssetVersioner{
AssetVersion: "1.2.3",
BinaryFilename: viceroyBinName,
DownloadOK: true,
DownloadedFile: binPath,
}

var file config.File

// NOTE: We purposefully provide a nonsensical path, which we expect to fail,
// but the function call should fallback to using the stubbed static config.
err = file.Read("example", strings.NewReader("yes"), &out, fsterr.MockLog{}, false)
if err != nil {
t.Fatal(err)
}

cmd := &compute.InstallCommand{
Base: argparser.Base{
Globals: &global.Data{
Config: file,
ConfigPath: configPath,
ErrLog: fsterr.MockLog{},
Versioners: global.Versioners{
Viceroy: av,
},
},
},
}
if err := cmd.Exec(nil, &out); err != nil {
t.Fatal(err)
}

if !strings.Contains(out.String(), "Fetching Viceroy release: ") {
t.Fatalf("expected Viceroy to be downloaded successfully")
}

movedPath := filepath.Join(installDir, viceroyBinName)

if _, err := os.Stat(movedPath); err != nil {
t.Fatalf("binary was not moved to the install directory: %s", err)
}
}
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,7 @@
### Bug Fixes:

- fix(auth): accept SSO JWT audiences with or without a trailing slash when validating the Fastly API endpoint. ([#1837](https://github.com/fastly/cli/pull/1837))
- feat(compute): add `install-tools` command to pre-install the Viceroy binary ([#1833](https://github.com/fastly/cli/pull/1833))

### Enhancements:
- feat(ngwaf/timeseries): add support for account and workspace times series commands ([#1823](https://github.com/fastly/cli/pull/1823))
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-go
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-node
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,13 @@ RUN apt-get update && apt-get install -y curl jq && apt-get -y clean && rm -rf /

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
7 changes: 7 additions & 0 deletions Dockerfile-rust
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,6 +16,13 @@ RUN rustup target add wasm32-wasip1 \

USER fastly

# Pre-install Viceroy so the image is self-contained (no download at runtime).
# Must run as the `fastly` user, since Viceroy installs into that user's config
# directory (where `compute serve` later looks for it).
#
# TODO: Enable once https://github.com/fastly/cli/pull/1833 was released
# RUN fastly compute install-tools

WORKDIR /app
ENTRYPOINT ["/usr/bin/fastly"]
CMD ["--help"]
Expand Down
2 changes: 1 addition & 1 deletion pkg/app/run.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -753,7 +753,7 @@ func commandRequiresToken(command argparser.Command) bool {
return text.IsFastlyID(initCmd.CloneFrom)
}
return false
case "compute build", "compute hash-files", "compute metadata", "compute pack", "compute serve", "compute validate":
case "compute build", "compute hash-files", "compute install-tools", "compute metadata", "compute pack", "compute serve", "compute validate":
return false
}
commandName = strings.Split(commandName, " ")[0]
Expand Down
2 changes: 2 additions & 0 deletions pkg/commands/commands.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -256,6 +256,7 @@ func Define( // nolint:revive // function-length
computeDeploy := compute.NewDeployCommand(computeCmdRoot.CmdClause, data)
computeHashFiles := compute.NewHashFilesCommand(computeCmdRoot.CmdClause, data, computeBuild)
computeInit := compute.NewInitCommand(computeCmdRoot.CmdClause, data)
computeInstallTools := compute.NewInstallCommand(computeCmdRoot.CmdClause, data)
computeMetadata := compute.NewMetadataCommand(computeCmdRoot.CmdClause, data)
computePack := compute.NewPackCommand(computeCmdRoot.CmdClause, data)
computePublish := compute.NewPublishCommand(computeCmdRoot.CmdClause, data, computeBuild, computeDeploy)
Expand DownExpand Up@@ -1147,6 +1148,7 @@ func Define( // nolint:revive // function-length
computeDeploy,
computeHashFiles,
computeInit,
computeInstallTools,
computeMetadata,
computePack,
computePublish,
Expand Down
60 changes: 60 additions & 0 deletions pkg/commands/compute/install.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
package compute

import (
"errors"
"io"
"runtime"

"github.com/fastly/cli/pkg/argparser"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/manifest"
"github.com/fastly/cli/pkg/text"
)

// InstallCommand pre-installs the tools that `compute` subcommands otherwise
// download on first use. Today that's the Viceroy binary used by
// `compute serve` (installed via viceroyInstaller, see viceroy.go); it's
// intended to be extended to cover other tooling (e.g. wasm-tools for
// `compute build`) so container images can be pre-warmed and don't need
// network access at runtime.
type InstallCommand struct {
argparser.Base
}

// NewInstallCommand returns a usable command registered under the parent.
func NewInstallCommand(parent argparser.Registerer, g *global.Data) *InstallCommand {
var c InstallCommand
c.Globals = g
c.CmdClause = parent.Command("install-tools", "Download and install the tools used by `compute` subcommands (currently the Viceroy binary used by `compute serve`)")
return &c
}

// Exec implements the command interface.
func (c *InstallCommand) Exec(_ io.Reader, out io.Writer) error {
if runtime.GOARCH == "386" {
return fsterr.RemediationError{
Inner: errors.New("this command doesn't support the '386' architecture"),
Remediation: "Although the Fastly CLI supports '386', https://github.com/fastly/Viceroy does not.",
}
}

spinner, err := text.NewSpinner(out)
if err != nil {
return err
}

// The versioner is already seeded from the manifest's viceroy_version at
// startup, so a pinned version is honored when run inside a project. The
// manifest path is only used in messages, hence the default filename.
bin, err := viceroyInstaller{
Globals: c.Globals,
Versioner: c.Globals.Versioners.Viceroy,
}.get(spinner, out, manifest.Filename)
if err != nil {
return err
}

text.Success(out, "Installed Viceroy to: %s", bin)
return nil
}
106 changes: 106 additions & 0 deletions pkg/commands/compute/install_test.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
package compute_test

import (
"bytes"
"os"
"path/filepath"
"strings"
"testing"

"github.com/fastly/cli/pkg/argparser"
"github.com/fastly/cli/pkg/commands/compute"
"github.com/fastly/cli/pkg/config"
fsterr "github.com/fastly/cli/pkg/errors"
"github.com/fastly/cli/pkg/github"
"github.com/fastly/cli/pkg/global"
"github.com/fastly/cli/pkg/mock"
"github.com/fastly/cli/pkg/testutil"
)

// TestInstallTools validates that `compute install-tools` installs Viceroy
// to the appropriate directory using the same install path as `compute serve`.
//
// As with TestGetViceroy, there isn't an executable binary in the test
// environment, so the `<binary> --version` subprocess call errors and the
// installer downloads the (mocked) latest release, which `os.Rename()` then
// moves into the install directory.
func TestInstallTools(t *testing.T) {
wd, err := os.Getwd()
if err != nil {
t.Fatal(err)
}

viceroyBinName := "foo"
installDirName := "install"

rootdir := testutil.NewEnv(testutil.EnvOpts{
T: t,
Dirs: []string{
installDirName,
},
Write: []testutil.FileIO{
{Src: "...", Dst: viceroyBinName},

// NOTE: Created so the in-memory config can be written back to disk
// without failing because no such file existed.
{Src: "", Dst: config.FileName},
},
})
installDir := filepath.Join(rootdir, installDirName)
binPath := filepath.Join(rootdir, viceroyBinName)
configPath := filepath.Join(rootdir, config.FileName)
defer os.RemoveAll(rootdir)

if err := os.Chdir(rootdir); err != nil {
t.Fatal(err)
}
defer func() {
_ = os.Chdir(wd)
}()

github.InstallDir = installDir

var out bytes.Buffer

av := mock.AssetVersioner{
AssetVersion: "1.2.3",
BinaryFilename: viceroyBinName,
DownloadOK: true,
DownloadedFile: binPath,
}

var file config.File

// NOTE: We purposefully provide a nonsensical path, which we expect to fail,
// but the function call should fallback to using the stubbed static config.
err = file.Read("example", strings.NewReader("yes"), &out, fsterr.MockLog{}, false)
if err != nil {
t.Fatal(err)
}

cmd := &compute.InstallCommand{
Base: argparser.Base{
Globals: &global.Data{
Config: file,
ConfigPath: configPath,
ErrLog: fsterr.MockLog{},
Versioners: global.Versioners{
Viceroy: av,
},
},
},
}
if err := cmd.Exec(nil, &out); err != nil {
t.Fatal(err)
}

if !strings.Contains(out.String(), "Fetching Viceroy release: ") {
t.Fatalf("expected Viceroy to be downloaded successfully")
}

movedPath := filepath.Join(installDir, viceroyBinName)

if _, err := os.Stat(movedPath); err != nil {
t.Fatalf("binary was not moved to the install directory: %s", err)
}
}
Loading
Loading