Storage: Eliminating listing storage account when its resource ID is available to use GET (#28617)

magodo · web-flow · commit 7e1587f3b347 · 2025-03-05T09:25:17.000+01:00
* Eliminating SA list when the full ARM ID is available (using GET instead)

* include storage_account_queue_properties_data_plane_resource
diff --git a/internal/services/storage/client/helpers.go b/internal/services/storage/client/helpers.go
@@ -184,6 +184,32 @@ func (c Client) FindAccount(ctx context.Context, subscriptionIdRaw, accountName
 	return nil, nil
 }
 
+func (c Client) GetAccount(ctx context.Context, id commonids.StorageAccountId) (*AccountDetails, error) {
+	cacheAccountsLock.Lock()
+	defer cacheAccountsLock.Unlock()
+
+	if existing, ok := storageAccountsCache[id.StorageAccountName]; ok {
+		return &existing, nil
+	}
+
+	resp, err := c.ResourceManager.StorageAccounts.GetProperties(ctx, id, storageaccounts.DefaultGetPropertiesOperationOptions())
+	if err != nil {
+		return nil, fmt.Errorf("retrieving %s: %v", id, err)
+	}
+
+	if resp.Model == nil {
+		return nil, fmt.Errorf("unexpected null model of %s", id)
+	}
+
+	account, err := populateAccountDetails(id, *resp.Model)
+	if err != nil {
+		return nil, fmt.Errorf("populating details for %s: %+v", id, err)
+	}
+
+	storageAccountsCache[id.StorageAccountName] = *account
+	return account, nil
+}
+
 func populateAccountDetails(accountId commonids.StorageAccountId, account storageaccounts.StorageAccount) (*AccountDetails, error) {
 	out := AccountDetails{
 		Kind:             pointer.From(account.Kind),
diff --git a/internal/services/storage/storage_account_queue_properties_data_plane_resource.go b/internal/services/storage/storage_account_queue_properties_data_plane_resource.go
@@ -297,7 +297,7 @@ func (s AccountQueuePropertiesResource) Create() sdk.ResourceFunc {
 			}
 			accountReplicationType := accountReplicationTypeParts[1]
 
-			accountDetails, err := storageClient.FindAccount(ctx, accountID.SubscriptionId, accountID.StorageAccountName)
+			accountDetails, err := storageClient.GetAccount(ctx, *accountID)
 			if err != nil {
 				return err
 			}
@@ -398,7 +398,7 @@ func (s AccountQueuePropertiesResource) Read() sdk.ResourceFunc {
 
 			state.StorageAccountId = id.ID()
 
-			account, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+			account, err := storageClient.GetAccount(ctx, *id)
 			if err != nil {
 				return metadata.MarkAsGone(id)
 			}
@@ -481,7 +481,7 @@ func (s AccountQueuePropertiesResource) Delete() sdk.ResourceFunc {
 				return err
 			}
 
-			account, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+			account, err := storageClient.GetAccount(ctx, *id)
 			if err != nil {
 				return fmt.Errorf("retrieving %s: %+v", *id, err)
 			}
@@ -514,7 +514,7 @@ func (s AccountQueuePropertiesResource) Update() sdk.ResourceFunc {
 				return err
 			}
 
-			account, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+			account, err := storageClient.GetAccount(ctx, *id)
 			if err != nil {
 				return fmt.Errorf("retrieving %s: %+v", *id, err)
 			}
diff --git a/internal/services/storage/storage_account_queue_properties_data_plane_resource_test.go b/internal/services/storage/storage_account_queue_properties_data_plane_resource_test.go
@@ -158,7 +158,7 @@ func (r AccountQueuePropertiesResource) Exists(ctx context.Context, client *clie
 		return nil, err
 	}
 
-	account, err := client.Storage.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+	account, err := client.Storage.GetAccount(ctx, *id)
 	if err != nil {
 		return nil, fmt.Errorf("retrieving %s: %+v", *id, err)
 	}
diff --git a/internal/services/storage/storage_account_resource.go b/internal/services/storage/storage_account_resource.go
@@ -1516,7 +1516,7 @@ func resourceStorageAccountCreate(d *pluginsdk.ResourceData, meta interface{}) e
 	// Start of Data Plane access - this entire block can be removed for 5.0, as the data_plane_available flag becomes redundant at that time.
 	if !features.FivePointOh() && dataPlaneAvailable {
 		dataPlaneClient := meta.(*clients.Client).Storage
-		dataPlaneAccount, err := storageUtils.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+		dataPlaneAccount, err := storageUtils.GetAccount(ctx, id)
 		if err != nil {
 			return fmt.Errorf("retrieving %s: %+v", id, err)
 		}
@@ -1952,7 +1952,7 @@ func resourceStorageAccountUpdate(d *pluginsdk.ResourceData, meta interface{}) e
 				return fmt.Errorf("`queue_properties` aren't supported for account kind %q in sku tier %q", accountKind, accountTier)
 			}
 
-			account, err := dataPlaneClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+			account, err := dataPlaneClient.GetAccount(ctx, *id)
 			if err != nil {
 				return fmt.Errorf("retrieving %s: %+v", *id, err)
 			}
@@ -1980,7 +1980,7 @@ func resourceStorageAccountUpdate(d *pluginsdk.ResourceData, meta interface{}) e
 				return fmt.Errorf("`static_website` aren't supported for account kind %q in sku tier %q", accountKind, accountTier)
 			}
 
-			account, err := dataPlaneClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+			account, err := dataPlaneClient.GetAccount(ctx, *id)
 			if err != nil {
 				return fmt.Errorf("retrieving %s: %+v", *id, err)
 			}
@@ -2057,7 +2057,7 @@ func resourceStorageAccountRead(d *pluginsdk.ResourceData, meta interface{}) err
 	}
 
 	// we then need to find the storage account
-	account, err := storageUtils.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+	account, err := storageUtils.GetAccount(ctx, *id)
 	if err != nil {
 		return fmt.Errorf("retrieving %s: %+v", *id, err)
 	}
diff --git a/internal/services/storage/storage_account_static_website_data_plane_resource.go b/internal/services/storage/storage_account_static_website_data_plane_resource.go
@@ -103,7 +103,7 @@ func (a AccountStaticWebsiteResource) Create() sdk.ResourceFunc {
 			}
 			accountReplicationType := accountReplicationTypeParts[1]
 
-			accountDetails, err := storageClient.FindAccount(ctx, accountID.SubscriptionId, accountID.StorageAccountName)
+			accountDetails, err := storageClient.GetAccount(ctx, *accountID)
 			if err != nil {
 				return err
 			}
@@ -157,7 +157,7 @@ func (a AccountStaticWebsiteResource) Read() sdk.ResourceFunc {
 
 			state.StorageAccountId = id.ID()
 
-			accountDetails, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+			accountDetails, err := storageClient.GetAccount(ctx, *id)
 			if err != nil {
 				return metadata.MarkAsGone(id)
 			}
@@ -193,7 +193,7 @@ func (a AccountStaticWebsiteResource) Delete() sdk.ResourceFunc {
 				return err
 			}
 
-			accountDetails, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+			accountDetails, err := storageClient.GetAccount(ctx, *id)
 			if err != nil {
 				return nil // lint:ignore nilerr If we don't find the account we can safely assume we don't need to remove the website since it must already be deleted
 			}
@@ -233,7 +233,7 @@ func (a AccountStaticWebsiteResource) Update() sdk.ResourceFunc {
 				return err
 			}
 
-			accountDetails, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+			accountDetails, err := storageClient.GetAccount(ctx, *id)
 			if err != nil {
 				return err
 			}
diff --git a/internal/services/storage/storage_account_static_website_data_plane_resource_test.go b/internal/services/storage/storage_account_static_website_data_plane_resource_test.go
@@ -105,7 +105,7 @@ func (r AccountStaticWebsiteResource) Exists(ctx context.Context, client *client
 		return nil, err
 	}
 
-	accountDetails, err := client.Storage.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)
+	accountDetails, err := client.Storage.GetAccount(ctx, *id)
 	if err != nil {
 		return nil, fmt.Errorf("retrieving %s: %+v", *id, err)
 	}
diff --git a/internal/services/storage/storage_containers_data_source.go b/internal/services/storage/storage_containers_data_source.go
@@ -89,7 +89,6 @@ func (r storageContainersDataSource) Read() sdk.ResourceFunc {
 
 		Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {
 			blobContainersClient := metadata.Client.Storage.ResourceManager.BlobContainers
-			subscriptionId := metadata.Client.Account.SubscriptionId
 
 			var plan storageContainersDataSourceModel
 			if err := metadata.Decode(&plan); err != nil {
@@ -101,7 +100,7 @@ func (r storageContainersDataSource) Read() sdk.ResourceFunc {
 				return err
 			}
 
-			account, err := metadata.Client.Storage.FindAccount(ctx, subscriptionId, id.StorageAccountName)
+			account, err := metadata.Client.Storage.GetAccount(ctx, *id)
 			if err != nil {
 				return fmt.Errorf("retrieving Storage Account %q: %v", id.StorageAccountName, err)
 			}

Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@ func (s AccountQueuePropertiesResource) Create() sdk.ResourceFunc {`
`297`	`297`	`}`
`298`	`298`	`accountReplicationType := accountReplicationTypeParts[1]`
`299`	`299`
`300`		`- accountDetails, err := storageClient.FindAccount(ctx, accountID.SubscriptionId, accountID.StorageAccountName)`
	`300`	`+ accountDetails, err := storageClient.GetAccount(ctx, *accountID)`
`301`	`301`	`if err != nil {`
`302`	`302`	`return err`
`303`	`303`	`}`
`@@ -398,7 +398,7 @@ func (s AccountQueuePropertiesResource) Read() sdk.ResourceFunc {`
`398`	`398`
`399`	`399`	`state.StorageAccountId = id.ID()`
`400`	`400`
`401`		`- account, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`401`	`+ account, err := storageClient.GetAccount(ctx, *id)`
`402`	`402`	`if err != nil {`
`403`	`403`	`return metadata.MarkAsGone(id)`
`404`	`404`	`}`
`@@ -481,7 +481,7 @@ func (s AccountQueuePropertiesResource) Delete() sdk.ResourceFunc {`
`481`	`481`	`return err`
`482`	`482`	`}`
`483`	`483`
`484`		`- account, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`484`	`+ account, err := storageClient.GetAccount(ctx, *id)`
`485`	`485`	`if err != nil {`
`486`	`486`	`return fmt.Errorf("retrieving %s: %+v", *id, err)`
`487`	`487`	`}`
`@@ -514,7 +514,7 @@ func (s AccountQueuePropertiesResource) Update() sdk.ResourceFunc {`
`514`	`514`	`return err`
`515`	`515`	`}`
`516`	`516`
`517`		`- account, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`517`	`+ account, err := storageClient.GetAccount(ctx, *id)`
`518`	`518`	`if err != nil {`
`519`	`519`	`return fmt.Errorf("retrieving %s: %+v", *id, err)`
`520`	`520`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ func (r AccountQueuePropertiesResource) Exists(ctx context.Context, client *clie`
`158`	`158`	`return nil, err`
`159`	`159`	`}`
`160`	`160`
`161`		`- account, err := client.Storage.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`161`	`+ account, err := client.Storage.GetAccount(ctx, *id)`
`162`	`162`	`if err != nil {`
`163`	`163`	`return nil, fmt.Errorf("retrieving %s: %+v", *id, err)`
`164`	`164`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1516,7 +1516,7 @@ func resourceStorageAccountCreate(d *pluginsdk.ResourceData, meta interface{}) e`
`1516`	`1516`	`// Start of Data Plane access - this entire block can be removed for 5.0, as the data_plane_available flag becomes redundant at that time.`
`1517`	`1517`	`if !features.FivePointOh() && dataPlaneAvailable {`
`1518`	`1518`	`dataPlaneClient := meta.(*clients.Client).Storage`
`1519`		`- dataPlaneAccount, err := storageUtils.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`1519`	`+ dataPlaneAccount, err := storageUtils.GetAccount(ctx, id)`
`1520`	`1520`	`if err != nil {`
`1521`	`1521`	`return fmt.Errorf("retrieving %s: %+v", id, err)`
`1522`	`1522`	`}`
`@@ -1952,7 +1952,7 @@ func resourceStorageAccountUpdate(d *pluginsdk.ResourceData, meta interface{}) e`
`1952`	`1952`	return fmt.Errorf("`queue_properties` aren't supported for account kind %q in sku tier %q", accountKind, accountTier)
`1953`	`1953`	`}`
`1954`	`1954`
`1955`		`- account, err := dataPlaneClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`1955`	`+ account, err := dataPlaneClient.GetAccount(ctx, *id)`
`1956`	`1956`	`if err != nil {`
`1957`	`1957`	`return fmt.Errorf("retrieving %s: %+v", *id, err)`
`1958`	`1958`	`}`
`@@ -1980,7 +1980,7 @@ func resourceStorageAccountUpdate(d *pluginsdk.ResourceData, meta interface{}) e`
`1980`	`1980`	return fmt.Errorf("`static_website` aren't supported for account kind %q in sku tier %q", accountKind, accountTier)
`1981`	`1981`	`}`
`1982`	`1982`
`1983`		`- account, err := dataPlaneClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`1983`	`+ account, err := dataPlaneClient.GetAccount(ctx, *id)`
`1984`	`1984`	`if err != nil {`
`1985`	`1985`	`return fmt.Errorf("retrieving %s: %+v", *id, err)`
`1986`	`1986`	`}`
`@@ -2057,7 +2057,7 @@ func resourceStorageAccountRead(d *pluginsdk.ResourceData, meta interface{}) err`
`2057`	`2057`	`}`
`2058`	`2058`
`2059`	`2059`	`// we then need to find the storage account`
`2060`		`- account, err := storageUtils.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`2060`	`+ account, err := storageUtils.GetAccount(ctx, *id)`
`2061`	`2061`	`if err != nil {`
`2062`	`2062`	`return fmt.Errorf("retrieving %s: %+v", *id, err)`
`2063`	`2063`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (a AccountStaticWebsiteResource) Create() sdk.ResourceFunc {`
`103`	`103`	`}`
`104`	`104`	`accountReplicationType := accountReplicationTypeParts[1]`
`105`	`105`
`106`		`- accountDetails, err := storageClient.FindAccount(ctx, accountID.SubscriptionId, accountID.StorageAccountName)`
	`106`	`+ accountDetails, err := storageClient.GetAccount(ctx, *accountID)`
`107`	`107`	`if err != nil {`
`108`	`108`	`return err`
`109`	`109`	`}`
`@@ -157,7 +157,7 @@ func (a AccountStaticWebsiteResource) Read() sdk.ResourceFunc {`
`157`	`157`
`158`	`158`	`state.StorageAccountId = id.ID()`
`159`	`159`
`160`		`- accountDetails, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`160`	`+ accountDetails, err := storageClient.GetAccount(ctx, *id)`
`161`	`161`	`if err != nil {`
`162`	`162`	`return metadata.MarkAsGone(id)`
`163`	`163`	`}`
`@@ -193,7 +193,7 @@ func (a AccountStaticWebsiteResource) Delete() sdk.ResourceFunc {`
`193`	`193`	`return err`
`194`	`194`	`}`
`195`	`195`
`196`		`- accountDetails, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`196`	`+ accountDetails, err := storageClient.GetAccount(ctx, *id)`
`197`	`197`	`if err != nil {`
`198`	`198`	`return nil // lint:ignore nilerr If we don't find the account we can safely assume we don't need to remove the website since it must already be deleted`
`199`	`199`	`}`
`@@ -233,7 +233,7 @@ func (a AccountStaticWebsiteResource) Update() sdk.ResourceFunc {`
`233`	`233`	`return err`
`234`	`234`	`}`
`235`	`235`
`236`		`- accountDetails, err := storageClient.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`236`	`+ accountDetails, err := storageClient.GetAccount(ctx, *id)`
`237`	`237`	`if err != nil {`
`238`	`238`	`return err`
`239`	`239`	`}`
Original file line number	Diff line number	Diff line change
`@@ -105,7 +105,7 @@ func (r AccountStaticWebsiteResource) Exists(ctx context.Context, client *client`
`105`	`105`	`return nil, err`
`106`	`106`	`}`
`107`	`107`
`108`		`- accountDetails, err := client.Storage.FindAccount(ctx, id.SubscriptionId, id.StorageAccountName)`
	`108`	`+ accountDetails, err := client.Storage.GetAccount(ctx, *id)`
`109`	`109`	`if err != nil {`
`110`	`110`	`return nil, fmt.Errorf("retrieving %s: %+v", *id, err)`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ func (r storageContainersDataSource) Read() sdk.ResourceFunc {`
`89`	`89`
`90`	`90`	`Func: func(ctx context.Context, metadata sdk.ResourceMetaData) error {`
`91`	`91`	`blobContainersClient := metadata.Client.Storage.ResourceManager.BlobContainers`
`92`		`- subscriptionId := metadata.Client.Account.SubscriptionId`
`93`	`92`
`94`	`93`	`var plan storageContainersDataSourceModel`
`95`	`94`	`if err := metadata.Decode(&plan); err != nil {`
`@@ -101,7 +100,7 @@ func (r storageContainersDataSource) Read() sdk.ResourceFunc {`
`101`	`100`	`return err`
`102`	`101`	`}`
`103`	`102`
`104`		`- account, err := metadata.Client.Storage.FindAccount(ctx, subscriptionId, id.StorageAccountName)`
	`103`	`+ account, err := metadata.Client.Storage.GetAccount(ctx, *id)`
`105`	`104`	`if err != nil {`
`106`	`105`	`return fmt.Errorf("retrieving Storage Account %q: %v", id.StorageAccountName, err)`
`107`	`106`	`}`