Filter location prompts by resource provider availability #6502
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,8 +7,10 @@ import ( | |
| "context" | ||
| "fmt" | ||
| "sort" | ||
| "strings" | ||
|
|
||
| "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" | ||
| "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources" | ||
| "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/auth" | ||
| "github.com/azure/azure-dev/cli/azd/pkg/compare" | ||
|
|
@@ -143,6 +145,137 @@ func (s *SubscriptionsService) ListSubscriptionLocations( | |
| return locations, nil | ||
| } | ||
|
|
||
| // LocationFilterOptions provides filtering options for location queries | ||
| type LocationFilterOptions struct { | ||
| // ResourceTypes filters by specific resource types (e.g., "Microsoft.App/containerApps") | ||
| ResourceTypes []string | ||
| } | ||
|
|
||
| // ListSubscriptionLocationsWithFilter lists physical locations with optional resource type filtering. | ||
| // When ResourceTypes are provided, only locations that support ALL specified resource types are returned. | ||
| func (s *SubscriptionsService) ListSubscriptionLocationsWithFilter( | ||
| ctx context.Context, | ||
| subscriptionId string, | ||
| tenantId string, | ||
| options *LocationFilterOptions, | ||
| ) ([]Location, error) { | ||
| // Get all physical locations first | ||
| allLocations, err := s.ListSubscriptionLocations(ctx, subscriptionId, tenantId) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // If no filtering options or no resource types specified, return all locations | ||
| if options == nil || len(options.ResourceTypes) == 0 { | ||
| return allLocations, nil | ||
| } | ||
|
|
||
| // Check resource type availability for each location | ||
| filteredLocations := []Location{} | ||
| for _, location := range allLocations { | ||
| supported, err := s.checkResourceTypesAvailability( | ||
| ctx, subscriptionId, tenantId, location.Name, options.ResourceTypes) | ||
|
Comment on lines
+175
to
+177
Contributor
There was a problem hiding this comment. This is going to be real expensive. For each location, we are querying every single resource type to see if the location should be filtered, i.e. Number of queries = number of locations x number of resource types |
||
| if err != nil { | ||
| // Log error but continue with other locations to provide best-effort filtering. | ||
| // If all locations fail, an empty list will be returned, prompting the user to check permissions. | ||
| fmt.Printf("warning: failed to check resource availability for location %s: %v\n", location.Name, err) | ||
|
There was a problem hiding this comment. Direct This issue also appears in the following locations of the same file:
|
||
| continue | ||
| } | ||
|
|
||
| if supported { | ||
| filteredLocations = append(filteredLocations, location) | ||
| } | ||
| } | ||
|
|
||
| return filteredLocations, nil | ||
| } | ||
|
|
||
| // checkResourceTypesAvailability checks if all specified resource types are available in the given location. | ||
| func (s *SubscriptionsService) checkResourceTypesAvailability( | ||
| ctx context.Context, | ||
| subscriptionId string, | ||
| tenantId string, | ||
| locationName string, | ||
| resourceTypes []string, | ||
| ) (bool, error) { | ||
| if len(resourceTypes) == 0 { | ||
| return true, nil | ||
| } | ||
|
|
||
| // Group resource types by provider namespace | ||
| providerResourceTypes := make(map[string][]string) | ||
| for _, resourceType := range resourceTypes { | ||
| parts := strings.SplitN(resourceType, "/", 2) | ||
| if len(parts) != 2 { | ||
| // Skip invalid resource types (should be in format "Provider/Type") | ||
| // This could indicate a template parsing issue, so log for debugging | ||
| fmt.Printf( | ||
| "warning: skipping invalid resource type format '%s' (expected 'Provider/Type')\n", | ||
| resourceType) | ||
| continue | ||
| } | ||
| providerNamespace := parts[0] | ||
| typeName := parts[1] | ||
| providerResourceTypes[providerNamespace] = append(providerResourceTypes[providerNamespace], typeName) | ||
| } | ||
|
|
||
| // Create providers client | ||
| cred, err := s.credentialProvider.GetTokenCredential(ctx, tenantId) | ||
| if err != nil { | ||
| return false, fmt.Errorf("getting credential: %w", err) | ||
| } | ||
|
|
||
| providersClient, err := armresources.NewProvidersClient(subscriptionId, cred, s.armClientOptions) | ||
| if err != nil { | ||
| return false, fmt.Errorf("creating providers client: %w", err) | ||
| } | ||
|
|
||
| // Check each provider's resource types | ||
| for providerNamespace, typeNames := range providerResourceTypes { | ||
| provider, err := providersClient.Get(ctx, providerNamespace, nil) | ||
| if err != nil { | ||
| return false, fmt.Errorf("getting provider %s: %w", providerNamespace, err) | ||
| } | ||
|
|
||
| // Check if provider is registered | ||
| if provider.RegistrationState == nil || *provider.RegistrationState != "Registered" { | ||
| return false, nil | ||
| } | ||
|
|
||
| // Check each resource type | ||
| for _, typeName := range typeNames { | ||
| found := false | ||
| if provider.ResourceTypes != nil { | ||
| for _, rt := range provider.ResourceTypes { | ||
| if rt.ResourceType != nil && *rt.ResourceType == typeName { | ||
| // Check if this location is supported | ||
| if rt.Locations != nil { | ||
| locationSupported := false | ||
| for _, loc := range rt.Locations { | ||
| if loc != nil && strings.EqualFold(*loc, locationName) { | ||
| locationSupported = true | ||
| break | ||
| } | ||
| } | ||
| if !locationSupported { | ||
| return false, nil | ||
| } | ||
| } | ||
| found = true | ||
| break | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if !found { | ||
| return false, nil | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return true, nil | ||
| } | ||
|
|
||
| func (s *SubscriptionsService) ListTenants(ctx context.Context) ([]armsubscriptions.TenantIDDescription, error) { | ||
| client, err := s.createTenantsClient(ctx) | ||
| if err != nil { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
When the capacity is unknown but likely to be less than
len(allLocations), consider usingmake([]Location, 0, len(allLocations))to pre-allocate the slice with capacity to avoid reallocations during append operations.