From 780ecf669fa40312818f041a79ba137100f6e7c5 Mon Sep 17 00:00:00 2001 From: Tyagiquamar Date: Sun, 13 Sep 2026 23:08:42 +0530 Subject: [PATCH 1/3] fix(service): allow fastly service version validate to use FASTLY_SERVICE_ID env fallback (#1866) Signed-off-by: Tyagiquamar --- pkg/commands/service/version/serviceversion_test.go | 10 ++++++++++ pkg/commands/service/version/validate.go | 9 ++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/pkg/commands/service/version/serviceversion_test.go b/pkg/commands/service/version/serviceversion_test.go index f25f0e16b..60b71b30c 100644 --- a/pkg/commands/service/version/serviceversion_test.go +++ b/pkg/commands/service/version/serviceversion_test.go @@ -573,6 +573,16 @@ func TestVersionValidate(t *testing.T) { Args: "--service-id 123", WantError: "error parsing arguments: required flag --version not provided", }, + { + Name: "validate successful - FASTLY_SERVICE_ID env var fallback", + Args: "--version 1", + EnvVars: map[string]string{"FASTLY_SERVICE_ID": "123"}, + API: &mock.API{ + GetVersionFn: testutil.GetVersion, + ValidateVersionFn: validateVersionValid("All checks passed"), + }, + WantOutput: "Service 123 version 1 is valid: All checks passed", + }, { Name: "validate successful - valid version without message", Args: "--service-id 123 --version 1", diff --git a/pkg/commands/service/version/validate.go b/pkg/commands/service/version/validate.go index bcbfed55b..c413358d0 100644 --- a/pkg/commands/service/version/validate.go +++ b/pkg/commands/service/version/validate.go @@ -18,6 +18,7 @@ type ValidateCommand struct { argparser.JSONOutput input fastly.ValidateVersionInput + serviceName argparser.OptionalServiceNameID serviceVersion argparser.OptionalServiceVersion } @@ -35,7 +36,12 @@ func NewValidateCommand(parent argparser.Registerer, g *global.Data) *ValidateCo Description: argparser.FlagServiceIDDesc, Dst: &g.Manifest.Flag.ServiceID, Short: 's', - Required: true, + }) + c.RegisterFlag(argparser.StringFlagOpts{ + Action: c.serviceName.Set, + Name: argparser.FlagServiceName, + Description: argparser.FlagServiceNameDesc, + Dst: &c.serviceName.Value, }) c.RegisterFlag(argparser.StringFlagOpts{ Name: argparser.FlagVersionName, @@ -56,6 +62,7 @@ func (c *ValidateCommand) Exec(_ io.Reader, out io.Writer) error { APIClient: c.Globals.APIClient, Manifest: *c.Globals.Manifest, Out: out, + ServiceNameFlag: c.serviceName, ServiceVersionFlag: c.serviceVersion, VerboseMode: c.Globals.Flags.Verbose, }) From 2fd70d8ee63529a152f14894536e5daccf3522b7 Mon Sep 17 00:00:00 2001 From: Tyagiquamar Date: Sun, 13 Sep 2026 23:12:51 +0530 Subject: [PATCH 2/3] fix(service): allow fastly service version validate to use FASTLY_SERVICE_ID env fallback (#1866) Signed-off-by: Tyagiquamar --- pkg/commands/service/version/serviceversion_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/commands/service/version/serviceversion_test.go b/pkg/commands/service/version/serviceversion_test.go index 60b71b30c..83c8caf87 100644 --- a/pkg/commands/service/version/serviceversion_test.go +++ b/pkg/commands/service/version/serviceversion_test.go @@ -566,7 +566,7 @@ func TestVersionValidate(t *testing.T) { { Name: "validate missing --service-id flag", Args: "--version 1", - WantError: "error parsing arguments: required flag --service-id not provided", + WantError: "error reading service: no service ID found", }, { Name: "validate missing --version flag", From d98c601c20a5190eccece94f7d8db9503cd17ea9 Mon Sep 17 00:00:00 2001 From: Tyagiquamar Date: Mon, 14 Sep 2026 14:35:40 +0530 Subject: [PATCH 3/3] fix(service): address version validate review feedback Signed-off-by: Tyagiquamar --- CHANGELOG.md | 2 ++ pkg/commands/service/version/serviceversion_test.go | 1 + 2 files changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be9b0ad6e..6c962d32e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ ### Bug Fixes: +- fix(service): allow `service version validate` to use `FASTLY_SERVICE_ID`. + ### Enhancements: - feat(service/logging): add Log Explorer and Insights commands ([#1887](https://github.com/fastly/cli/pull/1887)) diff --git a/pkg/commands/service/version/serviceversion_test.go b/pkg/commands/service/version/serviceversion_test.go index 83c8caf87..ec3ea68a9 100644 --- a/pkg/commands/service/version/serviceversion_test.go +++ b/pkg/commands/service/version/serviceversion_test.go @@ -566,6 +566,7 @@ func TestVersionValidate(t *testing.T) { { Name: "validate missing --service-id flag", Args: "--version 1", + EnvVars: map[string]string{"FASTLY_SERVICE_ID": ""}, WantError: "error reading service: no service ID found", }, {