Skip to content
Merged
Changes from all commits
Commits
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
34 changes: 0 additions & 34 deletions pkg/store/authtoken.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package store

import (
"fmt"
"io/ioutil"
"path"

"github.com/brevdev/brev-cli/pkg/entity"
Expand Down Expand Up @@ -49,13 +48,6 @@ tokens, err := authtokens.ReadAuthTokensFromDisk()
*/

func (f FileStore) GetAuthTokens() (*entity.AuthTokens, error) {
serviceToken, err := f.GetCurrentWorkspaceServiceToken()
if err == nil && serviceToken != "" {
return &entity.AuthTokens{
AccessToken: serviceToken,
}, nil
}

brevCredentialsFile, err := f.getBrevCredentialsFile()
if err != nil {
return nil, breverrors.WrapAndTrace(err)
Expand All @@ -77,32 +69,6 @@ func (f FileStore) GetAuthTokens() (*entity.AuthTokens, error) {
return &token, nil
}

func (f FileStore) GetCurrentWorkspaceServiceToken() (string, error) {
saTokenFilePath := getServiceTokenFilePath()
// safely check if file exists

exists, err := f.FileExists(saTokenFilePath)

if !exists || err != nil {
return "", err
}

saTokenFile, err := f.fs.Open(saTokenFilePath)
defer saTokenFile.Close() //nolint: errcheck // defer is fine
if err != nil {
return "", breverrors.WrapAndTrace(err)
}
token, err := ioutil.ReadAll(saTokenFile)
if err != nil {
return "", breverrors.WrapAndTrace(err)
}
return string(token), nil
}

func getServiceTokenFilePath() string {
return "/var/run/secrets/kubernetes.io/serviceaccount/token"
}

func (f FileStore) DeleteAuthTokens() error {
brevCredentialsFile, err := f.getBrevCredentialsFile()
if err != nil {
Expand Down
Loading