awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 19:28:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Cleanup

Browse Source
This commit is contained in:
Daniel Hougaard
2024-04-05 15:12:32 -07:00
parent 4d7182c9b1
commit 016f22c295
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cli/packages/cmd/agent.go
+1 -1
View File
@@ -479,7 +479,7 @@ func (tm *AgentManager) GetToken() string {
// Fetches a new access token using client credentials // Fetches a new access token using client credentials
func (tm *AgentManager) FetchNewAccessToken() error { func (tm *AgentManager) FetchNewAccessToken() error {
clientID := os.Getenv("INFISICAL_UNIVERSAL_AUTH_CLIENT_ID") clientID := os.Getenv(util.INFISICAL_UNIVERSAL_AUTH_CLIENT_ID_NAME)
if clientID == "" { if clientID == "" {
clientIDAsByte, err := ReadFile(tm.clientIdPath) clientIDAsByte, err := ReadFile(tm.clientIdPath)
if err != nil { if err != nil {
cli/packages/util/constants.go
+13 -13
View File
@@ -1,19 +1,19 @@
package util package util
const ( const (
CONFIG_FILE_NAME = "infisical-config.json" CONFIG_FILE_NAME = "infisical-config.json"
CONFIG_FOLDER_NAME = ".infisical" CONFIG_FOLDER_NAME = ".infisical"
INFISICAL_DEFAULT_API_URL = "https://app.infisical.com/api" INFISICAL_DEFAULT_API_URL = "https://app.infisical.com/api"
INFISICAL_DEFAULT_URL = "https://app.infisical.com" INFISICAL_DEFAULT_URL = "https://app.infisical.com"
INFISICAL_WORKSPACE_CONFIG_FILE_NAME = ".infisical.json" INFISICAL_WORKSPACE_CONFIG_FILE_NAME = ".infisical.json"
INFISICAL_TOKEN_NAME = "INFISICAL_TOKEN" INFISICAL_TOKEN_NAME = "INFISICAL_TOKEN"
INFISICAL_UNIVERSAL_AUTH_CLIENT_ID = "INFISICAL_UNIVERSAL_AUTH_CLIENT_ID" INFISICAL_UNIVERSAL_AUTH_CLIENT_ID_NAME = "INFISICAL_UNIVERSAL_AUTH_CLIENT_ID"
INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET = "INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET" INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET_NAME = "INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET"
SECRET_TYPE_PERSONAL = "personal" SECRET_TYPE_PERSONAL = "personal"
SECRET_TYPE_SHARED = "shared" SECRET_TYPE_SHARED = "shared"
KEYRING_SERVICE_NAME = "infisical" KEYRING_SERVICE_NAME = "infisical"
PERSONAL_SECRET_TYPE_NAME = "personal" PERSONAL_SECRET_TYPE_NAME = "personal"
SHARED_SECRET_TYPE_NAME = "shared" SHARED_SECRET_TYPE_NAME = "shared"
) )
var ( var (
cli/packages/util/helper.go
+2 -2
View File
@@ -95,11 +95,11 @@ func GetInfisicalUniversalAuthAccessToken(cmd *cobra.Command) (accessToken strin
} }
if universalAuthClientId == "" { if universalAuthClientId == "" {
universalAuthClientId = os.Getenv(INFISICAL_UNIVERSAL_AUTH_CLIENT_ID) universalAuthClientId = os.Getenv(INFISICAL_UNIVERSAL_AUTH_CLIENT_ID_NAME)
} }
if universalAuthClientSecret == "" { if universalAuthClientSecret == "" {
universalAuthClientSecret = os.Getenv(INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET) universalAuthClientSecret = os.Getenv(INFISICAL_UNIVERSAL_AUTH_CLIENT_SECRET_NAME)
} }
if universalAuthClientId != "" || universalAuthClientSecret != "" { if universalAuthClientId != "" || universalAuthClientSecret != "" {