Skip to content

[CDTOOL-1332] Honor --profile when resolving the API token#1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jedisct1 merged 3 commits into from
May 13, 2026
Merged

[CDTOOL-1332] Honor --profile when resolving the API token #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
803c7b1
[CDTOOL-1332] Honor --profile when resolving the API token
jedisct1 May 12, 2026
d6fc732
Merge branch 'main' into fdenis/profilo
jedisct1 May 13, 2026
82e7aa1
Merge branch 'main' into fdenis/profilo
anthony-gomez-fastly May 13, 2026
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
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

### Bug Fixes:

- fix(auth): honor deprecated `--profile`/`-o` when resolving the API token; an unknown profile name is now a hard error instead of a silent fallback to the default token
- fix(text): send deprecation warnings to stderr instead of stdout ([#1782](https://github.com/fastly/cli/pull/1782))

### Enhancements:
Expand Down
6 changes: 5 additions & 1 deletion pkg/app/run.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ func Exec(data *global.Data) error {
data.AuthServer = authServer
}

if !data.Flags.Quiet && data.Flags.Token == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
if !data.Flags.Quiet && data.Flags.Token == "" && data.Flags.Profile == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
if data.Config.GetAuthToken(data.Manifest.File.Profile) == nil {
if defaultName, _ := data.Config.GetDefaultAuthToken(); defaultName != "" {
text.Warning(data.ErrOutput, "fastly.toml profile %q not found in auth config, using default token %q.\n", data.Manifest.File.Profile, defaultName)
Expand DownExpand Up@@ -397,6 +397,10 @@ func configureKingpin(data *global.Data) *kingpin.Application {
// Tokens from --token (raw, unavailable when FASTLY_DISABLE_AUTH_COMMAND is
// set) or FASTLY_API_TOKEN are assumed to be valid.
func processToken(data *global.Data) (token string, tokenSource lookup.Source, err error) {
if err := data.ValidateProfileFlag(); err != nil {
return "", lookup.SourceUndefined, err
}

token, tokenSource = data.Token()

switch tokenSource {
Expand Down
42 changes: 42 additions & 0 deletions pkg/commands/auth/metadata_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -347,6 +347,48 @@ func TestAuthShow(t *testing.T) {
"(default)",
},
},
{
Name: "show with unknown --profile rejected",
Args: "show --profile bogus",
ConfigFile: &config.File{
Auth: config.Auth{
Default: "user",
Tokens: config.AuthTokens{
"user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
},
},
},
WantError: `profile "bogus"`,
WantRemediation: "fastly auth",
},
{
Name: "show with known --profile uses that profile",
Args: "show --profile alt",
ConfigFile: &config.File{
Auth: config.Auth{
Default: "user",
Tokens: config.AuthTokens{
"user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
"alt": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token", Email: "a@example.com"},
},
},
},
WantOutputs: []string{"Name: alt", "a@example.com"},
},
{
Name: "show with --token raw --profile bogus skips profile validation",
Args: "show --token raw --profile bogus",
ConfigFile: &config.File{
Auth: config.Auth{
Default: "user",
Tokens: config.AuthTokens{
"user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
},
},
},
WantError: "current token is not stored",
DontWantOutput: "not found in auth config",
},
}

testutil.RunCLIScenarios(t, []string{"auth"}, scenarios)
Expand Down
4 changes: 4 additions & 0 deletions pkg/commands/auth/revoke.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ func (c *RevokeCommand) Exec(in io.Reader, out io.Writer) error {
return err
}

if err := c.Globals.ValidateProfileFlag(); err != nil {
return err
}

switch {
case c.current:
return c.revokeCurrent(in, out)
Expand Down
46 changes: 46 additions & 0 deletions pkg/commands/auth/revoke_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,52 @@ func TestAuthRevoke(t *testing.T) {
WantRemediation: "one token ID per line",
},

{
Name: "revoke --current with unknown --profile rejected",
Args: "revoke --current --profile bogus",
WantError: `profile "bogus"`,
WantRemediation: "fastly auth",
},
{
Name: "revoke --name with unknown --profile rejected",
Args: "revoke --name secondary --profile bogus",
WantError: `profile "bogus"`,
WantRemediation: "fastly auth",
},
{
Name: "revoke --token-value with unknown --profile rejected",
Args: "revoke --token-value tok-secondary --profile bogus",
WantError: `profile "bogus"`,
WantRemediation: "fastly auth",
},
{
Name: "revoke --id with unknown --profile rejected",
Args: "revoke --id some-id --profile bogus",
WantError: `profile "bogus"`,
WantRemediation: "fastly auth",
},
{
Name: "revoke --file with unknown --profile rejected",
Args: fmt.Sprintf("revoke --file %s --profile bogus", writeTokenIDFile(t, "id-1\n")),
WantError: `profile "bogus"`,
WantRemediation: "fastly auth",
},
{
Name: "revoke --current with --token flag wins over unknown --profile",
Args: "revoke --current --token tok-stored --profile bogus",
API: &mock.API{DeleteTokenSelfFn: deleteTokenSelfOK},
ConfigFile: &config.File{
Auth: config.Auth{
Default: "mytoken",
Tokens: config.AuthTokens{
"mytoken": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "tok-stored"},
},
},
},
Stdin: []string{"y"},
WantOutputs: []string{"Revoked current token"},
},

// API client factory failure
{
Name: "API client factory failure on --name",
Expand Down
4 changes: 4 additions & 0 deletions pkg/commands/auth/show.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,10 @@ func NewShowCommand(parent argparser.Registerer, g *global.Data) *ShowCommand {
}

func (c *ShowCommand) Exec(_ io.Reader, out io.Writer) error {
if err := c.Globals.ValidateProfileFlag(); err != nil {
return err
}

if c.name == "" {
_, src := c.Globals.Token()
switch src {
Expand Down
4 changes: 4 additions & 0 deletions pkg/commands/auth/token.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@ func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) error {
}
}

if err := c.Globals.ValidateProfileFlag(); err != nil {
return err
}

token, src := c.Globals.Token()
if src == lookup.SourceUndefined || token == "" {
return fsterr.RemediationError{
Expand Down
55 changes: 55 additions & 0 deletions pkg/commands/auth/token_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ package auth_test
import (
"bytes"
"errors"
"strings"
"testing"

"github.com/fastly/kingpin"
Expand DownExpand Up@@ -69,3 +70,57 @@ func TestToken_NonTTY_NoToken(t *testing.T) {
t.Errorf("unexpected inner error: %v", re.Inner)
}
}

func TestToken_NonTTY_ProfileFlagUnknown(t *testing.T) {
var buf bytes.Buffer
g := globalDataWithToken("test-api-token-value")
g.Flags.Profile = "bogus"

cmd := newTokenCommand(g)
err := cmd.Exec(nil, &buf)
if err == nil {
t.Fatal("expected error for unknown --profile")
}
var re fsterr.RemediationError
if !errors.As(err, &re) {
t.Fatalf("expected RemediationError, got %T: %v", err, err)
}
if re.Inner == nil || !strings.Contains(re.Inner.Error(), `"bogus"`) {
t.Errorf("unexpected inner error: %v", re.Inner)
}
if buf.Len() != 0 {
t.Errorf("expected no token to be written, got: %q", buf.String())
}
}

func TestToken_NonTTY_ProfileFlagKnown(t *testing.T) {
var buf bytes.Buffer
g := globalDataWithToken("default-token")
g.Config.Auth.Tokens["alt"] = &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token"}
g.Flags.Profile = "alt"

cmd := newTokenCommand(g)
err := cmd.Exec(nil, &buf)
if err != nil {
t.Fatalf("expected no error, got: %v", err)
}
if got := buf.String(); got != "alt-token" {
t.Errorf("expected token %q, got %q", "alt-token", got)
}
}

func TestToken_NonTTY_TokenFlagBeatsProfileFlag(t *testing.T) {
var buf bytes.Buffer
g := globalDataWithToken("default-token")
g.Flags.Token = "raw-xyz"
g.Flags.Profile = "bogus"

cmd := newTokenCommand(g)
err := cmd.Exec(nil, &buf)
if err != nil {
t.Fatalf("expected no error, got: %v", err)
}
if got := buf.String(); got != "raw-xyz" {
t.Errorf("expected token %q, got %q", "raw-xyz", got)
}
}
8 changes: 8 additions & 0 deletions pkg/errors/remediation_error.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -184,6 +184,14 @@ var ComputeBuildRemediation = strings.Join([]string{
"See more at https://www.fastly.com/documentation/reference/compute/fastly-toml",
}, " ")

// ErrProfileFlagNotFound is returned when --profile names an unknown auth token.
func ErrProfileFlagNotFound(name string) RemediationError {
return RemediationError{
Inner: fmt.Errorf("profile %q (from --profile) not found in auth config", name),
Remediation: ProfileRemediation(),
}
}

// ProfileRemediation suggests running auth commands.
func ProfileRemediation() string {
if env.AuthCommandDisabled() {
Expand Down
44 changes: 39 additions & 5 deletions pkg/global/global.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -97,19 +97,25 @@ type Data struct {
// Order of precedence:
// - The --token flag (if it matches a stored auth token name, use that token).
// - The --token flag (treated as a raw API token).
// - The --profile/-o flag (must match a stored auth token name).
// - The FASTLY_API_TOKEN environment variable.
// - The `profile` manifest field mapped to an auth token name.
// - The default [auth] token (if configured).
func (d *Data) Token() (string, lookup.Source) {
// --token: check if it matches a stored auth token name first.
if d.Flags.Token != "" {
if at := d.Config.GetAuthToken(d.Flags.Token); at != nil && at.Token != "" {
return at.Token, lookup.SourceAuth
}
return d.Flags.Token, lookup.SourceFlag
}

// FASTLY_API_TOKEN
if d.Flags.Profile != "" {
if at, ok := d.profileFlagToken(); ok {
return at.Token, lookup.SourceAuth
}
return "", lookup.SourceUndefined
}

if d.Env.APIToken != "" {
return d.Env.APIToken, lookup.SourceEnvironment
}
Expand All@@ -120,31 +126,59 @@ func (d *Data) Token() (string, lookup.Source) {
}
}

// [auth] section default token.
if _, at := d.Config.GetDefaultAuthToken(); at != nil && at.Token != "" {
return at.Token, lookup.SourceAuth
}

return "", lookup.SourceUndefined
}

func (d *Data) profileFlagToken() (*config.AuthToken, bool) {
if d.Flags.Profile == "" {
return nil, false
}
at := d.Config.GetAuthToken(d.Flags.Profile)
if at == nil || at.Token == "" {
return nil, false
}
return at, true
}

// ValidateProfileFlag returns an error if --profile/-o is set to a name that
// does not resolve to a stored auth token. --token outranks --profile and
// short-circuits the check.
func (d *Data) ValidateProfileFlag() error {
if d.Flags.Token != "" || d.Flags.Profile == "" {
return nil
}
if _, ok := d.profileFlagToken(); ok {
return nil
}
return fsterr.ErrProfileFlagNotFound(d.Flags.Profile)
}

// AuthTokenName returns the name of the auth token being used, if any.
// This is used for display purposes and for SSO refresh of named tokens.
func (d *Data) AuthTokenName() string {
// If --token matches a stored auth token name, return that name.
if d.Flags.Token != "" {
if at := d.Config.GetAuthToken(d.Flags.Token); at != nil {
return d.Flags.Token
}
return ""
}

if d.Flags.Profile != "" {
if _, ok := d.profileFlagToken(); ok {
return d.Flags.Profile
}
return ""
}

if d.Manifest != nil && d.Manifest.File.Profile != "" {
if at := d.Config.GetAuthToken(d.Manifest.File.Profile); at != nil {
return d.Manifest.File.Profile
}
}
// Otherwise return the default auth token name.
name, _ := d.Config.GetDefaultAuthToken()
return name
}
Expand Down
Loading
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[CDTOOL-1332] Honor --profile when resolving the API token by jedisct1 · Pull Request #1792 · fastly/cli · GitHub
Skip to content
[CDTOOL-1332] Honor --profile when resolving the API token#1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jedisct1
merged 3 commits into

from

May 13, 2026
 Merged


[CDTOOL-1332] Honor --profile when resolving the API token
#1792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
803c7b1

[CDTOOL-1332] Honor --profile when resolving the API token


jedisct1 May 12, 2026
d6fc732

Merge branch 'main' into fdenis/profilo


jedisct1 May 13, 2026
82e7aa1

Merge branch 'main' into fdenis/profilo


anthony-gomez-fastly May 13, 2026

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

### Bug Fixes:

- fix(auth): honor deprecated `--profile`/`-o` when resolving the API token; an unknown profile name is now a hard error instead of a silent fallback to the default token
- fix(text): send deprecation warnings to stderr instead of stdout ([#1782](https://github.com/fastly/cli/pull/1782))

### Enhancements:
Expand Down

6 changes: 5 additions & 1 deletion
pkg/app/run.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ func Exec(data *global.Data) error {
 data.AuthServer = authServer
 }

 if !data.Flags.Quiet && data.Flags.Token == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if !data.Flags.Quiet && data.Flags.Token == "" && data.Flags.Profile == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if data.Config.GetAuthToken(data.Manifest.File.Profile) == nil {
 if defaultName, _ := data.Config.GetDefaultAuthToken(); defaultName != "" {
 text.Warning(data.ErrOutput, "fastly.toml profile %q not found in auth config, using default token %q.\n", data.Manifest.File.Profile, defaultName)
Expand DownExpand Up@@ -397,6 +397,10 @@ func configureKingpin(data *global.Data) *kingpin.Application {
// Tokens from --token (raw, unavailable when FASTLY_DISABLE_AUTH_COMMAND is
// set) or FASTLY_API_TOKEN are assumed to be valid.
func processToken(data *global.Data) (token string, tokenSource lookup.Source, err error) {
	if err := data.ValidateProfileFlag(); err != nil {
 return "", lookup.SourceUndefined, err
	}

	token, tokenSource = data.Token()

	switch tokenSource {
Expand Down

42 changes: 42 additions & 0 deletions
pkg/commands/auth/metadata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -347,6 +347,48 @@ func TestAuthShow(t *testing.T) {
 "(default)",
 },
 },
 {
 Name: "show with unknown --profile rejected",
 Args: "show --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "show with known --profile uses that profile",
 Args: "show --profile alt",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 "alt": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token", Email: "a@example.com"},
 },
 },
 },
 WantOutputs: []string{"Name: alt", "a@example.com"},
 },
 {
 Name: "show with --token raw --profile bogus skips profile validation",
 Args: "show --token raw --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: "current token is not stored",
 DontWantOutput: "not found in auth config",
 },
	}

	testutil.RunCLIScenarios(t, []string{"auth"}, scenarios)
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/revoke.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ func (c *RevokeCommand) Exec(in io.Reader, out io.Writer) error {
 return err
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	switch {
	case c.current:
 return c.revokeCurrent(in, out)
Expand Down

46 changes: 46 additions & 0 deletions
pkg/commands/auth/revoke_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,52 @@ func TestAuthRevoke(t *testing.T) {
 WantRemediation: "one token ID per line",
 },

 {
 Name: "revoke --current with unknown --profile rejected",
 Args: "revoke --current --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --name with unknown --profile rejected",
 Args: "revoke --name secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --token-value with unknown --profile rejected",
 Args: "revoke --token-value tok-secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --id with unknown --profile rejected",
 Args: "revoke --id some-id --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --file with unknown --profile rejected",
 Args: fmt.Sprintf("revoke --file %s --profile bogus", writeTokenIDFile(t, "id-1\n")),
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --current with --token flag wins over unknown --profile",
 Args: "revoke --current --token tok-stored --profile bogus",
 API: &mock.API{DeleteTokenSelfFn: deleteTokenSelfOK},
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "mytoken",
 Tokens: config.AuthTokens{
 "mytoken": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "tok-stored"},
 },
 },
 },
 Stdin: []string{"y"},
 WantOutputs: []string{"Revoked current token"},
 },

 // API client factory failure
 {
 Name: "API client factory failure on --name",
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/show.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,10 @@ func NewShowCommand(parent argparser.Registerer, g *global.Data) *ShowCommand {
}

func (c *ShowCommand) Exec(_ io.Reader, out io.Writer) error {
	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	if c.name == "" {
 _, src := c.Globals.Token()
 switch src {
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/token.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@ func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) error {
 }
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	token, src := c.Globals.Token()
	if src == lookup.SourceUndefined || token == "" {
 return fsterr.RemediationError{
Expand Down

55 changes: 55 additions & 0 deletions
pkg/commands/auth/token_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ package auth_test
import (
	"bytes"
	"errors"
	"strings"
	"testing"

	"github.com/fastly/kingpin"
Expand DownExpand Up@@ -69,3 +70,57 @@ func TestToken_NonTTY_NoToken(t *testing.T) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
}

func TestToken_NonTTY_ProfileFlagUnknown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("test-api-token-value")
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err == nil {
 t.Fatal("expected error for unknown --profile")
	}
	var re fsterr.RemediationError
	if !errors.As(err, &re) {
 t.Fatalf("expected RemediationError, got %T: %v", err, err)
	}
	if re.Inner == nil || !strings.Contains(re.Inner.Error(), `"bogus"`) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
	if buf.Len() != 0 {
 t.Errorf("expected no token to be written, got: %q", buf.String())
	}
}

func TestToken_NonTTY_ProfileFlagKnown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Config.Auth.Tokens["alt"] = &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token"}
	g.Flags.Profile = "alt"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "alt-token" {
 t.Errorf("expected token %q, got %q", "alt-token", got)
	}
}

func TestToken_NonTTY_TokenFlagBeatsProfileFlag(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Flags.Token = "raw-xyz"
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "raw-xyz" {
 t.Errorf("expected token %q, got %q", "raw-xyz", got)
	}
}

8 changes: 8 additions & 0 deletions
pkg/errors/remediation_error.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,6 +184,14 @@ var ComputeBuildRemediation = strings.Join([]string{
	"See more at https://www.fastly.com/documentation/reference/compute/fastly-toml",
}, " ")

// ErrProfileFlagNotFound is returned when --profile names an unknown auth token.
func ErrProfileFlagNotFound(name string) RemediationError {
	return RemediationError{
 Inner: fmt.Errorf("profile %q (from --profile) not found in auth config", name),
 Remediation: ProfileRemediation(),
	}
}

// ProfileRemediation suggests running auth commands.
func ProfileRemediation() string {
	if env.AuthCommandDisabled() {
Expand Down

44 changes: 39 additions & 5 deletions
pkg/global/global.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,19 +97,25 @@ type Data struct {
// Order of precedence:
// - The --token flag (if it matches a stored auth token name, use that token).
// - The --token flag (treated as a raw API token).
// - The --profile/-o flag (must match a stored auth token name).
// - The FASTLY_API_TOKEN environment variable.
// - The `profile` manifest field mapped to an auth token name.
// - The default [auth] token (if configured).
func (d *Data) Token() (string, lookup.Source) {
	// --token: check if it matches a stored auth token name first.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
 }
 return d.Flags.Token, lookup.SourceFlag
	}

	// FASTLY_API_TOKEN
	if d.Flags.Profile != "" {
 if at, ok := d.profileFlagToken(); ok {
 return at.Token, lookup.SourceAuth
 }
 return "", lookup.SourceUndefined
	}

	if d.Env.APIToken != "" {
 return d.Env.APIToken, lookup.SourceEnvironment
	}
Expand All@@ -120,31 +126,59 @@ func (d *Data) Token() (string, lookup.Source) {
 }
	}

	// [auth] section default token.
	if _, at := d.Config.GetDefaultAuthToken(); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
	}

	return "", lookup.SourceUndefined
}

func (d *Data) profileFlagToken() (*config.AuthToken, bool) {
	if d.Flags.Profile == "" {
 return nil, false
	}
	at := d.Config.GetAuthToken(d.Flags.Profile)
	if at == nil || at.Token == "" {
 return nil, false
	}
	return at, true
}

// ValidateProfileFlag returns an error if --profile/-o is set to a name that
// does not resolve to a stored auth token. --token outranks --profile and
// short-circuits the check.
func (d *Data) ValidateProfileFlag() error {
	if d.Flags.Token != "" || d.Flags.Profile == "" {
 return nil
	}
	if _, ok := d.profileFlagToken(); ok {
 return nil
	}
	return fsterr.ErrProfileFlagNotFound(d.Flags.Profile)
}

// AuthTokenName returns the name of the auth token being used, if any.
// This is used for display purposes and for SSO refresh of named tokens.
func (d *Data) AuthTokenName() string {
	// If --token matches a stored auth token name, return that name.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil {
 return d.Flags.Token
 }
 return ""
	}

	if d.Flags.Profile != "" {
 if _, ok := d.profileFlagToken(); ok {
 return d.Flags.Profile
 }
 return ""
	}

	if d.Manifest != nil && d.Manifest.File.Profile != "" {
 if at := d.Config.GetAuthToken(d.Manifest.File.Profile); at != nil {
 return d.Manifest.File.Profile
 }
	}
	// Otherwise return the default auth token name.
	name, _ := d.Config.GetDefaultAuthToken()
	return name
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[CDTOOL-1332] Honor --profile when resolving the API token by jedisct1 · Pull Request #1792 · fastly/cli · GitHub
Skip to content
[CDTOOL-1332] Honor --profile when resolving the API token#1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jedisct1
merged 3 commits into

from

May 13, 2026
 Merged


[CDTOOL-1332] Honor --profile when resolving the API token
#1792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
803c7b1

[CDTOOL-1332] Honor --profile when resolving the API token


jedisct1 May 12, 2026
d6fc732

Merge branch 'main' into fdenis/profilo


jedisct1 May 13, 2026
82e7aa1

Merge branch 'main' into fdenis/profilo


anthony-gomez-fastly May 13, 2026

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

### Bug Fixes:

- fix(auth): honor deprecated `--profile`/`-o` when resolving the API token; an unknown profile name is now a hard error instead of a silent fallback to the default token
- fix(text): send deprecation warnings to stderr instead of stdout ([#1782](https://github.com/fastly/cli/pull/1782))

### Enhancements:
Expand Down

6 changes: 5 additions & 1 deletion
pkg/app/run.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ func Exec(data *global.Data) error {
 data.AuthServer = authServer
 }

 if !data.Flags.Quiet && data.Flags.Token == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if !data.Flags.Quiet && data.Flags.Token == "" && data.Flags.Profile == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if data.Config.GetAuthToken(data.Manifest.File.Profile) == nil {
 if defaultName, _ := data.Config.GetDefaultAuthToken(); defaultName != "" {
 text.Warning(data.ErrOutput, "fastly.toml profile %q not found in auth config, using default token %q.\n", data.Manifest.File.Profile, defaultName)
Expand DownExpand Up@@ -397,6 +397,10 @@ func configureKingpin(data *global.Data) *kingpin.Application {
// Tokens from --token (raw, unavailable when FASTLY_DISABLE_AUTH_COMMAND is
// set) or FASTLY_API_TOKEN are assumed to be valid.
func processToken(data *global.Data) (token string, tokenSource lookup.Source, err error) {
	if err := data.ValidateProfileFlag(); err != nil {
 return "", lookup.SourceUndefined, err
	}

	token, tokenSource = data.Token()

	switch tokenSource {
Expand Down

42 changes: 42 additions & 0 deletions
pkg/commands/auth/metadata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -347,6 +347,48 @@ func TestAuthShow(t *testing.T) {
 "(default)",
 },
 },
 {
 Name: "show with unknown --profile rejected",
 Args: "show --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "show with known --profile uses that profile",
 Args: "show --profile alt",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 "alt": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token", Email: "a@example.com"},
 },
 },
 },
 WantOutputs: []string{"Name: alt", "a@example.com"},
 },
 {
 Name: "show with --token raw --profile bogus skips profile validation",
 Args: "show --token raw --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: "current token is not stored",
 DontWantOutput: "not found in auth config",
 },
	}

	testutil.RunCLIScenarios(t, []string{"auth"}, scenarios)
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/revoke.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ func (c *RevokeCommand) Exec(in io.Reader, out io.Writer) error {
 return err
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	switch {
	case c.current:
 return c.revokeCurrent(in, out)
Expand Down

46 changes: 46 additions & 0 deletions
pkg/commands/auth/revoke_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,52 @@ func TestAuthRevoke(t *testing.T) {
 WantRemediation: "one token ID per line",
 },

 {
 Name: "revoke --current with unknown --profile rejected",
 Args: "revoke --current --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --name with unknown --profile rejected",
 Args: "revoke --name secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --token-value with unknown --profile rejected",
 Args: "revoke --token-value tok-secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --id with unknown --profile rejected",
 Args: "revoke --id some-id --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --file with unknown --profile rejected",
 Args: fmt.Sprintf("revoke --file %s --profile bogus", writeTokenIDFile(t, "id-1\n")),
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --current with --token flag wins over unknown --profile",
 Args: "revoke --current --token tok-stored --profile bogus",
 API: &mock.API{DeleteTokenSelfFn: deleteTokenSelfOK},
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "mytoken",
 Tokens: config.AuthTokens{
 "mytoken": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "tok-stored"},
 },
 },
 },
 Stdin: []string{"y"},
 WantOutputs: []string{"Revoked current token"},
 },

 // API client factory failure
 {
 Name: "API client factory failure on --name",
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/show.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,10 @@ func NewShowCommand(parent argparser.Registerer, g *global.Data) *ShowCommand {
}

func (c *ShowCommand) Exec(_ io.Reader, out io.Writer) error {
	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	if c.name == "" {
 _, src := c.Globals.Token()
 switch src {
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/token.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@ func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) error {
 }
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	token, src := c.Globals.Token()
	if src == lookup.SourceUndefined || token == "" {
 return fsterr.RemediationError{
Expand Down

55 changes: 55 additions & 0 deletions
pkg/commands/auth/token_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ package auth_test
import (
	"bytes"
	"errors"
	"strings"
	"testing"

	"github.com/fastly/kingpin"
Expand DownExpand Up@@ -69,3 +70,57 @@ func TestToken_NonTTY_NoToken(t *testing.T) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
}

func TestToken_NonTTY_ProfileFlagUnknown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("test-api-token-value")
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err == nil {
 t.Fatal("expected error for unknown --profile")
	}
	var re fsterr.RemediationError
	if !errors.As(err, &re) {
 t.Fatalf("expected RemediationError, got %T: %v", err, err)
	}
	if re.Inner == nil || !strings.Contains(re.Inner.Error(), `"bogus"`) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
	if buf.Len() != 0 {
 t.Errorf("expected no token to be written, got: %q", buf.String())
	}
}

func TestToken_NonTTY_ProfileFlagKnown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Config.Auth.Tokens["alt"] = &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token"}
	g.Flags.Profile = "alt"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "alt-token" {
 t.Errorf("expected token %q, got %q", "alt-token", got)
	}
}

func TestToken_NonTTY_TokenFlagBeatsProfileFlag(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Flags.Token = "raw-xyz"
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "raw-xyz" {
 t.Errorf("expected token %q, got %q", "raw-xyz", got)
	}
}

8 changes: 8 additions & 0 deletions
pkg/errors/remediation_error.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,6 +184,14 @@ var ComputeBuildRemediation = strings.Join([]string{
	"See more at https://www.fastly.com/documentation/reference/compute/fastly-toml",
}, " ")

// ErrProfileFlagNotFound is returned when --profile names an unknown auth token.
func ErrProfileFlagNotFound(name string) RemediationError {
	return RemediationError{
 Inner: fmt.Errorf("profile %q (from --profile) not found in auth config", name),
 Remediation: ProfileRemediation(),
	}
}

// ProfileRemediation suggests running auth commands.
func ProfileRemediation() string {
	if env.AuthCommandDisabled() {
Expand Down

44 changes: 39 additions & 5 deletions
pkg/global/global.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,19 +97,25 @@ type Data struct {
// Order of precedence:
// - The --token flag (if it matches a stored auth token name, use that token).
// - The --token flag (treated as a raw API token).
// - The --profile/-o flag (must match a stored auth token name).
// - The FASTLY_API_TOKEN environment variable.
// - The `profile` manifest field mapped to an auth token name.
// - The default [auth] token (if configured).
func (d *Data) Token() (string, lookup.Source) {
	// --token: check if it matches a stored auth token name first.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
 }
 return d.Flags.Token, lookup.SourceFlag
	}

	// FASTLY_API_TOKEN
	if d.Flags.Profile != "" {
 if at, ok := d.profileFlagToken(); ok {
 return at.Token, lookup.SourceAuth
 }
 return "", lookup.SourceUndefined
	}

	if d.Env.APIToken != "" {
 return d.Env.APIToken, lookup.SourceEnvironment
	}
Expand All@@ -120,31 +126,59 @@ func (d *Data) Token() (string, lookup.Source) {
 }
	}

	// [auth] section default token.
	if _, at := d.Config.GetDefaultAuthToken(); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
	}

	return "", lookup.SourceUndefined
}

func (d *Data) profileFlagToken() (*config.AuthToken, bool) {
	if d.Flags.Profile == "" {
 return nil, false
	}
	at := d.Config.GetAuthToken(d.Flags.Profile)
	if at == nil || at.Token == "" {
 return nil, false
	}
	return at, true
}

// ValidateProfileFlag returns an error if --profile/-o is set to a name that
// does not resolve to a stored auth token. --token outranks --profile and
// short-circuits the check.
func (d *Data) ValidateProfileFlag() error {
	if d.Flags.Token != "" || d.Flags.Profile == "" {
 return nil
	}
	if _, ok := d.profileFlagToken(); ok {
 return nil
	}
	return fsterr.ErrProfileFlagNotFound(d.Flags.Profile)
}

// AuthTokenName returns the name of the auth token being used, if any.
// This is used for display purposes and for SSO refresh of named tokens.
func (d *Data) AuthTokenName() string {
	// If --token matches a stored auth token name, return that name.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil {
 return d.Flags.Token
 }
 return ""
	}

	if d.Flags.Profile != "" {
 if _, ok := d.profileFlagToken(); ok {
 return d.Flags.Profile
 }
 return ""
	}

	if d.Manifest != nil && d.Manifest.File.Profile != "" {
 if at := d.Config.GetAuthToken(d.Manifest.File.Profile); at != nil {
 return d.Manifest.File.Profile
 }
	}
	// Otherwise return the default auth token name.
	name, _ := d.Config.GetDefaultAuthToken()
	return name
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[CDTOOL-1332] Honor --profile when resolving the API token by jedisct1 · Pull Request #1792 · fastly/cli · GitHub
Skip to content
[CDTOOL-1332] Honor --profile when resolving the API token#1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jedisct1
merged 3 commits into

from

May 13, 2026
 Merged


[CDTOOL-1332] Honor --profile when resolving the API token
#1792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
803c7b1

[CDTOOL-1332] Honor --profile when resolving the API token


jedisct1 May 12, 2026
d6fc732

Merge branch 'main' into fdenis/profilo


jedisct1 May 13, 2026
82e7aa1

Merge branch 'main' into fdenis/profilo


anthony-gomez-fastly May 13, 2026

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

### Bug Fixes:

- fix(auth): honor deprecated `--profile`/`-o` when resolving the API token; an unknown profile name is now a hard error instead of a silent fallback to the default token
- fix(text): send deprecation warnings to stderr instead of stdout ([#1782](https://github.com/fastly/cli/pull/1782))

### Enhancements:
Expand Down

6 changes: 5 additions & 1 deletion
pkg/app/run.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ func Exec(data *global.Data) error {
 data.AuthServer = authServer
 }

 if !data.Flags.Quiet && data.Flags.Token == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if !data.Flags.Quiet && data.Flags.Token == "" && data.Flags.Profile == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if data.Config.GetAuthToken(data.Manifest.File.Profile) == nil {
 if defaultName, _ := data.Config.GetDefaultAuthToken(); defaultName != "" {
 text.Warning(data.ErrOutput, "fastly.toml profile %q not found in auth config, using default token %q.\n", data.Manifest.File.Profile, defaultName)
Expand DownExpand Up@@ -397,6 +397,10 @@ func configureKingpin(data *global.Data) *kingpin.Application {
// Tokens from --token (raw, unavailable when FASTLY_DISABLE_AUTH_COMMAND is
// set) or FASTLY_API_TOKEN are assumed to be valid.
func processToken(data *global.Data) (token string, tokenSource lookup.Source, err error) {
	if err := data.ValidateProfileFlag(); err != nil {
 return "", lookup.SourceUndefined, err
	}

	token, tokenSource = data.Token()

	switch tokenSource {
Expand Down

42 changes: 42 additions & 0 deletions
pkg/commands/auth/metadata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -347,6 +347,48 @@ func TestAuthShow(t *testing.T) {
 "(default)",
 },
 },
 {
 Name: "show with unknown --profile rejected",
 Args: "show --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "show with known --profile uses that profile",
 Args: "show --profile alt",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 "alt": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token", Email: "a@example.com"},
 },
 },
 },
 WantOutputs: []string{"Name: alt", "a@example.com"},
 },
 {
 Name: "show with --token raw --profile bogus skips profile validation",
 Args: "show --token raw --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: "current token is not stored",
 DontWantOutput: "not found in auth config",
 },
	}

	testutil.RunCLIScenarios(t, []string{"auth"}, scenarios)
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/revoke.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ func (c *RevokeCommand) Exec(in io.Reader, out io.Writer) error {
 return err
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	switch {
	case c.current:
 return c.revokeCurrent(in, out)
Expand Down

46 changes: 46 additions & 0 deletions
pkg/commands/auth/revoke_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,52 @@ func TestAuthRevoke(t *testing.T) {
 WantRemediation: "one token ID per line",
 },

 {
 Name: "revoke --current with unknown --profile rejected",
 Args: "revoke --current --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --name with unknown --profile rejected",
 Args: "revoke --name secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --token-value with unknown --profile rejected",
 Args: "revoke --token-value tok-secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --id with unknown --profile rejected",
 Args: "revoke --id some-id --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --file with unknown --profile rejected",
 Args: fmt.Sprintf("revoke --file %s --profile bogus", writeTokenIDFile(t, "id-1\n")),
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --current with --token flag wins over unknown --profile",
 Args: "revoke --current --token tok-stored --profile bogus",
 API: &mock.API{DeleteTokenSelfFn: deleteTokenSelfOK},
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "mytoken",
 Tokens: config.AuthTokens{
 "mytoken": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "tok-stored"},
 },
 },
 },
 Stdin: []string{"y"},
 WantOutputs: []string{"Revoked current token"},
 },

 // API client factory failure
 {
 Name: "API client factory failure on --name",
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/show.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,10 @@ func NewShowCommand(parent argparser.Registerer, g *global.Data) *ShowCommand {
}

func (c *ShowCommand) Exec(_ io.Reader, out io.Writer) error {
	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	if c.name == "" {
 _, src := c.Globals.Token()
 switch src {
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/token.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@ func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) error {
 }
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	token, src := c.Globals.Token()
	if src == lookup.SourceUndefined || token == "" {
 return fsterr.RemediationError{
Expand Down

55 changes: 55 additions & 0 deletions
pkg/commands/auth/token_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ package auth_test
import (
	"bytes"
	"errors"
	"strings"
	"testing"

	"github.com/fastly/kingpin"
Expand DownExpand Up@@ -69,3 +70,57 @@ func TestToken_NonTTY_NoToken(t *testing.T) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
}

func TestToken_NonTTY_ProfileFlagUnknown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("test-api-token-value")
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err == nil {
 t.Fatal("expected error for unknown --profile")
	}
	var re fsterr.RemediationError
	if !errors.As(err, &re) {
 t.Fatalf("expected RemediationError, got %T: %v", err, err)
	}
	if re.Inner == nil || !strings.Contains(re.Inner.Error(), `"bogus"`) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
	if buf.Len() != 0 {
 t.Errorf("expected no token to be written, got: %q", buf.String())
	}
}

func TestToken_NonTTY_ProfileFlagKnown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Config.Auth.Tokens["alt"] = &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token"}
	g.Flags.Profile = "alt"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "alt-token" {
 t.Errorf("expected token %q, got %q", "alt-token", got)
	}
}

func TestToken_NonTTY_TokenFlagBeatsProfileFlag(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Flags.Token = "raw-xyz"
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "raw-xyz" {
 t.Errorf("expected token %q, got %q", "raw-xyz", got)
	}
}

8 changes: 8 additions & 0 deletions
pkg/errors/remediation_error.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,6 +184,14 @@ var ComputeBuildRemediation = strings.Join([]string{
	"See more at https://www.fastly.com/documentation/reference/compute/fastly-toml",
}, " ")

// ErrProfileFlagNotFound is returned when --profile names an unknown auth token.
func ErrProfileFlagNotFound(name string) RemediationError {
	return RemediationError{
 Inner: fmt.Errorf("profile %q (from --profile) not found in auth config", name),
 Remediation: ProfileRemediation(),
	}
}

// ProfileRemediation suggests running auth commands.
func ProfileRemediation() string {
	if env.AuthCommandDisabled() {
Expand Down

44 changes: 39 additions & 5 deletions
pkg/global/global.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,19 +97,25 @@ type Data struct {
// Order of precedence:
// - The --token flag (if it matches a stored auth token name, use that token).
// - The --token flag (treated as a raw API token).
// - The --profile/-o flag (must match a stored auth token name).
// - The FASTLY_API_TOKEN environment variable.
// - The `profile` manifest field mapped to an auth token name.
// - The default [auth] token (if configured).
func (d *Data) Token() (string, lookup.Source) {
	// --token: check if it matches a stored auth token name first.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
 }
 return d.Flags.Token, lookup.SourceFlag
	}

	// FASTLY_API_TOKEN
	if d.Flags.Profile != "" {
 if at, ok := d.profileFlagToken(); ok {
 return at.Token, lookup.SourceAuth
 }
 return "", lookup.SourceUndefined
	}

	if d.Env.APIToken != "" {
 return d.Env.APIToken, lookup.SourceEnvironment
	}
Expand All@@ -120,31 +126,59 @@ func (d *Data) Token() (string, lookup.Source) {
 }
	}

	// [auth] section default token.
	if _, at := d.Config.GetDefaultAuthToken(); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
	}

	return "", lookup.SourceUndefined
}

func (d *Data) profileFlagToken() (*config.AuthToken, bool) {
	if d.Flags.Profile == "" {
 return nil, false
	}
	at := d.Config.GetAuthToken(d.Flags.Profile)
	if at == nil || at.Token == "" {
 return nil, false
	}
	return at, true
}

// ValidateProfileFlag returns an error if --profile/-o is set to a name that
// does not resolve to a stored auth token. --token outranks --profile and
// short-circuits the check.
func (d *Data) ValidateProfileFlag() error {
	if d.Flags.Token != "" || d.Flags.Profile == "" {
 return nil
	}
	if _, ok := d.profileFlagToken(); ok {
 return nil
	}
	return fsterr.ErrProfileFlagNotFound(d.Flags.Profile)
}

// AuthTokenName returns the name of the auth token being used, if any.
// This is used for display purposes and for SSO refresh of named tokens.
func (d *Data) AuthTokenName() string {
	// If --token matches a stored auth token name, return that name.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil {
 return d.Flags.Token
 }
 return ""
	}

	if d.Flags.Profile != "" {
 if _, ok := d.profileFlagToken(); ok {
 return d.Flags.Profile
 }
 return ""
	}

	if d.Manifest != nil && d.Manifest.File.Profile != "" {
 if at := d.Config.GetAuthToken(d.Manifest.File.Profile); at != nil {
 return d.Manifest.File.Profile
 }
	}
	// Otherwise return the default auth token name.
	name, _ := d.Config.GetDefaultAuthToken()
	return name
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[CDTOOL-1332] Honor --profile when resolving the API token by jedisct1 · Pull Request #1792 · fastly/cli · GitHub
Skip to content
[CDTOOL-1332] Honor --profile when resolving the API token#1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jedisct1
merged 3 commits into

from

May 13, 2026
 Merged


[CDTOOL-1332] Honor --profile when resolving the API token
#1792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
803c7b1

[CDTOOL-1332] Honor --profile when resolving the API token


jedisct1 May 12, 2026
d6fc732

Merge branch 'main' into fdenis/profilo


jedisct1 May 13, 2026
82e7aa1

Merge branch 'main' into fdenis/profilo


anthony-gomez-fastly May 13, 2026

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

### Bug Fixes:

- fix(auth): honor deprecated `--profile`/`-o` when resolving the API token; an unknown profile name is now a hard error instead of a silent fallback to the default token
- fix(text): send deprecation warnings to stderr instead of stdout ([#1782](https://github.com/fastly/cli/pull/1782))

### Enhancements:
Expand Down

6 changes: 5 additions & 1 deletion
pkg/app/run.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ func Exec(data *global.Data) error {
 data.AuthServer = authServer
 }

 if !data.Flags.Quiet && data.Flags.Token == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if !data.Flags.Quiet && data.Flags.Token == "" && data.Flags.Profile == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if data.Config.GetAuthToken(data.Manifest.File.Profile) == nil {
 if defaultName, _ := data.Config.GetDefaultAuthToken(); defaultName != "" {
 text.Warning(data.ErrOutput, "fastly.toml profile %q not found in auth config, using default token %q.\n", data.Manifest.File.Profile, defaultName)
Expand DownExpand Up@@ -397,6 +397,10 @@ func configureKingpin(data *global.Data) *kingpin.Application {
// Tokens from --token (raw, unavailable when FASTLY_DISABLE_AUTH_COMMAND is
// set) or FASTLY_API_TOKEN are assumed to be valid.
func processToken(data *global.Data) (token string, tokenSource lookup.Source, err error) {
	if err := data.ValidateProfileFlag(); err != nil {
 return "", lookup.SourceUndefined, err
	}

	token, tokenSource = data.Token()

	switch tokenSource {
Expand Down

42 changes: 42 additions & 0 deletions
pkg/commands/auth/metadata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -347,6 +347,48 @@ func TestAuthShow(t *testing.T) {
 "(default)",
 },
 },
 {
 Name: "show with unknown --profile rejected",
 Args: "show --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "show with known --profile uses that profile",
 Args: "show --profile alt",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 "alt": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token", Email: "a@example.com"},
 },
 },
 },
 WantOutputs: []string{"Name: alt", "a@example.com"},
 },
 {
 Name: "show with --token raw --profile bogus skips profile validation",
 Args: "show --token raw --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: "current token is not stored",
 DontWantOutput: "not found in auth config",
 },
	}

	testutil.RunCLIScenarios(t, []string{"auth"}, scenarios)
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/revoke.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ func (c *RevokeCommand) Exec(in io.Reader, out io.Writer) error {
 return err
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	switch {
	case c.current:
 return c.revokeCurrent(in, out)
Expand Down

46 changes: 46 additions & 0 deletions
pkg/commands/auth/revoke_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,52 @@ func TestAuthRevoke(t *testing.T) {
 WantRemediation: "one token ID per line",
 },

 {
 Name: "revoke --current with unknown --profile rejected",
 Args: "revoke --current --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --name with unknown --profile rejected",
 Args: "revoke --name secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --token-value with unknown --profile rejected",
 Args: "revoke --token-value tok-secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --id with unknown --profile rejected",
 Args: "revoke --id some-id --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --file with unknown --profile rejected",
 Args: fmt.Sprintf("revoke --file %s --profile bogus", writeTokenIDFile(t, "id-1\n")),
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --current with --token flag wins over unknown --profile",
 Args: "revoke --current --token tok-stored --profile bogus",
 API: &mock.API{DeleteTokenSelfFn: deleteTokenSelfOK},
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "mytoken",
 Tokens: config.AuthTokens{
 "mytoken": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "tok-stored"},
 },
 },
 },
 Stdin: []string{"y"},
 WantOutputs: []string{"Revoked current token"},
 },

 // API client factory failure
 {
 Name: "API client factory failure on --name",
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/show.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,10 @@ func NewShowCommand(parent argparser.Registerer, g *global.Data) *ShowCommand {
}

func (c *ShowCommand) Exec(_ io.Reader, out io.Writer) error {
	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	if c.name == "" {
 _, src := c.Globals.Token()
 switch src {
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/token.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@ func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) error {
 }
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	token, src := c.Globals.Token()
	if src == lookup.SourceUndefined || token == "" {
 return fsterr.RemediationError{
Expand Down

55 changes: 55 additions & 0 deletions
pkg/commands/auth/token_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ package auth_test
import (
	"bytes"
	"errors"
	"strings"
	"testing"

	"github.com/fastly/kingpin"
Expand DownExpand Up@@ -69,3 +70,57 @@ func TestToken_NonTTY_NoToken(t *testing.T) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
}

func TestToken_NonTTY_ProfileFlagUnknown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("test-api-token-value")
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err == nil {
 t.Fatal("expected error for unknown --profile")
	}
	var re fsterr.RemediationError
	if !errors.As(err, &re) {
 t.Fatalf("expected RemediationError, got %T: %v", err, err)
	}
	if re.Inner == nil || !strings.Contains(re.Inner.Error(), `"bogus"`) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
	if buf.Len() != 0 {
 t.Errorf("expected no token to be written, got: %q", buf.String())
	}
}

func TestToken_NonTTY_ProfileFlagKnown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Config.Auth.Tokens["alt"] = &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token"}
	g.Flags.Profile = "alt"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "alt-token" {
 t.Errorf("expected token %q, got %q", "alt-token", got)
	}
}

func TestToken_NonTTY_TokenFlagBeatsProfileFlag(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Flags.Token = "raw-xyz"
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "raw-xyz" {
 t.Errorf("expected token %q, got %q", "raw-xyz", got)
	}
}

8 changes: 8 additions & 0 deletions
pkg/errors/remediation_error.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,6 +184,14 @@ var ComputeBuildRemediation = strings.Join([]string{
	"See more at https://www.fastly.com/documentation/reference/compute/fastly-toml",
}, " ")

// ErrProfileFlagNotFound is returned when --profile names an unknown auth token.
func ErrProfileFlagNotFound(name string) RemediationError {
	return RemediationError{
 Inner: fmt.Errorf("profile %q (from --profile) not found in auth config", name),
 Remediation: ProfileRemediation(),
	}
}

// ProfileRemediation suggests running auth commands.
func ProfileRemediation() string {
	if env.AuthCommandDisabled() {
Expand Down

44 changes: 39 additions & 5 deletions
pkg/global/global.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,19 +97,25 @@ type Data struct {
// Order of precedence:
// - The --token flag (if it matches a stored auth token name, use that token).
// - The --token flag (treated as a raw API token).
// - The --profile/-o flag (must match a stored auth token name).
// - The FASTLY_API_TOKEN environment variable.
// - The `profile` manifest field mapped to an auth token name.
// - The default [auth] token (if configured).
func (d *Data) Token() (string, lookup.Source) {
	// --token: check if it matches a stored auth token name first.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
 }
 return d.Flags.Token, lookup.SourceFlag
	}

	// FASTLY_API_TOKEN
	if d.Flags.Profile != "" {
 if at, ok := d.profileFlagToken(); ok {
 return at.Token, lookup.SourceAuth
 }
 return "", lookup.SourceUndefined
	}

	if d.Env.APIToken != "" {
 return d.Env.APIToken, lookup.SourceEnvironment
	}
Expand All@@ -120,31 +126,59 @@ func (d *Data) Token() (string, lookup.Source) {
 }
	}

	// [auth] section default token.
	if _, at := d.Config.GetDefaultAuthToken(); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
	}

	return "", lookup.SourceUndefined
}

func (d *Data) profileFlagToken() (*config.AuthToken, bool) {
	if d.Flags.Profile == "" {
 return nil, false
	}
	at := d.Config.GetAuthToken(d.Flags.Profile)
	if at == nil || at.Token == "" {
 return nil, false
	}
	return at, true
}

// ValidateProfileFlag returns an error if --profile/-o is set to a name that
// does not resolve to a stored auth token. --token outranks --profile and
// short-circuits the check.
func (d *Data) ValidateProfileFlag() error {
	if d.Flags.Token != "" || d.Flags.Profile == "" {
 return nil
	}
	if _, ok := d.profileFlagToken(); ok {
 return nil
	}
	return fsterr.ErrProfileFlagNotFound(d.Flags.Profile)
}

// AuthTokenName returns the name of the auth token being used, if any.
// This is used for display purposes and for SSO refresh of named tokens.
func (d *Data) AuthTokenName() string {
	// If --token matches a stored auth token name, return that name.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil {
 return d.Flags.Token
 }
 return ""
	}

	if d.Flags.Profile != "" {
 if _, ok := d.profileFlagToken(); ok {
 return d.Flags.Profile
 }
 return ""
	}

	if d.Manifest != nil && d.Manifest.File.Profile != "" {
 if at := d.Config.GetAuthToken(d.Manifest.File.Profile); at != nil {
 return d.Manifest.File.Profile
 }
	}
	// Otherwise return the default auth token name.
	name, _ := d.Config.GetDefaultAuthToken()
	return name
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[CDTOOL-1332] Honor --profile when resolving the API token by jedisct1 · Pull Request #1792 · fastly/cli · GitHub
Skip to content
[CDTOOL-1332] Honor --profile when resolving the API token#1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jedisct1
merged 3 commits into

from

May 13, 2026
 Merged


[CDTOOL-1332] Honor --profile when resolving the API token
#1792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
803c7b1

[CDTOOL-1332] Honor --profile when resolving the API token


jedisct1 May 12, 2026
d6fc732

Merge branch 'main' into fdenis/profilo


jedisct1 May 13, 2026
82e7aa1

Merge branch 'main' into fdenis/profilo


anthony-gomez-fastly May 13, 2026

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

### Bug Fixes:

- fix(auth): honor deprecated `--profile`/`-o` when resolving the API token; an unknown profile name is now a hard error instead of a silent fallback to the default token
- fix(text): send deprecation warnings to stderr instead of stdout ([#1782](https://github.com/fastly/cli/pull/1782))

### Enhancements:
Expand Down

6 changes: 5 additions & 1 deletion
pkg/app/run.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ func Exec(data *global.Data) error {
 data.AuthServer = authServer
 }

 if !data.Flags.Quiet && data.Flags.Token == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if !data.Flags.Quiet && data.Flags.Token == "" && data.Flags.Profile == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if data.Config.GetAuthToken(data.Manifest.File.Profile) == nil {
 if defaultName, _ := data.Config.GetDefaultAuthToken(); defaultName != "" {
 text.Warning(data.ErrOutput, "fastly.toml profile %q not found in auth config, using default token %q.\n", data.Manifest.File.Profile, defaultName)
Expand DownExpand Up@@ -397,6 +397,10 @@ func configureKingpin(data *global.Data) *kingpin.Application {
// Tokens from --token (raw, unavailable when FASTLY_DISABLE_AUTH_COMMAND is
// set) or FASTLY_API_TOKEN are assumed to be valid.
func processToken(data *global.Data) (token string, tokenSource lookup.Source, err error) {
	if err := data.ValidateProfileFlag(); err != nil {
 return "", lookup.SourceUndefined, err
	}

	token, tokenSource = data.Token()

	switch tokenSource {
Expand Down

42 changes: 42 additions & 0 deletions
pkg/commands/auth/metadata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -347,6 +347,48 @@ func TestAuthShow(t *testing.T) {
 "(default)",
 },
 },
 {
 Name: "show with unknown --profile rejected",
 Args: "show --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "show with known --profile uses that profile",
 Args: "show --profile alt",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 "alt": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token", Email: "a@example.com"},
 },
 },
 },
 WantOutputs: []string{"Name: alt", "a@example.com"},
 },
 {
 Name: "show with --token raw --profile bogus skips profile validation",
 Args: "show --token raw --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: "current token is not stored",
 DontWantOutput: "not found in auth config",
 },
	}

	testutil.RunCLIScenarios(t, []string{"auth"}, scenarios)
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/revoke.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ func (c *RevokeCommand) Exec(in io.Reader, out io.Writer) error {
 return err
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	switch {
	case c.current:
 return c.revokeCurrent(in, out)
Expand Down

46 changes: 46 additions & 0 deletions
pkg/commands/auth/revoke_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,52 @@ func TestAuthRevoke(t *testing.T) {
 WantRemediation: "one token ID per line",
 },

 {
 Name: "revoke --current with unknown --profile rejected",
 Args: "revoke --current --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --name with unknown --profile rejected",
 Args: "revoke --name secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --token-value with unknown --profile rejected",
 Args: "revoke --token-value tok-secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --id with unknown --profile rejected",
 Args: "revoke --id some-id --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --file with unknown --profile rejected",
 Args: fmt.Sprintf("revoke --file %s --profile bogus", writeTokenIDFile(t, "id-1\n")),
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --current with --token flag wins over unknown --profile",
 Args: "revoke --current --token tok-stored --profile bogus",
 API: &mock.API{DeleteTokenSelfFn: deleteTokenSelfOK},
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "mytoken",
 Tokens: config.AuthTokens{
 "mytoken": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "tok-stored"},
 },
 },
 },
 Stdin: []string{"y"},
 WantOutputs: []string{"Revoked current token"},
 },

 // API client factory failure
 {
 Name: "API client factory failure on --name",
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/show.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,10 @@ func NewShowCommand(parent argparser.Registerer, g *global.Data) *ShowCommand {
}

func (c *ShowCommand) Exec(_ io.Reader, out io.Writer) error {
	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	if c.name == "" {
 _, src := c.Globals.Token()
 switch src {
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/token.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@ func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) error {
 }
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	token, src := c.Globals.Token()
	if src == lookup.SourceUndefined || token == "" {
 return fsterr.RemediationError{
Expand Down

55 changes: 55 additions & 0 deletions
pkg/commands/auth/token_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ package auth_test
import (
	"bytes"
	"errors"
	"strings"
	"testing"

	"github.com/fastly/kingpin"
Expand DownExpand Up@@ -69,3 +70,57 @@ func TestToken_NonTTY_NoToken(t *testing.T) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
}

func TestToken_NonTTY_ProfileFlagUnknown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("test-api-token-value")
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err == nil {
 t.Fatal("expected error for unknown --profile")
	}
	var re fsterr.RemediationError
	if !errors.As(err, &re) {
 t.Fatalf("expected RemediationError, got %T: %v", err, err)
	}
	if re.Inner == nil || !strings.Contains(re.Inner.Error(), `"bogus"`) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
	if buf.Len() != 0 {
 t.Errorf("expected no token to be written, got: %q", buf.String())
	}
}

func TestToken_NonTTY_ProfileFlagKnown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Config.Auth.Tokens["alt"] = &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token"}
	g.Flags.Profile = "alt"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "alt-token" {
 t.Errorf("expected token %q, got %q", "alt-token", got)
	}
}

func TestToken_NonTTY_TokenFlagBeatsProfileFlag(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Flags.Token = "raw-xyz"
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "raw-xyz" {
 t.Errorf("expected token %q, got %q", "raw-xyz", got)
	}
}

8 changes: 8 additions & 0 deletions
pkg/errors/remediation_error.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,6 +184,14 @@ var ComputeBuildRemediation = strings.Join([]string{
	"See more at https://www.fastly.com/documentation/reference/compute/fastly-toml",
}, " ")

// ErrProfileFlagNotFound is returned when --profile names an unknown auth token.
func ErrProfileFlagNotFound(name string) RemediationError {
	return RemediationError{
 Inner: fmt.Errorf("profile %q (from --profile) not found in auth config", name),
 Remediation: ProfileRemediation(),
	}
}

// ProfileRemediation suggests running auth commands.
func ProfileRemediation() string {
	if env.AuthCommandDisabled() {
Expand Down

44 changes: 39 additions & 5 deletions
pkg/global/global.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,19 +97,25 @@ type Data struct {
// Order of precedence:
// - The --token flag (if it matches a stored auth token name, use that token).
// - The --token flag (treated as a raw API token).
// - The --profile/-o flag (must match a stored auth token name).
// - The FASTLY_API_TOKEN environment variable.
// - The `profile` manifest field mapped to an auth token name.
// - The default [auth] token (if configured).
func (d *Data) Token() (string, lookup.Source) {
	// --token: check if it matches a stored auth token name first.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
 }
 return d.Flags.Token, lookup.SourceFlag
	}

	// FASTLY_API_TOKEN
	if d.Flags.Profile != "" {
 if at, ok := d.profileFlagToken(); ok {
 return at.Token, lookup.SourceAuth
 }
 return "", lookup.SourceUndefined
	}

	if d.Env.APIToken != "" {
 return d.Env.APIToken, lookup.SourceEnvironment
	}
Expand All@@ -120,31 +126,59 @@ func (d *Data) Token() (string, lookup.Source) {
 }
	}

	// [auth] section default token.
	if _, at := d.Config.GetDefaultAuthToken(); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
	}

	return "", lookup.SourceUndefined
}

func (d *Data) profileFlagToken() (*config.AuthToken, bool) {
	if d.Flags.Profile == "" {
 return nil, false
	}
	at := d.Config.GetAuthToken(d.Flags.Profile)
	if at == nil || at.Token == "" {
 return nil, false
	}
	return at, true
}

// ValidateProfileFlag returns an error if --profile/-o is set to a name that
// does not resolve to a stored auth token. --token outranks --profile and
// short-circuits the check.
func (d *Data) ValidateProfileFlag() error {
	if d.Flags.Token != "" || d.Flags.Profile == "" {
 return nil
	}
	if _, ok := d.profileFlagToken(); ok {
 return nil
	}
	return fsterr.ErrProfileFlagNotFound(d.Flags.Profile)
}

// AuthTokenName returns the name of the auth token being used, if any.
// This is used for display purposes and for SSO refresh of named tokens.
func (d *Data) AuthTokenName() string {
	// If --token matches a stored auth token name, return that name.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil {
 return d.Flags.Token
 }
 return ""
	}

	if d.Flags.Profile != "" {
 if _, ok := d.profileFlagToken(); ok {
 return d.Flags.Profile
 }
 return ""
	}

	if d.Manifest != nil && d.Manifest.File.Profile != "" {
 if at := d.Config.GetAuthToken(d.Manifest.File.Profile); at != nil {
 return d.Manifest.File.Profile
 }
	}
	// Otherwise return the default auth token name.
	name, _ := d.Config.GetDefaultAuthToken()
	return name
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[CDTOOL-1332] Honor --profile when resolving the API token by jedisct1 · Pull Request #1792 · fastly/cli · GitHub
Skip to content
[CDTOOL-1332] Honor --profile when resolving the API token#1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jedisct1
merged 3 commits into

from

May 13, 2026
 Merged


[CDTOOL-1332] Honor --profile when resolving the API token
#1792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
803c7b1

[CDTOOL-1332] Honor --profile when resolving the API token


jedisct1 May 12, 2026
d6fc732

Merge branch 'main' into fdenis/profilo


jedisct1 May 13, 2026
82e7aa1

Merge branch 'main' into fdenis/profilo


anthony-gomez-fastly May 13, 2026

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

### Bug Fixes:

- fix(auth): honor deprecated `--profile`/`-o` when resolving the API token; an unknown profile name is now a hard error instead of a silent fallback to the default token
- fix(text): send deprecation warnings to stderr instead of stdout ([#1782](https://github.com/fastly/cli/pull/1782))

### Enhancements:
Expand Down

6 changes: 5 additions & 1 deletion
pkg/app/run.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ func Exec(data *global.Data) error {
 data.AuthServer = authServer
 }

 if !data.Flags.Quiet && data.Flags.Token == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if !data.Flags.Quiet && data.Flags.Token == "" && data.Flags.Profile == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if data.Config.GetAuthToken(data.Manifest.File.Profile) == nil {
 if defaultName, _ := data.Config.GetDefaultAuthToken(); defaultName != "" {
 text.Warning(data.ErrOutput, "fastly.toml profile %q not found in auth config, using default token %q.\n", data.Manifest.File.Profile, defaultName)
Expand DownExpand Up@@ -397,6 +397,10 @@ func configureKingpin(data *global.Data) *kingpin.Application {
// Tokens from --token (raw, unavailable when FASTLY_DISABLE_AUTH_COMMAND is
// set) or FASTLY_API_TOKEN are assumed to be valid.
func processToken(data *global.Data) (token string, tokenSource lookup.Source, err error) {
	if err := data.ValidateProfileFlag(); err != nil {
 return "", lookup.SourceUndefined, err
	}

	token, tokenSource = data.Token()

	switch tokenSource {
Expand Down

42 changes: 42 additions & 0 deletions
pkg/commands/auth/metadata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -347,6 +347,48 @@ func TestAuthShow(t *testing.T) {
 "(default)",
 },
 },
 {
 Name: "show with unknown --profile rejected",
 Args: "show --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "show with known --profile uses that profile",
 Args: "show --profile alt",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 "alt": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token", Email: "a@example.com"},
 },
 },
 },
 WantOutputs: []string{"Name: alt", "a@example.com"},
 },
 {
 Name: "show with --token raw --profile bogus skips profile validation",
 Args: "show --token raw --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: "current token is not stored",
 DontWantOutput: "not found in auth config",
 },
	}

	testutil.RunCLIScenarios(t, []string{"auth"}, scenarios)
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/revoke.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ func (c *RevokeCommand) Exec(in io.Reader, out io.Writer) error {
 return err
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	switch {
	case c.current:
 return c.revokeCurrent(in, out)
Expand Down

46 changes: 46 additions & 0 deletions
pkg/commands/auth/revoke_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,52 @@ func TestAuthRevoke(t *testing.T) {
 WantRemediation: "one token ID per line",
 },

 {
 Name: "revoke --current with unknown --profile rejected",
 Args: "revoke --current --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --name with unknown --profile rejected",
 Args: "revoke --name secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --token-value with unknown --profile rejected",
 Args: "revoke --token-value tok-secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --id with unknown --profile rejected",
 Args: "revoke --id some-id --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --file with unknown --profile rejected",
 Args: fmt.Sprintf("revoke --file %s --profile bogus", writeTokenIDFile(t, "id-1\n")),
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --current with --token flag wins over unknown --profile",
 Args: "revoke --current --token tok-stored --profile bogus",
 API: &mock.API{DeleteTokenSelfFn: deleteTokenSelfOK},
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "mytoken",
 Tokens: config.AuthTokens{
 "mytoken": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "tok-stored"},
 },
 },
 },
 Stdin: []string{"y"},
 WantOutputs: []string{"Revoked current token"},
 },

 // API client factory failure
 {
 Name: "API client factory failure on --name",
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/show.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,10 @@ func NewShowCommand(parent argparser.Registerer, g *global.Data) *ShowCommand {
}

func (c *ShowCommand) Exec(_ io.Reader, out io.Writer) error {
	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	if c.name == "" {
 _, src := c.Globals.Token()
 switch src {
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/token.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@ func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) error {
 }
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	token, src := c.Globals.Token()
	if src == lookup.SourceUndefined || token == "" {
 return fsterr.RemediationError{
Expand Down

55 changes: 55 additions & 0 deletions
pkg/commands/auth/token_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ package auth_test
import (
	"bytes"
	"errors"
	"strings"
	"testing"

	"github.com/fastly/kingpin"
Expand DownExpand Up@@ -69,3 +70,57 @@ func TestToken_NonTTY_NoToken(t *testing.T) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
}

func TestToken_NonTTY_ProfileFlagUnknown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("test-api-token-value")
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err == nil {
 t.Fatal("expected error for unknown --profile")
	}
	var re fsterr.RemediationError
	if !errors.As(err, &re) {
 t.Fatalf("expected RemediationError, got %T: %v", err, err)
	}
	if re.Inner == nil || !strings.Contains(re.Inner.Error(), `"bogus"`) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
	if buf.Len() != 0 {
 t.Errorf("expected no token to be written, got: %q", buf.String())
	}
}

func TestToken_NonTTY_ProfileFlagKnown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Config.Auth.Tokens["alt"] = &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token"}
	g.Flags.Profile = "alt"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "alt-token" {
 t.Errorf("expected token %q, got %q", "alt-token", got)
	}
}

func TestToken_NonTTY_TokenFlagBeatsProfileFlag(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Flags.Token = "raw-xyz"
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "raw-xyz" {
 t.Errorf("expected token %q, got %q", "raw-xyz", got)
	}
}

8 changes: 8 additions & 0 deletions
pkg/errors/remediation_error.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,6 +184,14 @@ var ComputeBuildRemediation = strings.Join([]string{
	"See more at https://www.fastly.com/documentation/reference/compute/fastly-toml",
}, " ")

// ErrProfileFlagNotFound is returned when --profile names an unknown auth token.
func ErrProfileFlagNotFound(name string) RemediationError {
	return RemediationError{
 Inner: fmt.Errorf("profile %q (from --profile) not found in auth config", name),
 Remediation: ProfileRemediation(),
	}
}

// ProfileRemediation suggests running auth commands.
func ProfileRemediation() string {
	if env.AuthCommandDisabled() {
Expand Down

44 changes: 39 additions & 5 deletions
pkg/global/global.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,19 +97,25 @@ type Data struct {
// Order of precedence:
// - The --token flag (if it matches a stored auth token name, use that token).
// - The --token flag (treated as a raw API token).
// - The --profile/-o flag (must match a stored auth token name).
// - The FASTLY_API_TOKEN environment variable.
// - The `profile` manifest field mapped to an auth token name.
// - The default [auth] token (if configured).
func (d *Data) Token() (string, lookup.Source) {
	// --token: check if it matches a stored auth token name first.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
 }
 return d.Flags.Token, lookup.SourceFlag
	}

	// FASTLY_API_TOKEN
	if d.Flags.Profile != "" {
 if at, ok := d.profileFlagToken(); ok {
 return at.Token, lookup.SourceAuth
 }
 return "", lookup.SourceUndefined
	}

	if d.Env.APIToken != "" {
 return d.Env.APIToken, lookup.SourceEnvironment
	}
Expand All@@ -120,31 +126,59 @@ func (d *Data) Token() (string, lookup.Source) {
 }
	}

	// [auth] section default token.
	if _, at := d.Config.GetDefaultAuthToken(); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
	}

	return "", lookup.SourceUndefined
}

func (d *Data) profileFlagToken() (*config.AuthToken, bool) {
	if d.Flags.Profile == "" {
 return nil, false
	}
	at := d.Config.GetAuthToken(d.Flags.Profile)
	if at == nil || at.Token == "" {
 return nil, false
	}
	return at, true
}

// ValidateProfileFlag returns an error if --profile/-o is set to a name that
// does not resolve to a stored auth token. --token outranks --profile and
// short-circuits the check.
func (d *Data) ValidateProfileFlag() error {
	if d.Flags.Token != "" || d.Flags.Profile == "" {
 return nil
	}
	if _, ok := d.profileFlagToken(); ok {
 return nil
	}
	return fsterr.ErrProfileFlagNotFound(d.Flags.Profile)
}

// AuthTokenName returns the name of the auth token being used, if any.
// This is used for display purposes and for SSO refresh of named tokens.
func (d *Data) AuthTokenName() string {
	// If --token matches a stored auth token name, return that name.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil {
 return d.Flags.Token
 }
 return ""
	}

	if d.Flags.Profile != "" {
 if _, ok := d.profileFlagToken(); ok {
 return d.Flags.Profile
 }
 return ""
	}

	if d.Manifest != nil && d.Manifest.File.Profile != "" {
 if at := d.Config.GetAuthToken(d.Manifest.File.Profile); at != nil {
 return d.Manifest.File.Profile
 }
	}
	// Otherwise return the default auth token name.
	name, _ := d.Config.GetDefaultAuthToken()
	return name
}
Expand Down
Loading
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[CDTOOL-1332] Honor --profile when resolving the API token by jedisct1 · Pull Request #1792 · fastly/cli · GitHub
Skip to content
[CDTOOL-1332] Honor --profile when resolving the API token#1792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

jedisct1
merged 3 commits into

from

May 13, 2026
 Merged


[CDTOOL-1332] Honor --profile when resolving the API token
#1792
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
803c7b1

[CDTOOL-1332] Honor --profile when resolving the API token


jedisct1 May 12, 2026
d6fc732

Merge branch 'main' into fdenis/profilo


jedisct1 May 13, 2026
82e7aa1

Merge branch 'main' into fdenis/profilo


anthony-gomez-fastly May 13, 2026

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

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@

### Bug Fixes:

- fix(auth): honor deprecated `--profile`/`-o` when resolving the API token; an unknown profile name is now a hard error instead of a silent fallback to the default token
- fix(text): send deprecation warnings to stderr instead of stdout ([#1782](https://github.com/fastly/cli/pull/1782))

### Enhancements:
Expand Down

6 changes: 5 additions & 1 deletion
pkg/app/run.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -289,7 +289,7 @@ func Exec(data *global.Data) error {
 data.AuthServer = authServer
 }

 if !data.Flags.Quiet && data.Flags.Token == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if !data.Flags.Quiet && data.Flags.Token == "" && data.Flags.Profile == "" && data.Env.APIToken == "" && data.Manifest != nil && data.Manifest.File.Profile != "" {
 if data.Config.GetAuthToken(data.Manifest.File.Profile) == nil {
 if defaultName, _ := data.Config.GetDefaultAuthToken(); defaultName != "" {
 text.Warning(data.ErrOutput, "fastly.toml profile %q not found in auth config, using default token %q.\n", data.Manifest.File.Profile, defaultName)
Expand DownExpand Up@@ -397,6 +397,10 @@ func configureKingpin(data *global.Data) *kingpin.Application {
// Tokens from --token (raw, unavailable when FASTLY_DISABLE_AUTH_COMMAND is
// set) or FASTLY_API_TOKEN are assumed to be valid.
func processToken(data *global.Data) (token string, tokenSource lookup.Source, err error) {
	if err := data.ValidateProfileFlag(); err != nil {
 return "", lookup.SourceUndefined, err
	}

	token, tokenSource = data.Token()

	switch tokenSource {
Expand Down

42 changes: 42 additions & 0 deletions
pkg/commands/auth/metadata_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -347,6 +347,48 @@ func TestAuthShow(t *testing.T) {
 "(default)",
 },
 },
 {
 Name: "show with unknown --profile rejected",
 Args: "show --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "show with known --profile uses that profile",
 Args: "show --profile alt",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 "alt": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token", Email: "a@example.com"},
 },
 },
 },
 WantOutputs: []string{"Name: alt", "a@example.com"},
 },
 {
 Name: "show with --token raw --profile bogus skips profile validation",
 Args: "show --token raw --profile bogus",
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "user",
 Tokens: config.AuthTokens{
 "user": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "t"},
 },
 },
 },
 WantError: "current token is not stored",
 DontWantOutput: "not found in auth config",
 },
	}

	testutil.RunCLIScenarios(t, []string{"auth"}, scenarios)
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/revoke.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,10 @@ func (c *RevokeCommand) Exec(in io.Reader, out io.Writer) error {
 return err
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	switch {
	case c.current:
 return c.revokeCurrent(in, out)
Expand Down

46 changes: 46 additions & 0 deletions
pkg/commands/auth/revoke_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -414,6 +414,52 @@ func TestAuthRevoke(t *testing.T) {
 WantRemediation: "one token ID per line",
 },

 {
 Name: "revoke --current with unknown --profile rejected",
 Args: "revoke --current --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --name with unknown --profile rejected",
 Args: "revoke --name secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --token-value with unknown --profile rejected",
 Args: "revoke --token-value tok-secondary --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --id with unknown --profile rejected",
 Args: "revoke --id some-id --profile bogus",
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --file with unknown --profile rejected",
 Args: fmt.Sprintf("revoke --file %s --profile bogus", writeTokenIDFile(t, "id-1\n")),
 WantError: `profile "bogus"`,
 WantRemediation: "fastly auth",
 },
 {
 Name: "revoke --current with --token flag wins over unknown --profile",
 Args: "revoke --current --token tok-stored --profile bogus",
 API: &mock.API{DeleteTokenSelfFn: deleteTokenSelfOK},
 ConfigFile: &config.File{
 Auth: config.Auth{
 Default: "mytoken",
 Tokens: config.AuthTokens{
 "mytoken": &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "tok-stored"},
 },
 },
 },
 Stdin: []string{"y"},
 WantOutputs: []string{"Revoked current token"},
 },

 // API client factory failure
 {
 Name: "API client factory failure on --name",
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/show.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,6 +32,10 @@ func NewShowCommand(parent argparser.Registerer, g *global.Data) *ShowCommand {
}

func (c *ShowCommand) Exec(_ io.Reader, out io.Writer) error {
	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	if c.name == "" {
 _, src := c.Globals.Token()
 switch src {
Expand Down

4 changes: 4 additions & 0 deletions
pkg/commands/auth/token.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,6 +33,10 @@ func (c *TokenCommand) Exec(_ io.Reader, out io.Writer) error {
 }
	}

	if err := c.Globals.ValidateProfileFlag(); err != nil {
 return err
	}

	token, src := c.Globals.Token()
	if src == lookup.SourceUndefined || token == "" {
 return fsterr.RemediationError{
Expand Down

55 changes: 55 additions & 0 deletions
pkg/commands/auth/token_test.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@ package auth_test
import (
	"bytes"
	"errors"
	"strings"
	"testing"

	"github.com/fastly/kingpin"
Expand DownExpand Up@@ -69,3 +70,57 @@ func TestToken_NonTTY_NoToken(t *testing.T) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
}

func TestToken_NonTTY_ProfileFlagUnknown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("test-api-token-value")
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err == nil {
 t.Fatal("expected error for unknown --profile")
	}
	var re fsterr.RemediationError
	if !errors.As(err, &re) {
 t.Fatalf("expected RemediationError, got %T: %v", err, err)
	}
	if re.Inner == nil || !strings.Contains(re.Inner.Error(), `"bogus"`) {
 t.Errorf("unexpected inner error: %v", re.Inner)
	}
	if buf.Len() != 0 {
 t.Errorf("expected no token to be written, got: %q", buf.String())
	}
}

func TestToken_NonTTY_ProfileFlagKnown(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Config.Auth.Tokens["alt"] = &config.AuthToken{Type: config.AuthTokenTypeStatic, Token: "alt-token"}
	g.Flags.Profile = "alt"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "alt-token" {
 t.Errorf("expected token %q, got %q", "alt-token", got)
	}
}

func TestToken_NonTTY_TokenFlagBeatsProfileFlag(t *testing.T) {
	var buf bytes.Buffer
	g := globalDataWithToken("default-token")
	g.Flags.Token = "raw-xyz"
	g.Flags.Profile = "bogus"

	cmd := newTokenCommand(g)
	err := cmd.Exec(nil, &buf)
	if err != nil {
 t.Fatalf("expected no error, got: %v", err)
	}
	if got := buf.String(); got != "raw-xyz" {
 t.Errorf("expected token %q, got %q", "raw-xyz", got)
	}
}

8 changes: 8 additions & 0 deletions
pkg/errors/remediation_error.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -184,6 +184,14 @@ var ComputeBuildRemediation = strings.Join([]string{
	"See more at https://www.fastly.com/documentation/reference/compute/fastly-toml",
}, " ")

// ErrProfileFlagNotFound is returned when --profile names an unknown auth token.
func ErrProfileFlagNotFound(name string) RemediationError {
	return RemediationError{
 Inner: fmt.Errorf("profile %q (from --profile) not found in auth config", name),
 Remediation: ProfileRemediation(),
	}
}

// ProfileRemediation suggests running auth commands.
func ProfileRemediation() string {
	if env.AuthCommandDisabled() {
Expand Down

44 changes: 39 additions & 5 deletions
pkg/global/global.go

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -97,19 +97,25 @@ type Data struct {
// Order of precedence:
// - The --token flag (if it matches a stored auth token name, use that token).
// - The --token flag (treated as a raw API token).
// - The --profile/-o flag (must match a stored auth token name).
// - The FASTLY_API_TOKEN environment variable.
// - The `profile` manifest field mapped to an auth token name.
// - The default [auth] token (if configured).
func (d *Data) Token() (string, lookup.Source) {
	// --token: check if it matches a stored auth token name first.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
 }
 return d.Flags.Token, lookup.SourceFlag
	}

	// FASTLY_API_TOKEN
	if d.Flags.Profile != "" {
 if at, ok := d.profileFlagToken(); ok {
 return at.Token, lookup.SourceAuth
 }
 return "", lookup.SourceUndefined
	}

	if d.Env.APIToken != "" {
 return d.Env.APIToken, lookup.SourceEnvironment
	}
Expand All@@ -120,31 +126,59 @@ func (d *Data) Token() (string, lookup.Source) {
 }
	}

	// [auth] section default token.
	if _, at := d.Config.GetDefaultAuthToken(); at != nil && at.Token != "" {
 return at.Token, lookup.SourceAuth
	}

	return "", lookup.SourceUndefined
}

func (d *Data) profileFlagToken() (*config.AuthToken, bool) {
	if d.Flags.Profile == "" {
 return nil, false
	}
	at := d.Config.GetAuthToken(d.Flags.Profile)
	if at == nil || at.Token == "" {
 return nil, false
	}
	return at, true
}

// ValidateProfileFlag returns an error if --profile/-o is set to a name that
// does not resolve to a stored auth token. --token outranks --profile and
// short-circuits the check.
func (d *Data) ValidateProfileFlag() error {
	if d.Flags.Token != "" || d.Flags.Profile == "" {
 return nil
	}
	if _, ok := d.profileFlagToken(); ok {
 return nil
	}
	return fsterr.ErrProfileFlagNotFound(d.Flags.Profile)
}

// AuthTokenName returns the name of the auth token being used, if any.
// This is used for display purposes and for SSO refresh of named tokens.
func (d *Data) AuthTokenName() string {
	// If --token matches a stored auth token name, return that name.
	if d.Flags.Token != "" {
 if at := d.Config.GetAuthToken(d.Flags.Token); at != nil {
 return d.Flags.Token
 }
 return ""
	}

	if d.Flags.Profile != "" {
 if _, ok := d.profileFlagToken(); ok {
 return d.Flags.Profile
 }
 return ""
	}

	if d.Manifest != nil && d.Manifest.File.Profile != "" {
 if at := d.Config.GetAuthToken(d.Manifest.File.Profile); at != nil {
 return d.Manifest.File.Profile
 }
	}
	// Otherwise return the default auth token name.
	name, _ := d.Config.GetDefaultAuthToken()
	return name
}
Expand Down
Loading
Loading