Merge pull request #44 from Infisical/misc/add-proper-parsing-of-token-for-org-relay

misc: add proper parsing of token for org relay

Author: sheensantoscapadngan

packages/cmd/relay.go

@@ -167,9 +167,9 @@ var relaySystemdInstallCmd = &cobra.Command{
 			util.HandleError(fmt.Errorf("systemd service installation requires root/sudo privileges"))
 		}
 
-		token, err := cmd.Flags().GetString("token")
+		token, err := util.GetCmdFlagOrEnvWithDefaultValue(cmd, "token", []string{gatewayv2.INFISICAL_TOKEN_ENV_NAME}, "")
 		if err != nil {
-			util.HandleError(err, "Unable to parse token flag")
+			util.HandleError(err, "Unable to parse token flag or env")
 		}
 
 		domain, err := cmd.Flags().GetString("domain")
@@ -211,7 +211,7 @@ var relaySystemdInstallCmd = &cobra.Command{
 		}
 
 		if instanceType != "instance" && token == "" {
-			util.HandleError(fmt.Errorf("for type '%s', --token is required", instanceType))
+			util.HandleError(fmt.Errorf("for type '%s', --token flag or %s env must be set", instanceType, gatewayv2.INFISICAL_TOKEN_ENV_NAME))
 		}
 
 		if err := relay.InstallRelaySystemdService(token, domain, name, host, instanceType, relayAuthSecret); err != nil {

packages/gateway-v2/constants.go

@@ -13,6 +13,7 @@ const (
 	GATEWAY_NAME_ENV_NAME = "INFISICAL_GATEWAY_NAME"
 
 	RELAY_AUTH_SECRET_ENV_NAME = "INFISICAL_RELAY_AUTH_SECRET"
+	INFISICAL_TOKEN_ENV_NAME   = "INFISICAL_TOKEN"
 
 	INFISICAL_HTTP_PROXY_ACTION_HEADER = "x-infisical-action"
 )