Skip to content

Commit a932f26

Browse files
Merge branch 'main' into dependabot/github_actions/gha-dependencies-b31dd3d21a
2 parents f073c31 + c7b8baf commit a932f26

6 files changed

Lines changed: 14 additions & 11 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
- build(dockerfile-rust): add wasm tools to the rust docker container ([#1552](https://github.com/fastly/cli/pull/1552))
99

1010
### Bug fixes:
11+
- fix(compute): clarify fastly.toml error message when file not found ([#1556](https://github.com/fastly/cli/pull/1556))
1112

1213
### Dependencies:
1314
- build(deps): `github.com/hashicorp/cap` from 0.10.0 to 0.11.0 ([#1546](https://github.com/fastly/cli/pull/1546))
@@ -22,6 +23,8 @@
2223
- build(deps): `golang.org/x/text` from 0.29.0 to 0.30.0 ([#1548](https://github.com/fastly/cli/pull/1548))
2324
- build(deps): `actions/setup-node` from 5 to 6 ([#1559](https://github.com/fastly/cli/pull/1559))
2425
- build(deps): `actions/download-artifact` from 4 to 5 ([#1559](https://github.com/fastly/cli/pull/1559))
26+
- build(deps): `github.com/klauspost/compress` from 1.18.0 to 1.18.1 ([#1558](https://github.com/fastly/cli/pull/1558))
27+
- build(deps): `golang.org/x/net` from 0.45.0 to 0.46.0 ([#1558](https://github.com/fastly/cli/pull/1558))
2528

2629

2730
## [v12.1.0](https://github.com/fastly/cli/releases/tag/v12.1.0) (2025-09-30)

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ require (
6161
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
6262
github.com/hashicorp/go-hclog v1.6.3 // indirect
6363
github.com/hashicorp/go-uuid v1.0.3 // indirect
64-
github.com/klauspost/compress v1.18.0 // indirect
64+
github.com/klauspost/compress v1.18.1 // indirect
6565
github.com/klauspost/pgzip v1.2.6 // indirect
6666
github.com/mattn/go-colorable v0.1.14 // indirect
6767
github.com/mattn/go-runewidth v0.0.19 // indirect
@@ -71,7 +71,7 @@ require (
7171
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7272
github.com/ulikunitz/xz v0.5.15 // indirect
7373
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
74-
golang.org/x/net v0.45.0 // indirect
74+
golang.org/x/net v0.46.0 // indirect
7575
golang.org/x/oauth2 v0.32.0 // indirect
7676
golang.org/x/sync v0.17.0 // indirect
7777
golang.org/x/text v0.30.0

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8Nz
6464
github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak=
6565
github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
6666
github.com/klauspost/compress v1.11.4/go.mod h1:aoV0uJVorq1K+umq18yTdKaF57EivdYsUV+/s2qKfXs=
67-
github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
68-
github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
67+
github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
68+
github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
6969
github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
7070
github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
7171
github.com/klauspost/pgzip v1.2.6 h1:8RXeL5crjEUFnR2/Sn6GJNWtSQ3Dk8pq4CL3jvdDyjU=
@@ -168,8 +168,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
168168
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
169169
golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
170170
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
171-
golang.org/x/net v0.45.0 h1:RLBg5JKixCy82FtLJpeNlVM0nrSqpCRYzVU1n8kj0tM=
172-
golang.org/x/net v0.45.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY=
171+
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
172+
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
173173
golang.org/x/oauth2 v0.32.0 h1:jsCblLleRMDrxMN29H3z/k1KliIvpLgCkE6R8FXXNgY=
174174
golang.org/x/oauth2 v0.32.0/go.mod h1:lzm5WQJQwKZ3nwavOZ3IS5Aulzxi68dUSgRHujetwEA=
175175
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

pkg/commands/compute/build_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestBuildRust(t *testing.T) {
4040
{
4141
name: "no fastly.toml manifest",
4242
args: args("compute build"),
43-
wantError: "error reading fastly.toml",
43+
wantError: "error reading fastly.toml: file not found",
4444
wantRemediationError: "Run `fastly compute init` to ensure a correctly configured manifest.",
4545
},
4646
{
@@ -300,7 +300,7 @@ func TestBuildGo(t *testing.T) {
300300
{
301301
name: "no fastly.toml manifest",
302302
args: args("compute build"),
303-
wantError: "error reading fastly.toml",
303+
wantError: "error reading fastly.toml: file not found",
304304
wantRemediationError: "Run `fastly compute init` to ensure a correctly configured manifest.",
305305
},
306306
{
@@ -494,7 +494,7 @@ func TestBuildJavaScript(t *testing.T) {
494494
{
495495
name: "no fastly.toml manifest",
496496
args: args("compute build"),
497-
wantError: "error reading fastly.toml",
497+
wantError: "error reading fastly.toml: file not found",
498498
wantRemediationError: "Run `fastly compute init` to ensure a correctly configured manifest.",
499499
},
500500
{

pkg/commands/compute/deploy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ func TestDeploy(t *testing.T) {
112112
{
113113
name: "no fastly.toml manifest",
114114
args: args("compute deploy --token 123"),
115-
wantError: "error reading fastly.toml",
115+
wantError: "error reading fastly.toml: file not found",
116116
wantRemediationError: errors.ComputeInitRemediation,
117117
noManifest: true,
118118
},

pkg/errors/errors.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ var ErrNoID = RemediationError{
7575

7676
// ErrReadingManifest means there was a problem reading the fastly.toml.
7777
var ErrReadingManifest = RemediationError{
78-
Inner: fmt.Errorf("error reading fastly.toml"),
78+
Inner: fmt.Errorf("error reading fastly.toml: file not found"),
7979
Remediation: "Ensure the Fastly CLI is being run within a directory containing a fastly.toml file. " + ComputeInitRemediation,
8080
}
8181

0 commit comments

Comments
 (0)