feat: Add APPPACK_ACCOUNT env variable

cmd/access.go

@@ -195,7 +195,7 @@ func init() {
 		"account",
 		"c",
 		"",
-		"AWS account ID or alias (not needed if you are only the administrator of one account)",
+		"AWS account ID or alias. Use this flag to override the APPPACK_ACCOUNT environment variable (not needed if you are the administrator of only one account).",
 	)
 	accessCmd.PersistentFlags().BoolVar(
 		&UseAWSCredentials,

cmd/admins.go

@@ -137,7 +137,7 @@ func init() {
 		"account",
 		"c",
 		"",
-		"AWS account ID or alias (not needed if you are only the administrator of one account)",
+		"AWS account ID or alias. Use this flag to override the APPPACK_ACCOUNT environment variable (not needed if you are the administrator of only one account).",
 	)
 	adminsCmd.PersistentFlags().BoolVar(
 		&UseAWSCredentials,

cmd/create.go

@@ -310,7 +310,7 @@ var createRegionCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(createCmd)
-	createCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias (not needed if you are only the administrator of one account)")
+	createCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias. Use this flag to override the APPPACK_ACCOUNT environment variable (not needed if you are the administrator of only one account).")
 	createCmd.PersistentFlags().BoolVar(&UseAWSCredentials, "aws-credentials", false, "use AWS credentials instead of AppPack.io federation")
 	createCmd.PersistentFlags().BoolVar(&createChangeSet, "check", false, "check stack in Cloudformation before creating")
 	createCmd.PersistentFlags().BoolVar(&nonInteractive, "non-interactive", false, "do not prompt for missing flags")

cmd/destroy.go

@@ -194,7 +194,7 @@ var destroyCustomDomainCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(destroyCmd)
-	destroyCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias (not needed if you are only the administrator of one account)")
+	destroyCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias. Use this flag to override the APPPACK_ACCOUNT environment variable (not needed if you are the administrator of only one account).")
 	destroyCmd.PersistentFlags().BoolVar(&UseAWSCredentials, "aws-credentials", false, "use AWS credentials instead of AppPack.io federation")
 	destroyCmd.PersistentFlags().StringVar(&region, "region", "", "AWS region to destroy resources in")
 

cmd/modify.go

@@ -90,7 +90,7 @@ package cmd
 
 // func init() {
 // 	rootCmd.AddCommand(modifyCmd)
-// 	modifyCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias (not needed if you are only the administrator of one account)")
+// 	modifyCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias. Use this flag to override the APPPACK_ACCOUNT environment variable (not needed if you are the administrator of only one account).")
 // 	modifyCmd.PersistentFlags().BoolVar(&UseAWSCredentials, "aws-credentials", false, "use AWS credentials instead of AppPack.io federation")
 // 	modifyCmd.PersistentFlags().BoolVar(&createChangeSet, "check", false, "check stack in Cloudformation before creating")
 // 	modifyCmd.PersistentFlags().BoolVar(&nonInteractive, "non-interactive", false, "do not prompt for user input")

cmd/root.go

@@ -50,6 +50,14 @@ var (
 	MaxSessionDurationSeconds = 3600
 )
 
+func userHasMultipleAccounts() bool {
+	ui.StartSpinner()
+	admins, err := auth.AdminList()
+	checkErr(err)
+	ui.Spinner.Stop()
+	return len(admins) > 1
+}
+
 // rootCmd represents the base command when called without any subcommands
 var rootCmd = &cobra.Command{
 	Use:                   "apppack",
@@ -64,6 +72,15 @@ var rootCmd = &cobra.Command{
 		} else {
 			logrus.SetLevel(logrus.ErrorLevel)
 		}
+		// Check for account flag or environment variable
+		if AccountIDorAlias == "" {
+			AccountIDorAlias = os.Getenv("APPPACK_ACCOUNT")
+		}
+
+		// If neither is set and the user has multiple accounts, throw an error
+		if AccountIDorAlias == "" && userHasMultipleAccounts() {
+			checkErr(fmt.Errorf("you must specify an account using the -c flag or the APPPACK_ACCOUNT environment variable"))
+		}
 	},
 }
 

cmd/stacks.go

@@ -113,6 +113,6 @@ var stacksCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(stacksCmd)
-	stacksCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias (not needed if you are only the administrator of one account)")
+	stacksCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias. Use this flag to override the APPPACK_ACCOUNT environment variable (not needed if you are the administrator of only one account).")
 	stacksCmd.PersistentFlags().BoolVar(&UseAWSCredentials, "aws-credentials", false, "use AWS credentials instead of AppPack.io federation")
 }

cmd/upgrade.go

@@ -174,7 +174,7 @@ var upgradeDatabaseCmd = &cobra.Command{
 
 func init() {
 	rootCmd.AddCommand(upgradeCmd)
-	upgradeCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias (not needed if you are only the administrator of one account)")
+	upgradeCmd.PersistentFlags().StringVarP(&AccountIDorAlias, "account", "c", "", "AWS account ID or alias. Use this flag to override the APPPACK_ACCOUNT environment variable (not needed if you are the administrator of only one account).")
 	upgradeCmd.PersistentFlags().BoolVar(&UseAWSCredentials, "aws-credentials", false, "use AWS credentials instead of AppPack.io federation")
 	upgradeCmd.PersistentFlags().BoolVar(&createChangeSet, "check", false, "check stack in Cloudformation before creating")
 	upgradeCmd.PersistentFlags().StringVar(&region, "region", "", "AWS region to upgrade resources in")