Manually check for env variables and disable the automatic ones (#256)

* Manually check for env variables and disable the automatic ones

* Add key validator for env variables

pkg/cmd/root.go

@@ -11,7 +11,6 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/afero"
 	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 
 	"github.com/stripe/stripe-cli/pkg/cmd/resource"
 	"github.com/stripe/stripe-cli/pkg/config"
@@ -92,9 +91,6 @@ func init() {
 	rootCmd.PersistentFlags().StringVarP(&Config.Profile.ProfileName, "project-name", "p", "default", "the project name to read from for config")
 	rootCmd.Flags().BoolP("version", "v", false, "Get the version of the Stripe CLI")
 
-	viper.SetEnvPrefix("stripe")
-	viper.AutomaticEnv() // read in environment variables that match
-
 	rootCmd.AddCommand(newCompletionCmd().cmd)
 	rootCmd.AddCommand(newConfigCmd().cmd)
 	rootCmd.AddCommand(newDeleteCmd().reqs.Cmd)

pkg/config/profile.go

@@ -3,6 +3,7 @@ package config
 import (
 	"errors"
 	"fmt"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -55,6 +56,10 @@ func (p *Profile) GetColor() (string, error) {
 
 // GetDeviceName returns the configured device name
 func (p *Profile) GetDeviceName() (string, error) {
+	if os.Getenv("STRIPE_DEVICE_NAME") != "" {
+		return os.Getenv("STRIPE_DEVICE_NAME"), nil
+	}
+
 	if p.DeviceName != "" {
 		return p.DeviceName, nil
 	}
@@ -68,6 +73,16 @@ func (p *Profile) GetDeviceName() (string, error) {
 
 // GetAPIKey will return the existing key for the given profile
 func (p *Profile) GetAPIKey(livemode bool) (string, error) {
+	envKey := os.Getenv("STRIPE_API_KEY")
+	if envKey != "" {
+		err := validators.APIKey(envKey)
+		if err != nil {
+			return "", err
+		}
+
+		return envKey, nil
+	}
+
 	if p.APIKey != "" {
 		err := validators.APIKey(p.APIKey)
 		if err != nil {