Merge branch 'main' into Kusto/auto-generate

Author: anthony-c-martin

generator/autogenlist.ts

@@ -8,6 +8,8 @@ import { postProcessor as storageProcessor } from './processors/Microsoft.Storag
 import { postProcessor as computeProcessor } from './processors/Microsoft.Compute';
 import { postProcessor as policyProcessor } from './processors/Microsoft.Authorization';
 import { postProcessor as securityInsightsPostProcessor } from './processors/Microsoft.SecurityInsights';
+import { postProcessor as costManagementPostProcessor } from './processors/Microsoft.CostManagement';
+import { postProcessor as providerHubPostProcessor } from './processors/Microsoft.ProviderHub';
 import { lowerCaseEquals } from './utils';
 
 // New providers are onboarded by default. The providers listed here are the only ones **not** onboarded.
@@ -17,21 +19,6 @@ const disabledProviders: AutoGenConfig[] = [
         namespace: 'Microsoft.Advisor',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'agrifood/resource-manager',
-        namespace: 'Microsoft.AgFoodPlatform',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'azurestackhci/resource-manager',
-        namespace: 'Microsoft.AzureStackHCI',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'baremetalinfrastructure/resource-manager',
-        namespace: 'Microsoft.BareMetalInfrastructure',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'cloudshell/resource-manager',
         namespace: 'Microsoft.Portal',
@@ -42,92 +29,33 @@ const disabledProviders: AutoGenConfig[] = [
         namespace: 'Microsoft.ContainerService',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'confidentialledger/resource-manager',
-        namespace: 'Microsoft.ConfidentialLedger',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'cost-management/resource-manager',
-        namespace: 'Microsoft.CostManagement',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'cpim/resource-manager',
-        namespace: 'Microsoft.AzureActiveDirectory',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'dataprotection/resource-manager',
-        namespace: 'Microsoft.DataProtection',
-        disabledForAutogen: true,
-    },
     {
         // Disabled as the swagger spec contains a type ("DateTimeRfc1123") which autorest is unable to parse: https://github.com/Azure/autorest.azureresourceschema/issues/71
         basePath: 'domainservices/resource-manager',
         namespace: 'Microsoft.AAD',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'dfp/resource-manager',
-        namespace: 'Microsoft.Dynamics365Fraudprotection',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'dnc/resource-manager',
-        namespace: 'Microsoft.DelegatedNetwork',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'dns/resource-manager',
         namespace: 'Microsoft.Network',
         disabledForAutogen: true,
     },
     {
-        basePath: 'edgeorder/resource-manager',
-        namespace: 'Microsoft.EdgeOrder',
-        disabledForAutogen: true,
-    },
-    {
+        // Disabled as the swagger spec contains a bug (enum mismatch)
         basePath: 'edgeorderpartner/resource-manager',
         namespace: 'Microsoft.EdgeOrderPartner',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'fluidrelay/resource-manager',
-        namespace: 'Microsoft.FluidRelay',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'iotsecurity/resource-manager',
-        namespace: 'Microsoft.IoTSecurity',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'logic/resource-manager',
         namespace: 'Microsoft.Logic',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'm365securityandcompliance/resource-manager',
-        namespace: 'Microsoft.M365SecurityAndCompliance',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'managedservices/resource-manager',
         namespace: 'Microsoft.ManagedServices',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'marketplacenotifications/resource-manager',
-        namespace: 'Microsoft.MarketplaceNotifications',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'marketplaceordering/resource-manager',
-        namespace: 'Microsoft.MarketplaceOrdering',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'mediaservices/resource-manager',
         namespace: 'Microsoft.Media',
@@ -153,46 +81,11 @@ const disabledProviders: AutoGenConfig[] = [
         namespace: 'Microsoft.Network',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'providerhub/resource-manager',
-        namespace: 'Microsoft.ProviderHub',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'quota/resource-manager',
-        namespace: 'Microsoft.Quota',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'resources/resource-manager',
-        namespace: 'Microsoft.Features',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'resources/resource-manager',
-        namespace: 'Microsoft.Solutions',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'securityandcompliance/resource-manager',
-        namespace: 'Microsoft.SecurityAndCompliance',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'service-map/resource-manager',
         namespace: 'Microsoft.OperationalInsights',
         disabledForAutogen: true,
     },
-    {
-        basePath: 'servicefabricmanagedclusters/resource-manager',
-        namespace: 'Microsoft.ServiceFabricManagedClusters',
-        disabledForAutogen: true,
-    },
-    {
-        basePath: 'testbase/resource-manager',
-        namespace: 'Microsoft.TestBase',
-        disabledForAutogen: true,
-    },
     {
         basePath: 'trafficmanager/resource-manager',
         namespace: 'Microsoft.Network',
@@ -358,6 +251,25 @@ const autoGenList: AutoGenConfig[] = [
             },
         ],
     },
+    {
+        basePath: 'cost-management/resource-manager',
+        namespace: 'Microsoft.CostManagement',
+        resourceConfig: [
+            {
+                type: 'exports',
+                scopes: ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup,
+            },
+            {
+                type: 'budgets',
+                scopes: ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
+            },
+            {
+                type: 'views',
+                scopes: ScopeType.Tenant | ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
+            },
+        ],
+        postProcessor: costManagementPostProcessor,
+    },
     {
         basePath: 'customerlockbox/resource-manager',
         namespace: 'Microsoft.CustomerLockbox',
@@ -491,6 +403,16 @@ const autoGenList: AutoGenConfig[] = [
         basePath: 'hybridcompute/resource-manager',
         namespace: 'Microsoft.HybridCompute',
     },
+    {
+        basePath: 'hybridconnectivity/resource-manager',
+        namespace: 'Microsoft.HybridConnectivity',
+        resourceConfig: [
+            {
+                type: 'endpoints',
+                scopes: ScopeType.Extension,
+            }
+        ]
+    },
     {
         basePath: 'hybriddatamanager/resource-manager',
         namespace: 'Microsoft.HybridData',
@@ -507,6 +429,20 @@ const autoGenList: AutoGenConfig[] = [
         basePath: 'iotspaces/resource-manager',
         namespace: 'Microsoft.IoTSpaces',
     },
+    {
+        basePath: 'iotsecurity/resource-manager',
+        namespace: 'Microsoft.IoTSecurity',
+        resourceConfig: [
+            {
+                type: 'sensors',
+                scopes: ScopeType.Extension,
+            },
+            {
+                type: 'sites',
+                scopes: ScopeType.Extension,
+            }
+        ]
+    },
     {
         basePath: 'intune/resource-manager',
         namespace: 'Microsoft.Intune',
@@ -651,6 +587,25 @@ const autoGenList: AutoGenConfig[] = [
         basePath: 'powerbiembedded/resource-manager',
         namespace: 'Microsoft.PowerBI',
     },
+    {
+        basePath: 'providerhub/resource-manager',
+        namespace: 'Microsoft.ProviderHub',
+        postProcessor: providerHubPostProcessor
+    },
+    {
+        basePath: 'quota/resource-manager',
+        namespace: 'Microsoft.Quota',
+        resourceConfig: [
+            {
+                type: 'quotaLimits',
+                scopes: ScopeType.Extension,
+            },
+            {
+                type: 'quotas',
+                scopes: ScopeType.Extension,
+            },
+        ],
+    },
     {
         basePath: 'redhatopenshift/resource-manager',
         namespace: 'Microsoft.RedHatOpenShift',
@@ -690,6 +645,10 @@ const autoGenList: AutoGenConfig[] = [
                 type: 'policyExemptions',
                 scopes: ScopeType.ManagementGroup | ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,
             },
+            {
+                type: 'policyPricings',
+                scopes: ScopeType.ManagementGroup | ScopeType.Subcription,
+            },
             {
                 type: 'locks',
                 scopes: ScopeType.Subcription | ScopeType.ResourceGroup | ScopeType.Extension,

generator/processors/Microsoft.CostManagement.ts

@@ -0,0 +1,18 @@
+import { SchemaPostProcessor } from '../models';
+import { replaceCyclicRef } from './helpers';
+
+export const postProcessor: SchemaPostProcessor = async (namespace: string, apiVersion: string, schema: any) => {
+  replaceCyclicRef(schema.definitions?.ReportConfigFilter?.properties?.and?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.ReportConfigFilter?.properties?.not?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.ReportConfigFilter?.properties?.or?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.ReportFilter?.properties?.and?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.ReportFilter?.properties?.not?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.ReportFilter?.properties?.or?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.QueryFilter?.properties?.and?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.QueryFilter?.properties?.not?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.QueryFilter?.properties?.or?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.QueryFilterModel?.properties?.and?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.QueryFilterModel?.properties?.not?.oneOf[0]);
+  replaceCyclicRef(schema.definitions?.QueryFilterModel?.properties?.or?.oneOf[0]?.items);
+  replaceCyclicRef(schema.definitions?.Scope?.properties?.childScope?.oneOf[0]);
+}

generator/processors/Microsoft.ProviderHub.ts

@@ -0,0 +1,6 @@
+import { SchemaPostProcessor } from '../models';
+import { replaceCyclicRef } from './helpers';
+
+export const postProcessor: SchemaPostProcessor = async (namespace: string, apiVersion: string, schema: any) => {
+  replaceCyclicRef(schema.definitions?.ExtendedErrorInfo?.properties?.details?.oneOf[0]?.items);
+}