Skip to content

Add username to atc output #3690

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

Open
CharlieAtSchneider wants to merge 4 commits into
base: master
Choose a base branch
from
+19 −9
Open

Add username to atc output #3690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
69addee
Add username to ATC output
CharlieAtSchneider Sep 1, 2026
51b42ec
Pass tests
CharlieAtSchneider Sep 1, 2026
a7208e6
Merge branch 'master' into username_to_atc_output
CharlieAtSchneider Sep 1, 2026
fa59b39
Merge branch 'master' into username_to_atc_output
CharlieAtSchneider Sep 2, 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
16 changes: 13 additions & 3 deletions general/token/cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,21 @@ func AccessTokenCreateCmd(c *cli.Context) error {
if err != nil {
return err
}
return printTokenResponse(resBytes, outputFormat, os.Stdout)
return printTokenResponse(resBytes, outputFormat, os.Stdout, username)
}

// printTokenResponse writes the token response in the requested format to w.
func printTokenResponse(data []byte, outputFormat coreformat.OutputFormat, w io.Writer) error {
func printTokenResponse(data []byte, outputFormat coreformat.OutputFormat, w io.Writer, username string) error {
// Add username to atc output
var jsonData map[string]any
if err := json.Unmarshal(data, &jsonData); err != nil {
return err
}
jsonData["username"] = username
data, err := json.Marshal(jsonData)
if err != nil {
return err
}
switch outputFormat {
case coreformat.Json:
log.Output(clientUtils.IndentJson(data))
Expand All @@ -102,7 +112,7 @@ func printTokenTable(data []byte, w io.Writer) error {
orderedKeys := []string{
"access_token", "token_id", "expires_in", "scope",
"token_type", "refreshable", "refresh_token", "reference_token",
"grant_type", "audience",
"grant_type", "audience", "username",
}

tw := tabwriter.NewWriter(w, 0, 0, 2, ' ', 0)
Expand Down
12 changes: 6 additions & 6 deletions general/token/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func TestPrintTokenResponse_JSON(t *testing.T) {
data := sampleTokenResponse(t)

var buf bytes.Buffer
err := printTokenResponse(data, coreformat.Json, &buf)
err := printTokenResponse(data, coreformat.Json, &buf, "username")
require.NoError(t, err)

// JSON format uses log.Output (writes to the real logger, not the writer).
Expand All @@ -47,7 +47,7 @@ func TestPrintTokenResponse_Table(t *testing.T) {
data := sampleTokenResponse(t)

var buf bytes.Buffer
err := printTokenResponse(data, coreformat.Table, &buf)
err := printTokenResponse(data, coreformat.Table, &buf, "username")
require.NoError(t, err)

output := buf.String()
Expand All @@ -64,6 +64,7 @@ func TestPrintTokenResponse_Table(t *testing.T) {
assert.Contains(t, output, "applied-permissions/user")
assert.Contains(t, output, "token_type")
assert.Contains(t, output, "Bearer")
assert.Contains(t, output, "username")
}

func TestPrintTokenResponse_Table_AccessTokenTruncated(t *testing.T) {
Expand All @@ -73,7 +74,7 @@ func TestPrintTokenResponse_Table_AccessTokenTruncated(t *testing.T) {
require.NoError(t, err)

var buf bytes.Buffer
require.NoError(t, printTokenResponse(data, coreformat.Table, &buf))
require.NoError(t, printTokenResponse(data, coreformat.Table, &buf, "username"))

output := buf.String()
assert.Contains(t, output, "access_token")
Expand All @@ -91,7 +92,7 @@ func TestPrintTokenResponse_Table_AbsentFieldsOmitted(t *testing.T) {
require.NoError(t, err)

var buf bytes.Buffer
require.NoError(t, printTokenResponse(data, coreformat.Table, &buf))
require.NoError(t, printTokenResponse(data, coreformat.Table, &buf, "username"))

output := buf.String()
assert.NotContains(t, output, "token_id")
Expand All @@ -100,7 +101,7 @@ func TestPrintTokenResponse_Table_AbsentFieldsOmitted(t *testing.T) {
}

func TestPrintTokenResponse_UnsupportedFormat(t *testing.T) {
err := printTokenResponse([]byte("{}"), coreformat.Sarif, &bytes.Buffer{})
err := printTokenResponse([]byte("{}"), coreformat.Sarif, &bytes.Buffer{}, "username")
require.Error(t, err)
assert.Contains(t, err.Error(), "unsupported format")
}
Expand Down Expand Up @@ -181,4 +182,3 @@ func TestPrintOidcTokenResponse_UnsupportedFormat(t *testing.T) {
require.Error(t, err)
assert.Contains(t, err.Error(), "unsupported format")
}

Loading