Skip to content

Commit 6fb70d1

Browse files
authored
Merge pull request #16 from meeehow/gcp
Change how GCP images are listed.
2 parents 749cb98 + 87d8931 commit 6fb70d1

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

importers/gcp/gcp.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -181,18 +181,18 @@ func (r *Repo) RepoPath() string {
181181

182182
// DiscoverRepo traverses GCP project and looks for images.
183183
func (r *Repo) DiscoverRepo() ([]hashr.Source, error) {
184-
imageList, err := computeClient.Images.List(r.projectName).Do()
185-
if err != nil {
186-
return nil, err
187-
}
188-
189-
for _, image := range imageList.Items {
190-
if image.Deprecated != nil {
191-
glog.Infof("Image %s is deprecated, skipping.", image.Name)
192-
continue
184+
req := computeClient.Images.List(r.projectName)
185+
if err := req.Pages(context.Background(), func(page *compute.ImageList) error {
186+
for _, image := range page.Items {
187+
if image.Deprecated != nil {
188+
glog.Infof("Image %s is deprecated, skipping.", image.Name)
189+
continue
190+
}
191+
r.images = append(r.images, &Image{id: fmt.Sprintf("%s-%s", r.projectName, image.Name), name: image.Name, project: r.projectName, description: image.Description})
193192
}
194-
195-
r.images = append(r.images, &Image{id: fmt.Sprintf("%s-%s", r.projectName, image.Name), name: image.Name, project: r.projectName, description: image.Description})
193+
return nil
194+
}); err != nil {
195+
return nil, err
196196
}
197197

198198
var sources []hashr.Source

0 commit comments

Comments
 (0)