Merge pull request #74 from cloudflare/jamesog/73-flarectl-fix

flarectl: Move api invocation to checkEnv()
cloudflare · May 21, 2016 · 9f46967 · 9f46967
2 parents 4126653 + 7bbb639
commit 9f46967
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/cmd/flarectl/flarectl.go b/cmd/flarectl/flarectl.go
@@ -53,12 +53,21 @@ func makeTable(zones []table, cols ...string) {
 }
 
 func checkEnv() error {
+	if api == nil {
+		var err error
+		api, err = cloudflare.New(os.Getenv("CF_API_KEY"), os.Getenv("CF_API_EMAIL"))
+		if err != nil {
+			log.Fatal(err)
+		}
+	}
+
 	if api.APIKey == "" {
 		return errors.New("API key not defined")
 	}
 	if api.APIEmail == "" {
 		return errors.New("API email not defined")
 	}
+
 	return nil
 }
 
@@ -455,12 +464,6 @@ func railgun(*cli.Context) {
 }
 
 func main() {
-	var err error
-	api, err = cloudflare.New(os.Getenv("CF_API_KEY"), os.Getenv("CF_API_EMAIL"))
-	if err != nil {
-		log.Fatal(err)
-	}
-
 	app := cli.NewApp()
 	app.Name = "flarectl"
 	app.Usage = "CloudFlare CLI"