Skip to content

Fix issue #6991 #6992

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

Closed
ferronsw wants to merge 1 commit into from
Closed

Fix issue #6991 #6992

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 11 additions & 4 deletions cli/azd/extensions/azure.ai.agents/internal/cmd/init_from_code.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cognitiveservices/armcognitiveservices/v2"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerregistry/armcontainerregistry"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
"github.com/azure/azure-dev/cli/azd/pkg/azdext"
"github.com/azure/azure-dev/cli/azd/pkg/ux"
"github.com/fatih/color"
Expand Down Expand Up @@ -1011,9 +1012,12 @@ func extractResourceGroup(resourceId string) string {
// listFoundryProjects enumerates all Foundry projects in a subscription by listing
// CognitiveServices accounts and their projects.
func (a *InitFromCodeAction) listFoundryProjects(ctx context.Context, subscriptionId string) ([]FoundryProjectInfo, error) {
accountsClient, err := armcognitiveservices.NewAccountsClient(subscriptionId, a.credential, azure.NewArmClientOptions())
// Use the generic armresources client instead of armcognitiveservices.AccountsClient to
// avoid an SDK unmarshal bug where armcognitiveservices.NetworkInjections is defined as
// map[string]json.RawMessage but the API returns a JSON array for that field.
resourcesClient, err := armresources.NewClient(subscriptionId, a.credential, azure.NewArmClientOptions())
if err != nil {
return nil, fmt.Errorf("failed to create accounts client: %w", err)
return nil, fmt.Errorf("failed to create resources client: %w", err)
}

projectsClient, err := armcognitiveservices.NewProjectsClient(subscriptionId, a.credential, azure.NewArmClientOptions())
Expand All @@ -1023,8 +1027,11 @@ func (a *InitFromCodeAction) listFoundryProjects(ctx context.Context, subscripti

var results []FoundryProjectInfo

// List all CognitiveServices accounts
accountPager := accountsClient.NewListPager(nil)
// List all CognitiveServices accounts using the generic resources API.
// This avoids deserializing armcognitiveservices.AccountProperties which contains
// the NetworkInjections field that the SDK mismatches with the actual API response.
accountFilter := "resourceType eq 'Microsoft.CognitiveServices/accounts'"
accountPager := resourcesClient.NewListPager(&armresources.ClientListOptions{Filter: to.Ptr(accountFilter)})
for accountPager.More() {
page, err := accountPager.NextPage(ctx)
if err != nil {
Expand Down
Loading