🐛 armresources has not returned properties for cosmo pg service (#5685)

Author: chris-rock

providers/azure/go.mod

@@ -58,6 +58,7 @@ require (
 	github.com/99designs/keyring v1.2.2 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmosforpostgresql/armcosmosforpostgresql v1.1.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/network/armnetwork v1.1.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.2.0 // indirect
 	github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect

providers/azure/go.sum

@@ -102,6 +102,8 @@ github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontai
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v2 v2.4.0/go.mod h1:U5gpsREQZE6SLk1t/cFfc1eMhYAlYpEzvaYXuDfefy8=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos v1.0.0 h1:Fv8iibGn1eSw0lt2V3cTsuokBEnOP+M//n8OiMcCgTM=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos v1.0.0/go.mod h1:Qpe/qN9d5IQ7WPtTXMRCd6+BWTnhi3sxXVys6oJ5Vho=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmosforpostgresql/armcosmosforpostgresql v1.1.0 h1:TyXI0pf9V67/vn7Vo2BebOz4B/fLj9Kt3UcrQBXMrvE=
+github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmosforpostgresql/armcosmosforpostgresql v1.1.0/go.mod h1:s//ycXE53yRslaDdkNrCEANgvrdSOaUuqcBCJg5VEX0=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2 h1:mLY+pNLjCUeKhgnAJWAKhEUQM+RJQo2H1fuGSw1Ky1E=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal v1.1.2/go.mod h1:FbdwsQ2EzwvXxOPcMFYO8ogEc9uMMIj3YkmCdXdAFmk=
 github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/internal/v2 v2.0.0 h1:PTFGRSlMKCQelWwxUyYVEUqseBJVemLyqWJjvMyt0do=

providers/azure/resources/azure.lr.go

@@ -17,6 +17,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 	cosmosdb "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos"
 	armresources "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmosforpostgresql/armcosmosforpostgresql"
 )
 
 func (a *mqlAzureSubscriptionCosmosDbService) id() (string, error) {
@@ -37,10 +38,6 @@ func initAzureSubscriptionCosmosDbService(runtime *plugin.Runtime, args map[stri
 	return args, nil, nil
 }
 
-func (a *mqlAzureSubscriptionCosmosDbServiceAccount) id() (string, error) {
-	return a.Id.Data, nil
-}
-
 func (a *mqlAzureSubscriptionCosmosDbService) accounts() ([]interface{}, error) {
 	conn := a.MqlRuntime.Connection.(*connection.AzureConnection)
 	ctx := context.Background()
@@ -61,7 +58,7 @@ func (a *mqlAzureSubscriptionCosmosDbService) accounts() ([]interface{}, error)
 	}
 	res = append(res, mongoAccounts...)
 
-	postgresAccounts, err := fetchDbAccountsByType(ctx, a.MqlRuntime, conn, subId, "Microsoft.DBforPostgreSQL/serverGroupsv2")
+	postgresAccounts, err := fetchCosmosForPostgres(ctx, a.MqlRuntime, conn, subId)
 	if err != nil {
 		return nil, err
 	}
@@ -93,6 +90,7 @@ func fetchCosmosDBAccounts(ctx context.Context, runtime *plugin.Runtime, conn *c
 
 			mqlCosmosDbAccount, err := CreateResource(runtime, "azure.subscription.cosmosDbService.account",
 				map[string]*llx.RawData{
+					"__id":       llx.StringDataPtr(account.ID),
 					"id":         llx.StringDataPtr(account.ID),
 					"name":       llx.StringDataPtr(account.Name),
 					"tags":       llx.MapData(convert.PtrMapStrToInterface(account.Tags), types.String),
@@ -136,6 +134,7 @@ func fetchDbAccountsByType(ctx context.Context, runtime *plugin.Runtime, conn *c
 
 			mqlResource, err := CreateResource(runtime, "azure.subscription.cosmosDbService.account",
 				map[string]*llx.RawData{
+					"__id":       llx.StringDataPtr(account.ID),
 					"id":         llx.StringDataPtr(account.ID),
 					"name":       llx.StringDataPtr(account.Name),
 					"tags":       llx.MapData(convert.PtrMapStrToInterface(account.Tags), types.String),
@@ -152,3 +151,45 @@ func fetchDbAccountsByType(ctx context.Context, runtime *plugin.Runtime, conn *c
 	}
 	return res, nil
 }
+
+// fetches resources of type "Microsoft.DBforPostgreSQL/serverGroupsv2"
+func fetchCosmosForPostgres(ctx context.Context, runtime *plugin.Runtime, conn *connection.AzureConnection, subId string) ([]interface{}, error) {
+	resClient, err := armcosmosforpostgresql.NewClustersClient(subId, conn.Token(), &arm.ClientOptions{
+		ClientOptions: conn.ClientOptions(),
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	res := []interface{}{}
+	pager := resClient.NewListPager(&armcosmosforpostgresql.ClustersClientListOptions{})
+	for pager.More() {
+		page, err := pager.NextPage(ctx)
+		if err != nil {
+			return nil, err
+		}
+		for _, account := range page.Value {
+			properties, err := convert.JsonToDict(account.Properties)
+			if err != nil {
+				return nil, err
+			}
+
+			mqlResource, err := CreateResource(runtime, "azure.subscription.cosmosDbService.account",
+				map[string]*llx.RawData{
+					"__id":       llx.StringDataPtr(account.ID),
+					"id":         llx.StringDataPtr(account.ID),
+					"name":       llx.StringDataPtr(account.Name),
+					"tags":       llx.MapData(convert.PtrMapStrToInterface(account.Tags), types.String),
+					"location":   llx.StringDataPtr(account.Location),
+					"kind":       llx.StringDataPtr(nil),
+					"type":       llx.StringDataPtr(account.Type),
+					"properties": llx.DictData(properties),
+				})
+			if err != nil {
+				return nil, err
+			}
+			res = append(res, mqlResource)
+		}
+	}
+	return res, nil
+}