[merge] pull request #1385

convox · Nov 10, 2016 · 0b5198f · 0b5198f
2 parents e864b5c + 31bd069
commit 0b5198f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/api/models/app.go b/api/models/app.go
@@ -34,7 +34,6 @@ type Apps []App
 
 func ListApps() (Apps, error) {
 	res, err := DescribeStacks()
-
 	if err != nil {
 		return nil, err
 	}

diff --git a/api/models/system.go b/api/models/system.go
@@ -61,13 +61,27 @@ func doDescribeStack(input cloudformation.DescribeStacksInput) (*cloudformation.
 	if s.RequestTime.Before(time.Now().Add(-DescribeStacksCacheTTL)) || os.Getenv("PROVIDER") == "test" {
 		log.Logf("name=%q age=%s status=miss", name, time.Since(s.RequestTime))
 
-		res, err := CloudFormation().DescribeStacks(&input)
+		var err error
+		var res *cloudformation.DescribeStacksOutput
+		var stacks []*cloudformation.Stack
 
-		if err != nil {
-			log.Namespace("name=%q", name).Error(err)
-			return nil, err
+		for {
+			res, err = CloudFormation().DescribeStacks(&input)
+			if err != nil {
+				log.Namespace("name=%q", name).Error(err)
+				return nil, err
+			}
+
+			stacks = append(stacks, res.Stacks...)
+
+			if res.NextToken == nil {
+				break
+			}
+
+			input.NextToken = res.NextToken
 		}
 
+		res.Stacks = stacks
 		DescribeStacksCache[name] = DescribeStacksResult{
 			Name:        name,
 			Output:      res,