Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug: List storage accounts returns only first page #5075

Merged
merged 2 commits into from
Dec 9, 2019
Merged

Bug: List storage accounts returns only first page #5075

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e578b3
iterate through pages returned by list storage accounts to get all st…
benjamin37 Dec 5, 2019
6d67fe4
checking error when moving to next page of storage accounts
benjamin37 Dec 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions azurerm/internal/services/storage/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (client Client) AddToCache(accountName string, props storage.Account) error
accountsLock.Lock()
defer accountsLock.Unlock()

account, err := client.populateAccountDetails(accountName, props)
account, err := populateAccountDetails(accountName, props)
if err != nil {
return err
}
Expand All @@ -80,17 +80,26 @@ func (client Client) FindAccount(ctx context.Context, accountName string) (*acco
return &existing, nil
}

accounts, err := client.AccountsClient.List(ctx)
accountsPage, err := client.AccountsClient.List(ctx)
if err != nil {
return nil, fmt.Errorf("Error retrieving storage accounts: %+v", err)
}

for _, v := range accounts.Values() {
var accounts []storage.Account
for accountsPage.NotDone() {
accounts = append(accounts, accountsPage.Values()...)
err = accountsPage.NextWithContext(ctx)
if err != nil {
return nil, fmt.Errorf("Error retrieving next page of storage accounts: %+v", err)
}
}

for _, v := range accounts {
if v.Name == nil {
continue
}

account, err := client.populateAccountDetails(*v.Name, v)
account, err := populateAccountDetails(*v.Name, v)
if err != nil {
return nil, err
}
Expand All @@ -105,7 +114,7 @@ func (client Client) FindAccount(ctx context.Context, accountName string) (*acco
return nil, nil
}

func (client Client) populateAccountDetails(accountName string, props storage.Account) (*accountDetails, error) {
func populateAccountDetails(accountName string, props storage.Account) (*accountDetails, error) {
if props.ID == nil {
return nil, fmt.Errorf("`id` was nil for Account %q", accountName)
}
Expand Down