STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do not export authState

Browse source
This commit is contained in:
Benjamin Levesque 2025-08-20 17:50:29 +02:00
parent 96755eec83
commit 3d02e248c0
No known key found for this signature in database
GPG key ID: 765E3CB147AA4D4A
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pkg/cmd/auth/status/auth_state.go
View file

@ -2,27 +2,27 @@ package status
import "encoding/json"
type AuthState int
type authState int
const (
AuthStateSuccess AuthState = iota
AuthStateTimeout
AuthStateError
authStateSuccess authState = iota
authStateTimeout
authStateError
)
func (s AuthState) String() string {
func (s authState) String() string {
switch s {
case AuthStateSuccess:
case authStateSuccess:
return "success"
case AuthStateTimeout:
case authStateTimeout:
return "timeout"
case AuthStateError:
case authStateError:
return "error"
default:
return "unknown"
}
}
func (s AuthState) MarshalJSON() ([]byte, error) {
func (s authState) MarshalJSON() ([]byte, error) {
return json.Marshal(s.String())
}

18
pkg/cmd/auth/status/status.go
View file

@ -21,7 +21,7 @@ import (
)
type authEntry struct {
State AuthState `json:"state"`
State authState `json:"state"`
Error string `json:"error"`
Active bool `json:"active"`
Host string `json:"host"`
@ -47,7 +47,7 @@ var authFields = []string{
func (e authEntry) String(cs *iostreams.ColorScheme, showToken bool) string {
var sb strings.Builder
switch e.State {
case AuthStateSuccess:
case authStateSuccess:
sb.WriteString(
fmt.Sprintf(" %s Logged in to %s account %s (%s)\n", cs.SuccessIcon(), e.Host, cs.Bold(e.Login), e.TokenSource),
)
@ -71,7 +71,7 @@ func (e authEntry) String(cs *iostreams.ColorScheme, showToken bool) string {
}
}
case AuthStateTimeout:
case authStateTimeout:
if e.Login != "" {
sb.WriteString(fmt.Sprintf(" %s Timeout trying to log in to %s account %s (%s)\n", cs.Red("X"), e.Host, cs.Bold(e.Login), e.TokenSource))
} else {
@ -80,7 +80,7 @@ func (e authEntry) String(cs *iostreams.ColorScheme, showToken bool) string {
activeStr := fmt.Sprintf("%v", e.Active)
sb.WriteString(fmt.Sprintf(" - Active account: %s\n", cs.Bold(activeStr)))
case AuthStateError:
case authStateError:
if e.Login != "" {
sb.WriteString(fmt.Sprintf(" %s Failed to log in to %s account %s (%s)\n", cs.Red("X"), e.Host, cs.Bold(e.Login), e.TokenSource))
} else {
@ -380,7 +380,7 @@ func buildEntry(httpClient *http.Client, opts buildEntryOptions) authEntry {
var err error
entry.Login, err = api.CurrentLoginName(apiClient, opts.hostname)
if err != nil {
entry.State = AuthStateError
entry.State = authStateError
return entry
}
}
@ -391,17 +391,17 @@ func buildEntry(httpClient *http.Client, opts buildEntryOptions) authEntry {
if err != nil {
var networkError net.Error
if errors.As(err, &networkError) && networkError.Timeout() {
entry.State = AuthStateTimeout
entry.State = authStateTimeout
return entry
}
entry.State = AuthStateError
entry.State = authStateError
return entry
}
entry.Scopes = scopesHeader
}
entry.State = AuthStateSuccess
entry.State = authStateSuccess
return entry
}
@ -410,7 +410,7 @@ func authTokenWriteable(src string) bool {
}
func isValidEntry(entry authEntry) bool {
return entry.State == AuthStateSuccess
return entry.State == authStateSuccess
}
func (opts *StatusOptions) includeScope() bool {