Merge branch 'master' of github.com:superfly/flyctl

superfly · Dec 3, 2020 · 08a97dd · 08a97dd
2 parents d11ba5a + 9ed4df6
commit 08a97dd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/api/resource_monitoring.go b/api/resource_monitoring.go
@@ -41,6 +41,7 @@ func (c *Client) GetAppStatus(appName string, showCompleted bool) (*AppStatus, e
 					canary
 					region
 					restarts
+					privateIP
 					checks {
 						status
 					}
@@ -81,6 +82,7 @@ func (c *Client) GetAllocationStatus(appName string, allocID string, logLimit in
 					canary
 					region
 					restarts
+					privateIP
 					checks {
 						status
 						output

diff --git a/api/types.go b/api/types.go
@@ -598,6 +598,7 @@ type AllocationStatus struct {
 	WarningCheckCount  int
 	CriticalCheckCount int
 	Transitioning      bool
+	PrivateIP          string
 	RecentLogs         []LogEntry
 }
 

diff --git a/cmd/presenters/allocations.go b/cmd/presenters/allocations.go
@@ -18,7 +18,7 @@ func (p *Allocations) APIStruct() interface{} {
 }
 
 func (p *Allocations) FieldNames() []string {
-	return []string{"ID", "Version", "Region", "Desired", "Status", "Health Checks", "Restarts", "Created"}
+	return []string{"ID", "Version", "Region", "Desired", "Status", "Health Checks", "Restarts", "Private IP", "Created"}
 }
 
 func (p *Allocations) Records() []map[string]string {
@@ -50,6 +50,7 @@ func (p *Allocations) Records() []map[string]string {
 			"Created":       FormatRelativeTime(alloc.CreatedAt),
 			"Health Checks": FormatHealthChecksSummary(alloc),
 			"Restarts":      strconv.Itoa(alloc.Restarts),
+			"Private IP":    alloc.PrivateIP,
 		})
 	}
 

diff --git a/cmd/scale.go b/cmd/scale.go
@@ -57,7 +57,6 @@ func runSetParamsOnly(commandContext *cmdctx.CmdContext) error {
 
 func actualScale(commandContext *cmdctx.CmdContext, balanceRegions bool, setParamsOnly bool) error {
 	currentcfg, err := commandContext.Client.API().AppAutoscalingConfig(commandContext.AppName)
-
 	if err != nil {
 		return err
 	}