@azure-rest/purview-scanning 1.0.0-alpha.20210901.2 → 1.0.0-beta.2

package/types/purview-scanning-rest.d.ts

@@ -1,795 +1,563 @@
 import { Client } from '@azure-rest/core-client';
 import { ClientOptions } from '@azure-rest/core-client';
 import { HttpResponse } from '@azure-rest/core-client';
+import { PagedAsyncIterableIterator } from '@azure/core-paging';
+import { PathUncheckedResponse } from '@azure-rest/core-client';
 import { RequestParameters } from '@azure-rest/core-client';
 import { TokenCredential } from '@azure/core-auth';
 
-export declare type AdlsGen1CredentialScan = AdlsGen1CredentialScanBase & Scan;
-
-export declare interface AdlsGen1CredentialScanBase {
+export declare interface AdlsGen1CredentialScan extends ScanBase {
     properties?: AdlsGen1CredentialScanPropertiesAutoGenerated;
+    kind: "AdlsGen1Credential";
 }
 
-export declare type AdlsGen1CredentialScanProperties = AdlsGen1CredentialScanPropertiesBase & ScanProperties;
-
-export declare type AdlsGen1CredentialScanPropertiesAutoGenerated = AdlsGen1CredentialScanPropertiesAutoGeneratedBase & AdlsGen1CredentialScanProperties;
-
-export declare interface AdlsGen1CredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AdlsGen1CredentialScanPropertiesBase {
+export declare interface AdlsGen1CredentialScanProperties extends ScanProperties {
     credential?: AdlsGen1CredentialScanPropertiesCredential;
 }
 
-export declare type AdlsGen1CredentialScanPropertiesCredential = AdlsGen1CredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AdlsGen1CredentialScanPropertiesCredentialBase {
+export declare interface AdlsGen1CredentialScanPropertiesAutoGenerated extends AdlsGen1CredentialScanProperties {
 }
 
-export declare type AdlsGen1DataSource = AdlsGen1DataSourceBase & DataSource;
+export declare interface AdlsGen1CredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AdlsGen1DataSourceBase {
+export declare interface AdlsGen1DataSource extends DataSourceBase {
     properties?: AdlsGen1DataSourceProperties;
+    kind: "AdlsGen1";
 }
 
-export declare type AdlsGen1DataSourceProperties = AdlsGen1DataSourcePropertiesBase & AdlsGen1Properties;
-
-export declare interface AdlsGen1DataSourcePropertiesBase {
+export declare interface AdlsGen1DataSourceProperties extends AdlsGen1Properties {
 }
 
-export declare type AdlsGen1MsiScan = AdlsGen1MsiScanBase & Scan;
-
-export declare interface AdlsGen1MsiScanBase {
+export declare interface AdlsGen1MsiScan extends ScanBase {
     properties?: AdlsGen1MsiScanPropertiesAutoGenerated;
+    kind: "AdlsGen1Msi";
 }
 
-export declare type AdlsGen1MsiScanProperties = AdlsGen1MsiScanPropertiesBase & ScanProperties;
-
-export declare type AdlsGen1MsiScanPropertiesAutoGenerated = AdlsGen1MsiScanPropertiesAutoGeneratedBase & AdlsGen1MsiScanProperties;
-
-export declare interface AdlsGen1MsiScanPropertiesAutoGeneratedBase {
+export declare interface AdlsGen1MsiScanProperties extends ScanProperties {
 }
 
-export declare interface AdlsGen1MsiScanPropertiesBase {
+export declare interface AdlsGen1MsiScanPropertiesAutoGenerated extends AdlsGen1MsiScanProperties {
 }
 
-export declare type AdlsGen1Properties = AdlsGen1PropertiesBase & AzureDataSourceProperties;
-
-export declare interface AdlsGen1PropertiesBase {
+export declare interface AdlsGen1Properties extends AzureDataSourceProperties {
     endpoint?: string;
 }
 
-export declare type AdlsGen1ScanRuleset = AdlsGen1ScanRulesetBase & ScanRuleset;
-
-export declare interface AdlsGen1ScanRulesetBase {
+export declare interface AdlsGen1ScanRuleset extends ScanRulesetBase {
     properties?: AdlsGen1ScanRulesetPropertiesAutoGenerated;
+    kind: "AdlsGen1";
 }
 
-export declare type AdlsGen1ScanRulesetProperties = AdlsGen1ScanRulesetPropertiesBase & ScanningRuleScanRulesetProperties;
-
-export declare type AdlsGen1ScanRulesetPropertiesAutoGenerated = AdlsGen1ScanRulesetPropertiesAutoGeneratedBase & AdlsGen1ScanRulesetProperties;
-
-export declare interface AdlsGen1ScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AdlsGen1ScanRulesetProperties extends ScanningRuleScanRulesetProperties {
 }
 
-export declare interface AdlsGen1ScanRulesetPropertiesBase {
+export declare interface AdlsGen1ScanRulesetPropertiesAutoGenerated extends AdlsGen1ScanRulesetProperties {
 }
 
-export declare type AdlsGen1SystemScanRuleset = AdlsGen1SystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AdlsGen1SystemScanRulesetBase {
+export declare interface AdlsGen1SystemScanRuleset extends SystemScanRulesetBase {
     properties?: AdlsGen1SystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AdlsGen1SystemScanRulesetProperties = AdlsGen1SystemScanRulesetPropertiesBase & AdlsGen1ScanRulesetProperties;
-
-export declare interface AdlsGen1SystemScanRulesetPropertiesBase {
+export declare interface AdlsGen1SystemScanRulesetProperties extends AdlsGen1ScanRulesetProperties {
 }
 
-export declare type AdlsGen2CredentialScan = AdlsGen2CredentialScanBase & Scan;
-
-export declare interface AdlsGen2CredentialScanBase {
+export declare interface AdlsGen2CredentialScan extends ScanBase {
     properties?: AdlsGen2CredentialScanPropertiesAutoGenerated;
+    kind: "AdlsGen2Credential";
 }
 
-export declare type AdlsGen2CredentialScanProperties = AdlsGen2CredentialScanPropertiesBase & ScanProperties;
-
-export declare type AdlsGen2CredentialScanPropertiesAutoGenerated = AdlsGen2CredentialScanPropertiesAutoGeneratedBase & AdlsGen2CredentialScanProperties;
-
-export declare interface AdlsGen2CredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AdlsGen2CredentialScanPropertiesBase {
+export declare interface AdlsGen2CredentialScanProperties extends ScanProperties {
     credential?: AdlsGen2CredentialScanPropertiesCredential;
 }
 
-export declare type AdlsGen2CredentialScanPropertiesCredential = AdlsGen2CredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AdlsGen2CredentialScanPropertiesCredentialBase {
+export declare interface AdlsGen2CredentialScanPropertiesAutoGenerated extends AdlsGen2CredentialScanProperties {
 }
 
-export declare type AdlsGen2DataSource = AdlsGen2DataSourceBase & DataSource;
+export declare interface AdlsGen2CredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AdlsGen2DataSourceBase {
+export declare interface AdlsGen2DataSource extends DataSourceBase {
     properties?: AdlsGen2DataSourceProperties;
+    kind: "AdlsGen2";
 }
 
-export declare type AdlsGen2DataSourceProperties = AdlsGen2DataSourcePropertiesBase & AdlsGen2Properties;
-
-export declare interface AdlsGen2DataSourcePropertiesBase {
+export declare interface AdlsGen2DataSourceProperties extends AdlsGen2Properties {
 }
 
-export declare type AdlsGen2MsiScan = AdlsGen2MsiScanBase & Scan;
-
-export declare interface AdlsGen2MsiScanBase {
+export declare interface AdlsGen2MsiScan extends ScanBase {
     properties?: AdlsGen2MsiScanPropertiesAutoGenerated;
+    kind: "AdlsGen2Msi";
 }
 
-export declare type AdlsGen2MsiScanProperties = AdlsGen2MsiScanPropertiesBase & ScanProperties;
-
-export declare type AdlsGen2MsiScanPropertiesAutoGenerated = AdlsGen2MsiScanPropertiesAutoGeneratedBase & AdlsGen2MsiScanProperties;
-
-export declare interface AdlsGen2MsiScanPropertiesAutoGeneratedBase {
+export declare interface AdlsGen2MsiScanProperties extends ScanProperties {
 }
 
-export declare interface AdlsGen2MsiScanPropertiesBase {
+export declare interface AdlsGen2MsiScanPropertiesAutoGenerated extends AdlsGen2MsiScanProperties {
 }
 
-export declare type AdlsGen2Properties = AdlsGen2PropertiesBase & AzureDataSourceProperties;
-
-export declare interface AdlsGen2PropertiesBase {
+export declare interface AdlsGen2Properties extends AzureDataSourceProperties {
     endpoint?: string;
 }
 
-export declare type AdlsGen2ScanRuleset = AdlsGen2ScanRulesetBase & ScanRuleset;
-
-export declare interface AdlsGen2ScanRulesetBase {
+export declare interface AdlsGen2ScanRuleset extends ScanRulesetBase {
     properties?: AdlsGen2ScanRulesetPropertiesAutoGenerated;
+    kind: "AdlsGen2";
 }
 
-export declare type AdlsGen2ScanRulesetProperties = AdlsGen2ScanRulesetPropertiesBase & ScanningRuleScanRulesetProperties;
-
-export declare type AdlsGen2ScanRulesetPropertiesAutoGenerated = AdlsGen2ScanRulesetPropertiesAutoGeneratedBase & AdlsGen2ScanRulesetProperties;
-
-export declare interface AdlsGen2ScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AdlsGen2ScanRulesetProperties extends ScanningRuleScanRulesetProperties {
 }
 
-export declare interface AdlsGen2ScanRulesetPropertiesBase {
+export declare interface AdlsGen2ScanRulesetPropertiesAutoGenerated extends AdlsGen2ScanRulesetProperties {
 }
 
-export declare type AdlsGen2SystemScanRuleset = AdlsGen2SystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AdlsGen2SystemScanRulesetBase {
+export declare interface AdlsGen2SystemScanRuleset extends SystemScanRulesetBase {
     properties?: AdlsGen2SystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AdlsGen2SystemScanRulesetProperties = AdlsGen2SystemScanRulesetPropertiesBase & AdlsGen2ScanRulesetProperties;
-
-export declare interface AdlsGen2SystemScanRulesetPropertiesBase {
+export declare interface AdlsGen2SystemScanRulesetProperties extends AdlsGen2ScanRulesetProperties {
 }
 
-export declare type AmazonAccountCredentialScan = AmazonAccountCredentialScanBase & Scan;
-
-export declare interface AmazonAccountCredentialScanBase {
+export declare interface AmazonAccountCredentialScan extends ScanBase {
     properties?: AmazonAccountCredentialScanPropertiesAutoGenerated;
+    kind: "AmazonAccountCredential";
 }
 
-export declare type AmazonAccountCredentialScanProperties = AmazonAccountCredentialScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AmazonAccountCredentialScanPropertiesAutoGenerated = AmazonAccountCredentialScanPropertiesAutoGeneratedBase & AmazonAccountCredentialScanProperties;
-
-export declare interface AmazonAccountCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AmazonAccountCredentialScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AmazonAccountCredentialScanPropertiesBase {
+export declare interface AmazonAccountCredentialScanPropertiesAutoGenerated extends AmazonAccountCredentialScanProperties {
 }
 
-export declare type AmazonAccountDataSource = AmazonAccountDataSourceBase & DataSource;
-
-export declare interface AmazonAccountDataSourceBase {
+export declare interface AmazonAccountDataSource extends DataSourceBase {
     properties?: AmazonAccountDataSourceProperties;
+    kind: "AmazonAccount";
 }
 
-export declare type AmazonAccountDataSourceProperties = AmazonAccountDataSourcePropertiesBase & AmazonAccountProperties;
-
-export declare interface AmazonAccountDataSourcePropertiesBase {
+export declare interface AmazonAccountDataSourceProperties extends AmazonAccountProperties {
 }
 
-export declare type AmazonAccountProperties = AmazonAccountPropertiesBase & DataSourceProperties;
-
-export declare interface AmazonAccountPropertiesBase {
+export declare interface AmazonAccountProperties extends DataSourceProperties {
     awsAccountId?: string;
     roleARN?: string;
 }
 
-export declare type AmazonAccountScanRuleset = AmazonAccountScanRulesetBase & ScanRuleset;
-
-export declare interface AmazonAccountScanRulesetBase {
+export declare interface AmazonAccountScanRuleset extends ScanRulesetBase {
     properties?: AmazonAccountScanRulesetPropertiesAutoGenerated;
+    kind: "AmazonAccount";
 }
 
-export declare type AmazonAccountScanRulesetProperties = AmazonAccountScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AmazonAccountScanRulesetPropertiesAutoGenerated = AmazonAccountScanRulesetPropertiesAutoGeneratedBase & AmazonAccountScanRulesetProperties;
-
-export declare interface AmazonAccountScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AmazonAccountScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AmazonAccountScanRulesetPropertiesBase {
+export declare interface AmazonAccountScanRulesetPropertiesAutoGenerated extends AmazonAccountScanRulesetProperties {
 }
 
-export declare type AmazonAccountSystemScanRuleset = AmazonAccountSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AmazonAccountSystemScanRulesetBase {
+export declare interface AmazonAccountSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AmazonAccountSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AmazonAccountSystemScanRulesetProperties = AmazonAccountSystemScanRulesetPropertiesBase & AmazonAccountScanRulesetProperties;
-
-export declare interface AmazonAccountSystemScanRulesetPropertiesBase {
+export declare interface AmazonAccountSystemScanRulesetProperties extends AmazonAccountScanRulesetProperties {
 }
 
-export declare type AmazonPostgreSqlCredentialScan = AmazonPostgreSqlCredentialScanBase & Scan;
-
-export declare interface AmazonPostgreSqlCredentialScanBase {
+export declare interface AmazonPostgreSqlCredentialScan extends ScanBase {
     properties?: AmazonPostgreSqlCredentialScanPropertiesAutoGenerated;
+    kind: "AmazonPostgreSqlCredential";
 }
 
-export declare type AmazonPostgreSqlCredentialScanProperties = AmazonPostgreSqlCredentialScanPropertiesBase & ScanProperties;
-
-export declare type AmazonPostgreSqlCredentialScanPropertiesAutoGenerated = AmazonPostgreSqlCredentialScanPropertiesAutoGeneratedBase & AmazonPostgreSqlCredentialScanProperties;
-
-export declare interface AmazonPostgreSqlCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AmazonPostgreSqlCredentialScanPropertiesBase {
+export declare interface AmazonPostgreSqlCredentialScanProperties extends ScanProperties {
     credential?: AmazonPostgreSqlCredentialScanPropertiesCredential;
     serverEndpoint?: string;
     databaseName?: string;
     port?: string;
 }
 
-export declare type AmazonPostgreSqlCredentialScanPropertiesCredential = AmazonPostgreSqlCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AmazonPostgreSqlCredentialScanPropertiesCredentialBase {
+export declare interface AmazonPostgreSqlCredentialScanPropertiesAutoGenerated extends AmazonPostgreSqlCredentialScanProperties {
 }
 
-export declare type AmazonPostgreSqlDataSource = AmazonPostgreSqlDataSourceBase & DataSource;
+export declare interface AmazonPostgreSqlCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AmazonPostgreSqlDataSourceBase {
+export declare interface AmazonPostgreSqlDataSource extends DataSourceBase {
     properties?: AmazonPostgreSqlDataSourceProperties;
+    kind: "AmazonPostgreSql";
 }
 
-export declare type AmazonPostgreSqlDataSourceProperties = AmazonPostgreSqlDataSourcePropertiesBase & AmazonPostgreSqlProperties;
-
-export declare interface AmazonPostgreSqlDataSourcePropertiesBase {
+export declare interface AmazonPostgreSqlDataSourceProperties extends AmazonPostgreSqlProperties {
 }
 
-export declare type AmazonPostgreSqlProperties = AmazonPostgreSqlPropertiesBase & DataSourceProperties;
-
-export declare interface AmazonPostgreSqlPropertiesBase {
+export declare interface AmazonPostgreSqlProperties extends DataSourceProperties {
     serverEndpoint?: string;
     port?: string;
 }
 
-export declare type AmazonPostgreSqlScanRuleset = AmazonPostgreSqlScanRulesetBase & ScanRuleset;
-
-export declare interface AmazonPostgreSqlScanRulesetBase {
+export declare interface AmazonPostgreSqlScanRuleset extends ScanRulesetBase {
     properties?: AmazonPostgreSqlScanRulesetPropertiesAutoGenerated;
+    kind: "AmazonPostgreSql";
 }
 
-export declare type AmazonPostgreSqlScanRulesetProperties = AmazonPostgreSqlScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AmazonPostgreSqlScanRulesetPropertiesAutoGenerated = AmazonPostgreSqlScanRulesetPropertiesAutoGeneratedBase & AmazonPostgreSqlScanRulesetProperties;
-
-export declare interface AmazonPostgreSqlScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AmazonPostgreSqlScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AmazonPostgreSqlScanRulesetPropertiesBase {
+export declare interface AmazonPostgreSqlScanRulesetPropertiesAutoGenerated extends AmazonPostgreSqlScanRulesetProperties {
 }
 
-export declare type AmazonPostgreSqlSystemScanRuleset = AmazonPostgreSqlSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AmazonPostgreSqlSystemScanRulesetBase {
+export declare interface AmazonPostgreSqlSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AmazonPostgreSqlSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AmazonPostgreSqlSystemScanRulesetProperties = AmazonPostgreSqlSystemScanRulesetPropertiesBase & AmazonPostgreSqlScanRulesetProperties;
-
-export declare interface AmazonPostgreSqlSystemScanRulesetPropertiesBase {
+export declare interface AmazonPostgreSqlSystemScanRulesetProperties extends AmazonPostgreSqlScanRulesetProperties {
 }
 
-export declare type AmazonS3CredentialScan = AmazonS3CredentialScanBase & Scan;
-
-export declare interface AmazonS3CredentialScanBase {
+export declare interface AmazonS3CredentialScan extends ScanBase {
     properties?: AmazonS3CredentialScanPropertiesAutoGenerated;
+    kind: "AmazonS3Credential";
 }
 
-export declare type AmazonS3CredentialScanProperties = AmazonS3CredentialScanPropertiesBase & ScanProperties;
-
-export declare type AmazonS3CredentialScanPropertiesAutoGenerated = AmazonS3CredentialScanPropertiesAutoGeneratedBase & AmazonS3CredentialScanProperties;
-
-export declare interface AmazonS3CredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AmazonS3CredentialScanPropertiesBase {
+export declare interface AmazonS3CredentialScanProperties extends ScanProperties {
     credential?: AmazonS3CredentialScanPropertiesCredential;
     roleARN?: string;
 }
 
-export declare type AmazonS3CredentialScanPropertiesCredential = AmazonS3CredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AmazonS3CredentialScanPropertiesCredentialBase {
+export declare interface AmazonS3CredentialScanPropertiesAutoGenerated extends AmazonS3CredentialScanProperties {
 }
 
-export declare type AmazonS3DataSource = AmazonS3DataSourceBase & DataSource;
+export declare interface AmazonS3CredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AmazonS3DataSourceBase {
+export declare interface AmazonS3DataSource extends DataSourceBase {
     properties?: AmazonS3DataSourceProperties;
+    kind: "AmazonS3";
 }
 
-export declare type AmazonS3DataSourceProperties = AmazonS3DataSourcePropertiesBase & AmazonS3Properties;
-
-export declare interface AmazonS3DataSourcePropertiesBase {
+export declare interface AmazonS3DataSourceProperties extends AmazonS3Properties {
 }
 
-export declare type AmazonS3Properties = AmazonS3PropertiesBase & DataSourceProperties;
-
-export declare interface AmazonS3PropertiesBase {
+export declare interface AmazonS3Properties extends DataSourceProperties {
     serviceUrl?: string;
     roleARN?: string;
 }
 
-export declare type AmazonS3RoleARNScan = AmazonS3RoleARNScanBase & Scan;
-
-export declare interface AmazonS3RoleARNScanBase {
+export declare interface AmazonS3RoleARNScan extends ScanBase {
     properties?: AmazonS3RoleARNScanPropertiesAutoGenerated;
+    kind: "AmazonS3RoleARN";
 }
 
-export declare type AmazonS3RoleARNScanProperties = AmazonS3RoleARNScanPropertiesBase & ScanProperties;
-
-export declare type AmazonS3RoleARNScanPropertiesAutoGenerated = AmazonS3RoleARNScanPropertiesAutoGeneratedBase & AmazonS3RoleARNScanProperties;
-
-export declare interface AmazonS3RoleARNScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AmazonS3RoleARNScanPropertiesBase {
+export declare interface AmazonS3RoleARNScanProperties extends ScanProperties {
     roleARN?: string;
 }
 
-export declare type AmazonS3ScanRuleset = AmazonS3ScanRulesetBase & ScanRuleset;
+export declare interface AmazonS3RoleARNScanPropertiesAutoGenerated extends AmazonS3RoleARNScanProperties {
+}
 
-export declare interface AmazonS3ScanRulesetBase {
+export declare interface AmazonS3ScanRuleset extends ScanRulesetBase {
     properties?: AmazonS3ScanRulesetPropertiesAutoGenerated;
+    kind: "AmazonS3";
 }
 
-export declare type AmazonS3ScanRulesetProperties = AmazonS3ScanRulesetPropertiesBase & ScanningRuleScanRulesetProperties;
-
-export declare type AmazonS3ScanRulesetPropertiesAutoGenerated = AmazonS3ScanRulesetPropertiesAutoGeneratedBase & AmazonS3ScanRulesetProperties;
-
-export declare interface AmazonS3ScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AmazonS3ScanRulesetProperties extends ScanningRuleScanRulesetProperties {
 }
 
-export declare interface AmazonS3ScanRulesetPropertiesBase {
+export declare interface AmazonS3ScanRulesetPropertiesAutoGenerated extends AmazonS3ScanRulesetProperties {
 }
 
-export declare type AmazonS3SystemScanRuleset = AmazonS3SystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AmazonS3SystemScanRulesetBase {
+export declare interface AmazonS3SystemScanRuleset extends SystemScanRulesetBase {
     properties?: AmazonS3SystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AmazonS3SystemScanRulesetProperties = AmazonS3SystemScanRulesetPropertiesBase & AmazonS3ScanRulesetProperties;
-
-export declare interface AmazonS3SystemScanRulesetPropertiesBase {
+export declare interface AmazonS3SystemScanRulesetProperties extends AmazonS3ScanRulesetProperties {
 }
 
-export declare type AmazonSqlCredentialScan = AmazonSqlCredentialScanBase & Scan;
-
-export declare interface AmazonSqlCredentialScanBase {
+export declare interface AmazonSqlCredentialScan extends ScanBase {
     properties?: AmazonSqlCredentialScanPropertiesAutoGenerated;
+    kind: "AmazonSqlCredential";
 }
 
-export declare type AmazonSqlCredentialScanProperties = AmazonSqlCredentialScanPropertiesBase & ScanProperties;
-
-export declare type AmazonSqlCredentialScanPropertiesAutoGenerated = AmazonSqlCredentialScanPropertiesAutoGeneratedBase & AmazonSqlCredentialScanProperties;
-
-export declare interface AmazonSqlCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AmazonSqlCredentialScanPropertiesBase {
+export declare interface AmazonSqlCredentialScanProperties extends ScanProperties {
     credential?: AmazonSqlCredentialScanPropertiesCredential;
     serverEndpoint?: string;
     databaseName?: string;
 }
 
-export declare type AmazonSqlCredentialScanPropertiesCredential = AmazonSqlCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AmazonSqlCredentialScanPropertiesCredentialBase {
+export declare interface AmazonSqlCredentialScanPropertiesAutoGenerated extends AmazonSqlCredentialScanProperties {
 }
 
-export declare type AmazonSqlDataSource = AmazonSqlDataSourceBase & DataSource;
+export declare interface AmazonSqlCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AmazonSqlDataSourceBase {
+export declare interface AmazonSqlDataSource extends DataSourceBase {
     properties?: AmazonSqlDataSourceProperties;
+    kind: "AmazonSql";
 }
 
-export declare type AmazonSqlDataSourceProperties = AmazonSqlDataSourcePropertiesBase & AmazonSqlProperties;
-
-export declare interface AmazonSqlDataSourcePropertiesBase {
+export declare interface AmazonSqlDataSourceProperties extends AmazonSqlProperties {
 }
 
-export declare type AmazonSqlProperties = AmazonSqlPropertiesBase & DataSourceProperties;
-
-export declare interface AmazonSqlPropertiesBase {
+export declare interface AmazonSqlProperties extends DataSourceProperties {
     serverEndpoint?: string;
 }
 
-export declare type AmazonSqlScanRuleset = AmazonSqlScanRulesetBase & ScanRuleset;
-
-export declare interface AmazonSqlScanRulesetBase {
+export declare interface AmazonSqlScanRuleset extends ScanRulesetBase {
     properties?: AmazonSqlScanRulesetPropertiesAutoGenerated;
+    kind: "AmazonSql";
 }
 
-export declare type AmazonSqlScanRulesetProperties = AmazonSqlScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AmazonSqlScanRulesetPropertiesAutoGenerated = AmazonSqlScanRulesetPropertiesAutoGeneratedBase & AmazonSqlScanRulesetProperties;
-
-export declare interface AmazonSqlScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AmazonSqlScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AmazonSqlScanRulesetPropertiesBase {
+export declare interface AmazonSqlScanRulesetPropertiesAutoGenerated extends AmazonSqlScanRulesetProperties {
 }
 
-export declare type AmazonSqlSystemScanRuleset = AmazonSqlSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AmazonSqlSystemScanRulesetBase {
+export declare interface AmazonSqlSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AmazonSqlSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AmazonSqlSystemScanRulesetProperties = AmazonSqlSystemScanRulesetPropertiesBase & AmazonSqlScanRulesetProperties;
-
-export declare interface AmazonSqlSystemScanRulesetPropertiesBase {
+export declare interface AmazonSqlSystemScanRulesetProperties extends AmazonSqlScanRulesetProperties {
 }
 
-export declare type AzureCosmosDbCredentialScan = AzureCosmosDbCredentialScanBase & Scan;
-
-export declare interface AzureCosmosDbCredentialScanBase {
+export declare interface AzureCosmosDbCredentialScan extends ScanBase {
     properties?: AzureCosmosDbCredentialScanPropertiesAutoGenerated;
+    kind: "AzureCosmosDbCredential";
 }
 
-export declare type AzureCosmosDbCredentialScanProperties = AzureCosmosDbCredentialScanPropertiesBase & ScanProperties;
-
-export declare type AzureCosmosDbCredentialScanPropertiesAutoGenerated = AzureCosmosDbCredentialScanPropertiesAutoGeneratedBase & AzureCosmosDbCredentialScanProperties;
-
-export declare interface AzureCosmosDbCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AzureCosmosDbCredentialScanPropertiesBase {
+export declare interface AzureCosmosDbCredentialScanProperties extends ScanProperties {
     credential?: AzureCosmosDbCredentialScanPropertiesCredential;
     databaseName?: string;
 }
 
-export declare type AzureCosmosDbCredentialScanPropertiesCredential = AzureCosmosDbCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AzureCosmosDbCredentialScanPropertiesCredentialBase {
+export declare interface AzureCosmosDbCredentialScanPropertiesAutoGenerated extends AzureCosmosDbCredentialScanProperties {
 }
 
-export declare type AzureCosmosDbDataSource = AzureCosmosDbDataSourceBase & DataSource;
+export declare interface AzureCosmosDbCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AzureCosmosDbDataSourceBase {
+export declare interface AzureCosmosDbDataSource extends DataSourceBase {
     properties?: AzureCosmosDbDataSourceProperties;
+    kind: "AzureCosmosDb";
 }
 
-export declare type AzureCosmosDbDataSourceProperties = AzureCosmosDbDataSourcePropertiesBase & AzureCosmosDbProperties;
-
-export declare interface AzureCosmosDbDataSourcePropertiesBase {
+export declare interface AzureCosmosDbDataSourceProperties extends AzureCosmosDbProperties {
 }
 
-export declare type AzureCosmosDbProperties = AzureCosmosDbPropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureCosmosDbPropertiesBase {
+export declare interface AzureCosmosDbProperties extends AzureDataSourceProperties {
     accountUri?: string;
 }
 
-export declare type AzureCosmosDbScanRuleset = AzureCosmosDbScanRulesetBase & ScanRuleset;
-
-export declare interface AzureCosmosDbScanRulesetBase {
+export declare interface AzureCosmosDbScanRuleset extends ScanRulesetBase {
     properties?: AzureCosmosDbScanRulesetPropertiesAutoGenerated;
+    kind: "AzureCosmosDb";
 }
 
-export declare type AzureCosmosDbScanRulesetProperties = AzureCosmosDbScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureCosmosDbScanRulesetPropertiesAutoGenerated = AzureCosmosDbScanRulesetPropertiesAutoGeneratedBase & AzureCosmosDbScanRulesetProperties;
-
-export declare interface AzureCosmosDbScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureCosmosDbScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureCosmosDbScanRulesetPropertiesBase {
+export declare interface AzureCosmosDbScanRulesetPropertiesAutoGenerated extends AzureCosmosDbScanRulesetProperties {
 }
 
-export declare type AzureCosmosDbSystemScanRuleset = AzureCosmosDbSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureCosmosDbSystemScanRulesetBase {
+export declare interface AzureCosmosDbSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureCosmosDbSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureCosmosDbSystemScanRulesetProperties = AzureCosmosDbSystemScanRulesetPropertiesBase & AzureCosmosDbScanRulesetProperties;
-
-export declare interface AzureCosmosDbSystemScanRulesetPropertiesBase {
+export declare interface AzureCosmosDbSystemScanRulesetProperties extends AzureCosmosDbScanRulesetProperties {
 }
 
-export declare type AzureDataExplorerCredentialScan = AzureDataExplorerCredentialScanBase & Scan;
-
-export declare interface AzureDataExplorerCredentialScanBase {
+export declare interface AzureDataExplorerCredentialScan extends ScanBase {
     properties?: AzureDataExplorerCredentialScanPropertiesAutoGenerated;
+    kind: "AzureDataExplorerCredential";
 }
 
-export declare type AzureDataExplorerCredentialScanProperties = AzureDataExplorerCredentialScanPropertiesBase & ScanProperties;
-
-export declare type AzureDataExplorerCredentialScanPropertiesAutoGenerated = AzureDataExplorerCredentialScanPropertiesAutoGeneratedBase & AzureDataExplorerCredentialScanProperties;
-
-export declare interface AzureDataExplorerCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AzureDataExplorerCredentialScanPropertiesBase {
+export declare interface AzureDataExplorerCredentialScanProperties extends ScanProperties {
     credential?: AzureDataExplorerCredentialScanPropertiesCredential;
     database?: string;
 }
 
-export declare type AzureDataExplorerCredentialScanPropertiesCredential = AzureDataExplorerCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AzureDataExplorerCredentialScanPropertiesCredentialBase {
+export declare interface AzureDataExplorerCredentialScanPropertiesAutoGenerated extends AzureDataExplorerCredentialScanProperties {
 }
 
-export declare type AzureDataExplorerDataSource = AzureDataExplorerDataSourceBase & DataSource;
+export declare interface AzureDataExplorerCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AzureDataExplorerDataSourceBase {
+export declare interface AzureDataExplorerDataSource extends DataSourceBase {
     properties?: AzureDataExplorerDataSourceProperties;
+    kind: "AzureDataExplorer";
 }
 
-export declare type AzureDataExplorerDataSourceProperties = AzureDataExplorerDataSourcePropertiesBase & AzureDataExplorerProperties;
-
-export declare interface AzureDataExplorerDataSourcePropertiesBase {
+export declare interface AzureDataExplorerDataSourceProperties extends AzureDataExplorerProperties {
 }
 
-export declare type AzureDataExplorerMsiScan = AzureDataExplorerMsiScanBase & Scan;
-
-export declare interface AzureDataExplorerMsiScanBase {
+export declare interface AzureDataExplorerMsiScan extends ScanBase {
     properties?: AzureDataExplorerMsiScanPropertiesAutoGenerated;
+    kind: "AzureDataExplorerMsi";
 }
 
-export declare type AzureDataExplorerMsiScanProperties = AzureDataExplorerMsiScanPropertiesBase & ScanProperties;
-
-export declare type AzureDataExplorerMsiScanPropertiesAutoGenerated = AzureDataExplorerMsiScanPropertiesAutoGeneratedBase & AzureDataExplorerMsiScanProperties;
-
-export declare interface AzureDataExplorerMsiScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AzureDataExplorerMsiScanPropertiesBase {
+export declare interface AzureDataExplorerMsiScanProperties extends ScanProperties {
     database?: string;
 }
 
-export declare type AzureDataExplorerProperties = AzureDataExplorerPropertiesBase & AzureDataSourceProperties;
+export declare interface AzureDataExplorerMsiScanPropertiesAutoGenerated extends AzureDataExplorerMsiScanProperties {
+}
 
-export declare interface AzureDataExplorerPropertiesBase {
+export declare interface AzureDataExplorerProperties extends AzureDataSourceProperties {
     endpoint?: string;
 }
 
-export declare type AzureDataExplorerScanRuleset = AzureDataExplorerScanRulesetBase & ScanRuleset;
-
-export declare interface AzureDataExplorerScanRulesetBase {
+export declare interface AzureDataExplorerScanRuleset extends ScanRulesetBase {
     properties?: AzureDataExplorerScanRulesetPropertiesAutoGenerated;
+    kind: "AzureDataExplorer";
 }
 
-export declare type AzureDataExplorerScanRulesetProperties = AzureDataExplorerScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureDataExplorerScanRulesetPropertiesAutoGenerated = AzureDataExplorerScanRulesetPropertiesAutoGeneratedBase & AzureDataExplorerScanRulesetProperties;
-
-export declare interface AzureDataExplorerScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureDataExplorerScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureDataExplorerScanRulesetPropertiesBase {
+export declare interface AzureDataExplorerScanRulesetPropertiesAutoGenerated extends AzureDataExplorerScanRulesetProperties {
 }
 
-export declare type AzureDataExplorerSystemScanRuleset = AzureDataExplorerSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureDataExplorerSystemScanRulesetBase {
+export declare interface AzureDataExplorerSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureDataExplorerSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureDataExplorerSystemScanRulesetProperties = AzureDataExplorerSystemScanRulesetPropertiesBase & AzureDataExplorerScanRulesetProperties;
-
-export declare interface AzureDataExplorerSystemScanRulesetPropertiesBase {
+export declare interface AzureDataExplorerSystemScanRulesetProperties extends AzureDataExplorerScanRulesetProperties {
 }
 
-export declare type AzureDataSourceProperties = AzureDataSourcePropertiesBase & DataSourceProperties;
-
-export declare interface AzureDataSourcePropertiesBase {
+export declare interface AzureDataSourceProperties extends DataSourceProperties {
     resourceGroup?: string;
     subscriptionId?: string;
     location?: string;
     resourceName?: string;
 }
 
-export declare type AzureFileServiceCredentialScan = AzureFileServiceCredentialScanBase & Scan;
-
-export declare interface AzureFileServiceCredentialScanBase {
+export declare interface AzureFileServiceCredentialScan extends ScanBase {
     properties?: AzureFileServiceCredentialScanPropertiesAutoGenerated;
+    kind: "AzureFileServiceCredential";
 }
 
-export declare type AzureFileServiceCredentialScanProperties = AzureFileServiceCredentialScanPropertiesBase & ScanProperties;
-
-export declare type AzureFileServiceCredentialScanPropertiesAutoGenerated = AzureFileServiceCredentialScanPropertiesAutoGeneratedBase & AzureFileServiceCredentialScanProperties;
-
-export declare interface AzureFileServiceCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AzureFileServiceCredentialScanPropertiesBase {
+export declare interface AzureFileServiceCredentialScanProperties extends ScanProperties {
     credential?: AzureFileServiceCredentialScanPropertiesCredential;
     shareName?: string;
 }
 
-export declare type AzureFileServiceCredentialScanPropertiesCredential = AzureFileServiceCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AzureFileServiceCredentialScanPropertiesCredentialBase {
+export declare interface AzureFileServiceCredentialScanPropertiesAutoGenerated extends AzureFileServiceCredentialScanProperties {
 }
 
-export declare type AzureFileServiceDataSource = AzureFileServiceDataSourceBase & DataSource;
+export declare interface AzureFileServiceCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AzureFileServiceDataSourceBase {
+export declare interface AzureFileServiceDataSource extends DataSourceBase {
     properties?: AzureFileServiceDataSourceProperties;
+    kind: "AzureFileService";
 }
 
-export declare type AzureFileServiceDataSourceProperties = AzureFileServiceDataSourcePropertiesBase & AzureFileServiceProperties;
-
-export declare interface AzureFileServiceDataSourcePropertiesBase {
+export declare interface AzureFileServiceDataSourceProperties extends AzureFileServiceProperties {
 }
 
-export declare type AzureFileServiceProperties = AzureFileServicePropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureFileServicePropertiesBase {
+export declare interface AzureFileServiceProperties extends AzureDataSourceProperties {
     endpoint?: string;
 }
 
-export declare type AzureFileServiceScanRuleset = AzureFileServiceScanRulesetBase & ScanRuleset;
-
-export declare interface AzureFileServiceScanRulesetBase {
+export declare interface AzureFileServiceScanRuleset extends ScanRulesetBase {
     properties?: AzureFileServiceScanRulesetPropertiesAutoGenerated;
+    kind: "AzureFileService";
 }
 
-export declare type AzureFileServiceScanRulesetProperties = AzureFileServiceScanRulesetPropertiesBase & ScanningRuleScanRulesetProperties;
-
-export declare type AzureFileServiceScanRulesetPropertiesAutoGenerated = AzureFileServiceScanRulesetPropertiesAutoGeneratedBase & AzureFileServiceScanRulesetProperties;
-
-export declare interface AzureFileServiceScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureFileServiceScanRulesetProperties extends ScanningRuleScanRulesetProperties {
 }
 
-export declare interface AzureFileServiceScanRulesetPropertiesBase {
+export declare interface AzureFileServiceScanRulesetPropertiesAutoGenerated extends AzureFileServiceScanRulesetProperties {
 }
 
-export declare type AzureFileServiceSystemScanRuleset = AzureFileServiceSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureFileServiceSystemScanRulesetBase {
+export declare interface AzureFileServiceSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureFileServiceSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureFileServiceSystemScanRulesetProperties = AzureFileServiceSystemScanRulesetPropertiesBase & AzureFileServiceScanRulesetProperties;
-
-export declare interface AzureFileServiceSystemScanRulesetPropertiesBase {
+export declare interface AzureFileServiceSystemScanRulesetProperties extends AzureFileServiceScanRulesetProperties {
 }
 
-export declare type AzureKeyVault = AzureKeyVaultBase & ProxyResource;
-
-export declare interface AzureKeyVaultBase {
-    properties?: AzureKeyVaultProperties;
+export declare interface AzureKeyVault extends ProxyResource {
+    properties?: AzureKeyVaultPropertiesAutoGenerated;
 }
 
 export declare interface AzureKeyVaultList {
-    value?: AzureKeyVault[];
+    value?: Array<AzureKeyVault>;
     nextLink?: string;
     count?: number;
 }
 
-export declare type AzureKeyVaultProperties = AzureKeyVaultPropertiesBase & AzureKeyVaultPropertiesAutoGenerated;
-
-export declare interface AzureKeyVaultPropertiesAutoGenerated {
+export declare interface AzureKeyVaultProperties {
     baseUrl?: string;
     description?: string;
 }
 
-export declare interface AzureKeyVaultPropertiesBase {
+export declare interface AzureKeyVaultPropertiesAutoGenerated extends AzureKeyVaultProperties {
 }
 
-export declare type AzureMySqlCredentialScan = AzureMySqlCredentialScanBase & Scan;
-
-export declare interface AzureMySqlCredentialScanBase {
+export declare interface AzureMySqlCredentialScan extends ScanBase {
     properties?: AzureMySqlCredentialScanPropertiesAutoGenerated;
+    kind: "AzureMySqlCredential";
 }
 
-export declare type AzureMySqlCredentialScanProperties = AzureMySqlCredentialScanPropertiesBase & AzureMySqlScanProperties;
-
-export declare type AzureMySqlCredentialScanPropertiesAutoGenerated = AzureMySqlCredentialScanPropertiesAutoGeneratedBase & AzureMySqlCredentialScanProperties;
-
-export declare interface AzureMySqlCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AzureMySqlCredentialScanProperties extends AzureMySqlScanProperties {
 }
 
-export declare interface AzureMySqlCredentialScanPropertiesBase {
+export declare interface AzureMySqlCredentialScanPropertiesAutoGenerated extends AzureMySqlCredentialScanProperties {
 }
 
-export declare type AzureMySqlDataSource = AzureMySqlDataSourceBase & DataSource;
-
-export declare interface AzureMySqlDataSourceBase {
+export declare interface AzureMySqlDataSource extends DataSourceBase {
     properties?: AzureMySqlDataSourceProperties;
+    kind: "AzureMySql";
 }
 
-export declare type AzureMySqlDataSourceProperties = AzureMySqlDataSourcePropertiesBase & AzureMySqlProperties;
-
-export declare interface AzureMySqlDataSourcePropertiesBase {
+export declare interface AzureMySqlDataSourceProperties extends AzureMySqlProperties {
 }
 
-export declare type AzureMySqlProperties = AzureMySqlPropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureMySqlPropertiesBase {
+export declare interface AzureMySqlProperties extends AzureDataSourceProperties {
     serverEndpoint?: string;
     port?: number;
 }
 
-export declare type AzureMySqlScanProperties = AzureMySqlScanPropertiesBase & ScanProperties;
-
-export declare interface AzureMySqlScanPropertiesBase {
+export declare interface AzureMySqlScanProperties extends ScanProperties {
     serverEndpoint?: string;
     port?: number;
     databaseName?: string;
     credential?: AzureMySqlScanPropertiesCredential;
 }
 
-export declare type AzureMySqlScanPropertiesCredential = AzureMySqlScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AzureMySqlScanPropertiesCredentialBase {
+export declare interface AzureMySqlScanPropertiesCredential extends CredentialReference {
 }
 
-export declare type AzureMySqlScanRuleset = AzureMySqlScanRulesetBase & ScanRuleset;
-
-export declare interface AzureMySqlScanRulesetBase {
+export declare interface AzureMySqlScanRuleset extends ScanRulesetBase {
     properties?: AzureMySqlScanRulesetPropertiesAutoGenerated;
+    kind: "AzureMySql";
 }
 
-export declare type AzureMySqlScanRulesetProperties = AzureMySqlScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureMySqlScanRulesetPropertiesAutoGenerated = AzureMySqlScanRulesetPropertiesAutoGeneratedBase & AzureMySqlScanRulesetProperties;
-
-export declare interface AzureMySqlScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureMySqlScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureMySqlScanRulesetPropertiesBase {
+export declare interface AzureMySqlScanRulesetPropertiesAutoGenerated extends AzureMySqlScanRulesetProperties {
 }
 
-export declare type AzureMySqlSystemScanRuleset = AzureMySqlSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureMySqlSystemScanRulesetBase {
+export declare interface AzureMySqlSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureMySqlSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureMySqlSystemScanRulesetProperties = AzureMySqlSystemScanRulesetPropertiesBase & AzureMySqlScanRulesetProperties;
-
-export declare interface AzureMySqlSystemScanRulesetPropertiesBase {
+export declare interface AzureMySqlSystemScanRulesetProperties extends AzureMySqlScanRulesetProperties {
 }
 
-export declare type AzurePostgreSqlCredentialScan = AzurePostgreSqlCredentialScanBase & Scan;
-
-export declare interface AzurePostgreSqlCredentialScanBase {
+export declare interface AzurePostgreSqlCredentialScan extends ScanBase {
     properties?: AzurePostgreSqlCredentialScanPropertiesAutoGenerated;
+    kind: "AzurePostgreSqlCredential";
 }
 
-export declare type AzurePostgreSqlCredentialScanProperties = AzurePostgreSqlCredentialScanPropertiesBase & ScanProperties;
-
-export declare type AzurePostgreSqlCredentialScanPropertiesAutoGenerated = AzurePostgreSqlCredentialScanPropertiesAutoGeneratedBase & AzurePostgreSqlCredentialScanProperties;
-
-export declare interface AzurePostgreSqlCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AzurePostgreSqlCredentialScanPropertiesBase {
+export declare interface AzurePostgreSqlCredentialScanProperties extends ScanProperties {
     credential?: AzurePostgreSqlCredentialScanPropertiesCredential;
     serverEndpoint?: string;
     databaseName?: string;
@@ -797,710 +565,504 @@ export declare interface AzurePostgreSqlCredentialScanPropertiesBase {
     sslMode?: number;
 }
 
-export declare type AzurePostgreSqlCredentialScanPropertiesCredential = AzurePostgreSqlCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AzurePostgreSqlCredentialScanPropertiesCredentialBase {
+export declare interface AzurePostgreSqlCredentialScanPropertiesAutoGenerated extends AzurePostgreSqlCredentialScanProperties {
 }
 
-export declare type AzurePostgreSqlDataSource = AzurePostgreSqlDataSourceBase & DataSource;
+export declare interface AzurePostgreSqlCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AzurePostgreSqlDataSourceBase {
+export declare interface AzurePostgreSqlDataSource extends DataSourceBase {
     properties?: AzurePostgreSqlDataSourceProperties;
+    kind: "AzurePostgreSql";
 }
 
-export declare type AzurePostgreSqlDataSourceProperties = AzurePostgreSqlDataSourcePropertiesBase & AzurePostgreSqlProperties;
-
-export declare interface AzurePostgreSqlDataSourcePropertiesBase {
+export declare interface AzurePostgreSqlDataSourceProperties extends AzurePostgreSqlProperties {
 }
 
-export declare type AzurePostgreSqlProperties = AzurePostgreSqlPropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzurePostgreSqlPropertiesBase {
+export declare interface AzurePostgreSqlProperties extends AzureDataSourceProperties {
     serverEndpoint?: string;
     port?: number;
 }
 
-export declare type AzurePostgreSqlScanRuleset = AzurePostgreSqlScanRulesetBase & ScanRuleset;
-
-export declare interface AzurePostgreSqlScanRulesetBase {
+export declare interface AzurePostgreSqlScanRuleset extends ScanRulesetBase {
     properties?: AzurePostgreSqlScanRulesetPropertiesAutoGenerated;
+    kind: "AzurePostgreSql";
 }
 
-export declare type AzurePostgreSqlScanRulesetProperties = AzurePostgreSqlScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzurePostgreSqlScanRulesetPropertiesAutoGenerated = AzurePostgreSqlScanRulesetPropertiesAutoGeneratedBase & AzurePostgreSqlScanRulesetProperties;
-
-export declare interface AzurePostgreSqlScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzurePostgreSqlScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzurePostgreSqlScanRulesetPropertiesBase {
+export declare interface AzurePostgreSqlScanRulesetPropertiesAutoGenerated extends AzurePostgreSqlScanRulesetProperties {
 }
 
-export declare type AzurePostgreSqlSystemScanRuleset = AzurePostgreSqlSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzurePostgreSqlSystemScanRulesetBase {
+export declare interface AzurePostgreSqlSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzurePostgreSqlSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzurePostgreSqlSystemScanRulesetProperties = AzurePostgreSqlSystemScanRulesetPropertiesBase & AzurePostgreSqlScanRulesetProperties;
-
-export declare interface AzurePostgreSqlSystemScanRulesetPropertiesBase {
+export declare interface AzurePostgreSqlSystemScanRulesetProperties extends AzurePostgreSqlScanRulesetProperties {
 }
 
-export declare type AzureResourceGroupCredentialScan = AzureResourceGroupCredentialScanBase & Scan;
-
-export declare interface AzureResourceGroupCredentialScanBase {
+export declare interface AzureResourceGroupCredentialScan extends ScanBase {
     properties?: AzureResourceGroupCredentialScanPropertiesAutoGenerated;
+    kind: "AzureResourceGroupCredential";
 }
 
-export declare type AzureResourceGroupCredentialScanProperties = AzureResourceGroupCredentialScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AzureResourceGroupCredentialScanPropertiesAutoGenerated = AzureResourceGroupCredentialScanPropertiesAutoGeneratedBase & AzureResourceGroupCredentialScanProperties;
-
-export declare interface AzureResourceGroupCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AzureResourceGroupCredentialScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AzureResourceGroupCredentialScanPropertiesBase {
+export declare interface AzureResourceGroupCredentialScanPropertiesAutoGenerated extends AzureResourceGroupCredentialScanProperties {
 }
 
-export declare type AzureResourceGroupDataSource = AzureResourceGroupDataSourceBase & DataSource;
-
-export declare interface AzureResourceGroupDataSourceBase {
+export declare interface AzureResourceGroupDataSource extends DataSourceBase {
     properties?: AzureResourceGroupDataSourceProperties;
+    kind: "AzureResourceGroup";
 }
 
-export declare type AzureResourceGroupDataSourceProperties = AzureResourceGroupDataSourcePropertiesBase & AzureResourceGroupProperties;
-
-export declare interface AzureResourceGroupDataSourcePropertiesBase {
+export declare interface AzureResourceGroupDataSourceProperties extends AzureResourceGroupProperties {
 }
 
-export declare type AzureResourceGroupMsiScan = AzureResourceGroupMsiScanBase & Scan;
-
-export declare interface AzureResourceGroupMsiScanBase {
+export declare interface AzureResourceGroupMsiScan extends ScanBase {
     properties?: AzureResourceGroupMsiScanPropertiesAutoGenerated;
+    kind: "AzureResourceGroupMsi";
 }
 
-export declare type AzureResourceGroupMsiScanProperties = AzureResourceGroupMsiScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AzureResourceGroupMsiScanPropertiesAutoGenerated = AzureResourceGroupMsiScanPropertiesAutoGeneratedBase & AzureResourceGroupMsiScanProperties;
-
-export declare interface AzureResourceGroupMsiScanPropertiesAutoGeneratedBase {
+export declare interface AzureResourceGroupMsiScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AzureResourceGroupMsiScanPropertiesBase {
+export declare interface AzureResourceGroupMsiScanPropertiesAutoGenerated extends AzureResourceGroupMsiScanProperties {
 }
 
-export declare type AzureResourceGroupProperties = AzureResourceGroupPropertiesBase & DataSourceProperties;
-
-export declare interface AzureResourceGroupPropertiesBase {
+export declare interface AzureResourceGroupProperties extends DataSourceProperties {
     subscriptionId?: string;
     resourceGroup?: string;
 }
 
-export declare type AzureResourceGroupScanRuleset = AzureResourceGroupScanRulesetBase & ScanRuleset;
-
-export declare interface AzureResourceGroupScanRulesetBase {
+export declare interface AzureResourceGroupScanRuleset extends ScanRulesetBase {
     properties?: AzureResourceGroupScanRulesetPropertiesAutoGenerated;
+    kind: "AzureResourceGroup";
 }
 
-export declare type AzureResourceGroupScanRulesetProperties = AzureResourceGroupScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureResourceGroupScanRulesetPropertiesAutoGenerated = AzureResourceGroupScanRulesetPropertiesAutoGeneratedBase & AzureResourceGroupScanRulesetProperties;
-
-export declare interface AzureResourceGroupScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureResourceGroupScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureResourceGroupScanRulesetPropertiesBase {
+export declare interface AzureResourceGroupScanRulesetPropertiesAutoGenerated extends AzureResourceGroupScanRulesetProperties {
 }
 
-export declare type AzureResourceGroupSystemScanRuleset = AzureResourceGroupSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureResourceGroupSystemScanRulesetBase {
+export declare interface AzureResourceGroupSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureResourceGroupSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureResourceGroupSystemScanRulesetProperties = AzureResourceGroupSystemScanRulesetPropertiesBase & AzureResourceGroupScanRulesetProperties;
-
-export declare interface AzureResourceGroupSystemScanRulesetPropertiesBase {
+export declare interface AzureResourceGroupSystemScanRulesetProperties extends AzureResourceGroupScanRulesetProperties {
 }
 
-export declare type AzureSqlCredentialScanProperties = AzureSqlCredentialScanPropertiesBase & AzureSqlScanProperties;
-
-export declare interface AzureSqlCredentialScanPropertiesBase {
+export declare interface AzureSqlCredentialScanProperties extends AzureSqlScanProperties {
     credential?: AzureSqlCredentialScanPropertiesCredential;
 }
 
-export declare type AzureSqlCredentialScanPropertiesCredential = AzureSqlCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AzureSqlCredentialScanPropertiesCredentialBase {
+export declare interface AzureSqlCredentialScanPropertiesCredential extends CredentialReference {
 }
 
-export declare type AzureSqlDatabaseCredentialScan = AzureSqlDatabaseCredentialScanBase & Scan;
-
-export declare interface AzureSqlDatabaseCredentialScanBase {
+export declare interface AzureSqlDatabaseCredentialScan extends ScanBase {
     properties?: AzureSqlDatabaseCredentialScanPropertiesAutoGenerated;
+    kind: "AzureSqlDatabaseCredential";
 }
 
-export declare type AzureSqlDatabaseCredentialScanProperties = AzureSqlDatabaseCredentialScanPropertiesBase & AzureSqlCredentialScanProperties;
-
-export declare type AzureSqlDatabaseCredentialScanPropertiesAutoGenerated = AzureSqlDatabaseCredentialScanPropertiesAutoGeneratedBase & AzureSqlDatabaseCredentialScanProperties;
-
-export declare interface AzureSqlDatabaseCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDatabaseCredentialScanProperties extends AzureSqlCredentialScanProperties {
 }
 
-export declare interface AzureSqlDatabaseCredentialScanPropertiesBase {
+export declare interface AzureSqlDatabaseCredentialScanPropertiesAutoGenerated extends AzureSqlDatabaseCredentialScanProperties {
 }
 
-export declare type AzureSqlDatabaseDataSource = AzureSqlDatabaseDataSourceBase & DataSource;
-
-export declare interface AzureSqlDatabaseDataSourceBase {
+export declare interface AzureSqlDatabaseDataSource extends DataSourceBase {
     properties?: AzureSqlDatabaseDataSourceProperties;
+    kind: "AzureSqlDatabase";
 }
 
-export declare type AzureSqlDatabaseDataSourceProperties = AzureSqlDatabaseDataSourcePropertiesBase & AzureSqlDatabaseProperties;
-
-export declare interface AzureSqlDatabaseDataSourcePropertiesBase {
+export declare interface AzureSqlDatabaseDataSourceProperties extends AzureSqlDatabaseProperties {
 }
 
-export declare type AzureSqlDatabaseManagedInstanceCredentialScan = AzureSqlDatabaseManagedInstanceCredentialScanBase & Scan;
-
-export declare interface AzureSqlDatabaseManagedInstanceCredentialScanBase {
+export declare interface AzureSqlDatabaseManagedInstanceCredentialScan extends ScanBase {
     properties?: AzureSqlDatabaseManagedInstanceCredentialScanPropertiesAutoGenerated;
+    kind: "AzureSqlDatabaseManagedInstanceCredential";
 }
 
-export declare type AzureSqlDatabaseManagedInstanceCredentialScanProperties = AzureSqlDatabaseManagedInstanceCredentialScanPropertiesBase & AzureSqlCredentialScanProperties;
-
-export declare type AzureSqlDatabaseManagedInstanceCredentialScanPropertiesAutoGenerated = AzureSqlDatabaseManagedInstanceCredentialScanPropertiesAutoGeneratedBase & AzureSqlDatabaseManagedInstanceCredentialScanProperties;
-
-export declare interface AzureSqlDatabaseManagedInstanceCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDatabaseManagedInstanceCredentialScanProperties extends AzureSqlCredentialScanProperties {
 }
 
-export declare interface AzureSqlDatabaseManagedInstanceCredentialScanPropertiesBase {
+export declare interface AzureSqlDatabaseManagedInstanceCredentialScanPropertiesAutoGenerated extends AzureSqlDatabaseManagedInstanceCredentialScanProperties {
 }
 
-export declare type AzureSqlDatabaseManagedInstanceDataSource = AzureSqlDatabaseManagedInstanceDataSourceBase & DataSource;
-
-export declare interface AzureSqlDatabaseManagedInstanceDataSourceBase {
+export declare interface AzureSqlDatabaseManagedInstanceDataSource extends DataSourceBase {
     properties?: AzureSqlDatabaseManagedInstanceDataSourceProperties;
+    kind: "AzureSqlDatabaseManagedInstance";
 }
 
-export declare type AzureSqlDatabaseManagedInstanceDataSourceProperties = AzureSqlDatabaseManagedInstanceDataSourcePropertiesBase & AzureSqlDatabaseManagedInstanceProperties;
-
-export declare interface AzureSqlDatabaseManagedInstanceDataSourcePropertiesBase {
+export declare interface AzureSqlDatabaseManagedInstanceDataSourceProperties extends AzureSqlDatabaseManagedInstanceProperties {
 }
 
-export declare type AzureSqlDatabaseManagedInstanceMsiScan = AzureSqlDatabaseManagedInstanceMsiScanBase & Scan;
-
-export declare interface AzureSqlDatabaseManagedInstanceMsiScanBase {
+export declare interface AzureSqlDatabaseManagedInstanceMsiScan extends ScanBase {
     properties?: AzureSqlDatabaseManagedInstanceMsiScanPropertiesAutoGenerated;
+    kind: "AzureSqlDatabaseManagedInstanceMsi";
 }
 
-export declare type AzureSqlDatabaseManagedInstanceMsiScanProperties = AzureSqlDatabaseManagedInstanceMsiScanPropertiesBase & AzureSqlScanProperties;
-
-export declare type AzureSqlDatabaseManagedInstanceMsiScanPropertiesAutoGenerated = AzureSqlDatabaseManagedInstanceMsiScanPropertiesAutoGeneratedBase & AzureSqlDatabaseManagedInstanceMsiScanProperties;
-
-export declare interface AzureSqlDatabaseManagedInstanceMsiScanPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDatabaseManagedInstanceMsiScanProperties extends AzureSqlScanProperties {
 }
 
-export declare interface AzureSqlDatabaseManagedInstanceMsiScanPropertiesBase {
+export declare interface AzureSqlDatabaseManagedInstanceMsiScanPropertiesAutoGenerated extends AzureSqlDatabaseManagedInstanceMsiScanProperties {
 }
 
-export declare type AzureSqlDatabaseManagedInstanceProperties = AzureSqlDatabaseManagedInstancePropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureSqlDatabaseManagedInstancePropertiesBase {
+export declare interface AzureSqlDatabaseManagedInstanceProperties extends AzureDataSourceProperties {
     serverEndpoint?: string;
 }
 
-export declare type AzureSqlDatabaseManagedInstanceScanRuleset = AzureSqlDatabaseManagedInstanceScanRulesetBase & ScanRuleset;
-
-export declare interface AzureSqlDatabaseManagedInstanceScanRulesetBase {
+export declare interface AzureSqlDatabaseManagedInstanceScanRuleset extends ScanRulesetBase {
     properties?: AzureSqlDatabaseManagedInstanceScanRulesetPropertiesAutoGenerated;
+    kind: "AzureSqlDatabaseManagedInstance";
 }
 
-export declare type AzureSqlDatabaseManagedInstanceScanRulesetProperties = AzureSqlDatabaseManagedInstanceScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureSqlDatabaseManagedInstanceScanRulesetPropertiesAutoGenerated = AzureSqlDatabaseManagedInstanceScanRulesetPropertiesAutoGeneratedBase & AzureSqlDatabaseManagedInstanceScanRulesetProperties;
-
-export declare interface AzureSqlDatabaseManagedInstanceScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDatabaseManagedInstanceScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureSqlDatabaseManagedInstanceScanRulesetPropertiesBase {
+export declare interface AzureSqlDatabaseManagedInstanceScanRulesetPropertiesAutoGenerated extends AzureSqlDatabaseManagedInstanceScanRulesetProperties {
 }
 
-export declare type AzureSqlDatabaseManagedInstanceSystemScanRuleset = AzureSqlDatabaseManagedInstanceSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureSqlDatabaseManagedInstanceSystemScanRulesetBase {
+export declare interface AzureSqlDatabaseManagedInstanceSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureSqlDatabaseManagedInstanceSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureSqlDatabaseManagedInstanceSystemScanRulesetProperties = AzureSqlDatabaseManagedInstanceSystemScanRulesetPropertiesBase & AzureSqlDatabaseManagedInstanceScanRulesetProperties;
-
-export declare interface AzureSqlDatabaseManagedInstanceSystemScanRulesetPropertiesBase {
+export declare interface AzureSqlDatabaseManagedInstanceSystemScanRulesetProperties extends AzureSqlDatabaseManagedInstanceScanRulesetProperties {
 }
 
-export declare type AzureSqlDatabaseMsiScan = AzureSqlDatabaseMsiScanBase & Scan;
-
-export declare interface AzureSqlDatabaseMsiScanBase {
+export declare interface AzureSqlDatabaseMsiScan extends ScanBase {
     properties?: AzureSqlDatabaseMsiScanPropertiesAutoGenerated;
+    kind: "AzureSqlDatabaseMsi";
 }
 
-export declare type AzureSqlDatabaseMsiScanProperties = AzureSqlDatabaseMsiScanPropertiesBase & AzureSqlScanProperties;
-
-export declare type AzureSqlDatabaseMsiScanPropertiesAutoGenerated = AzureSqlDatabaseMsiScanPropertiesAutoGeneratedBase & AzureSqlDatabaseMsiScanProperties;
-
-export declare interface AzureSqlDatabaseMsiScanPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDatabaseMsiScanProperties extends AzureSqlScanProperties {
 }
 
-export declare interface AzureSqlDatabaseMsiScanPropertiesBase {
+export declare interface AzureSqlDatabaseMsiScanPropertiesAutoGenerated extends AzureSqlDatabaseMsiScanProperties {
 }
 
-export declare type AzureSqlDatabaseProperties = AzureSqlDatabasePropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureSqlDatabasePropertiesBase {
+export declare interface AzureSqlDatabaseProperties extends AzureDataSourceProperties {
     serverEndpoint?: string;
 }
 
-export declare type AzureSqlDatabaseScanRuleset = AzureSqlDatabaseScanRulesetBase & ScanRuleset;
-
-export declare interface AzureSqlDatabaseScanRulesetBase {
+export declare interface AzureSqlDatabaseScanRuleset extends ScanRulesetBase {
     properties?: AzureSqlDatabaseScanRulesetPropertiesAutoGenerated;
+    kind: "AzureSqlDatabase";
 }
 
-export declare type AzureSqlDatabaseScanRulesetProperties = AzureSqlDatabaseScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureSqlDatabaseScanRulesetPropertiesAutoGenerated = AzureSqlDatabaseScanRulesetPropertiesAutoGeneratedBase & AzureSqlDatabaseScanRulesetProperties;
-
-export declare interface AzureSqlDatabaseScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDatabaseScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureSqlDatabaseScanRulesetPropertiesBase {
+export declare interface AzureSqlDatabaseScanRulesetPropertiesAutoGenerated extends AzureSqlDatabaseScanRulesetProperties {
 }
 
-export declare type AzureSqlDatabaseSystemScanRuleset = AzureSqlDatabaseSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureSqlDatabaseSystemScanRulesetBase {
+export declare interface AzureSqlDatabaseSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureSqlDatabaseSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureSqlDatabaseSystemScanRulesetProperties = AzureSqlDatabaseSystemScanRulesetPropertiesBase & AzureSqlDatabaseScanRulesetProperties;
-
-export declare interface AzureSqlDatabaseSystemScanRulesetPropertiesBase {
+export declare interface AzureSqlDatabaseSystemScanRulesetProperties extends AzureSqlDatabaseScanRulesetProperties {
 }
 
-export declare type AzureSqlDataWarehouseCredentialScan = AzureSqlDataWarehouseCredentialScanBase & Scan;
-
-export declare interface AzureSqlDataWarehouseCredentialScanBase {
+export declare interface AzureSqlDataWarehouseCredentialScan extends ScanBase {
     properties?: AzureSqlDataWarehouseCredentialScanPropertiesAutoGenerated;
+    kind: "AzureSqlDataWarehouseCredential";
 }
 
-export declare type AzureSqlDataWarehouseCredentialScanProperties = AzureSqlDataWarehouseCredentialScanPropertiesBase & AzureSqlCredentialScanProperties;
-
-export declare type AzureSqlDataWarehouseCredentialScanPropertiesAutoGenerated = AzureSqlDataWarehouseCredentialScanPropertiesAutoGeneratedBase & AzureSqlDataWarehouseCredentialScanProperties;
-
-export declare interface AzureSqlDataWarehouseCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDataWarehouseCredentialScanProperties extends AzureSqlCredentialScanProperties {
 }
 
-export declare interface AzureSqlDataWarehouseCredentialScanPropertiesBase {
+export declare interface AzureSqlDataWarehouseCredentialScanPropertiesAutoGenerated extends AzureSqlDataWarehouseCredentialScanProperties {
 }
 
-export declare type AzureSqlDataWarehouseDataSource = AzureSqlDataWarehouseDataSourceBase & DataSource;
-
-export declare interface AzureSqlDataWarehouseDataSourceBase {
+export declare interface AzureSqlDataWarehouseDataSource extends DataSourceBase {
     properties?: AzureSqlDataWarehouseDataSourceProperties;
+    kind: "AzureSqlDataWarehouse";
 }
 
-export declare type AzureSqlDataWarehouseDataSourceProperties = AzureSqlDataWarehouseDataSourcePropertiesBase & AzureSqlDataWarehouseProperties;
-
-export declare interface AzureSqlDataWarehouseDataSourcePropertiesBase {
+export declare interface AzureSqlDataWarehouseDataSourceProperties extends AzureSqlDataWarehouseProperties {
 }
 
-export declare type AzureSqlDataWarehouseMsiScan = AzureSqlDataWarehouseMsiScanBase & Scan;
-
-export declare interface AzureSqlDataWarehouseMsiScanBase {
+export declare interface AzureSqlDataWarehouseMsiScan extends ScanBase {
     properties?: AzureSqlDataWarehouseMsiScanPropertiesAutoGenerated;
+    kind: "AzureSqlDataWarehouseMsi";
 }
 
-export declare type AzureSqlDataWarehouseMsiScanProperties = AzureSqlDataWarehouseMsiScanPropertiesBase & AzureSqlScanProperties;
-
-export declare type AzureSqlDataWarehouseMsiScanPropertiesAutoGenerated = AzureSqlDataWarehouseMsiScanPropertiesAutoGeneratedBase & AzureSqlDataWarehouseMsiScanProperties;
-
-export declare interface AzureSqlDataWarehouseMsiScanPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDataWarehouseMsiScanProperties extends AzureSqlScanProperties {
 }
 
-export declare interface AzureSqlDataWarehouseMsiScanPropertiesBase {
+export declare interface AzureSqlDataWarehouseMsiScanPropertiesAutoGenerated extends AzureSqlDataWarehouseMsiScanProperties {
 }
 
-export declare type AzureSqlDataWarehouseProperties = AzureSqlDataWarehousePropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureSqlDataWarehousePropertiesBase {
+export declare interface AzureSqlDataWarehouseProperties extends AzureDataSourceProperties {
     serverEndpoint?: string;
 }
 
-export declare type AzureSqlDataWarehouseScanRuleset = AzureSqlDataWarehouseScanRulesetBase & ScanRuleset;
-
-export declare interface AzureSqlDataWarehouseScanRulesetBase {
+export declare interface AzureSqlDataWarehouseScanRuleset extends ScanRulesetBase {
     properties?: AzureSqlDataWarehouseScanRulesetPropertiesAutoGenerated;
+    kind: "AzureSqlDataWarehouse";
 }
 
-export declare type AzureSqlDataWarehouseScanRulesetProperties = AzureSqlDataWarehouseScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureSqlDataWarehouseScanRulesetPropertiesAutoGenerated = AzureSqlDataWarehouseScanRulesetPropertiesAutoGeneratedBase & AzureSqlDataWarehouseScanRulesetProperties;
-
-export declare interface AzureSqlDataWarehouseScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureSqlDataWarehouseScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureSqlDataWarehouseScanRulesetPropertiesBase {
+export declare interface AzureSqlDataWarehouseScanRulesetPropertiesAutoGenerated extends AzureSqlDataWarehouseScanRulesetProperties {
 }
 
-export declare type AzureSqlDataWarehouseSystemScanRuleset = AzureSqlDataWarehouseSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureSqlDataWarehouseSystemScanRulesetBase {
+export declare interface AzureSqlDataWarehouseSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureSqlDataWarehouseSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureSqlDataWarehouseSystemScanRulesetProperties = AzureSqlDataWarehouseSystemScanRulesetPropertiesBase & AzureSqlDataWarehouseScanRulesetProperties;
-
-export declare interface AzureSqlDataWarehouseSystemScanRulesetPropertiesBase {
+export declare interface AzureSqlDataWarehouseSystemScanRulesetProperties extends AzureSqlDataWarehouseScanRulesetProperties {
 }
 
-export declare type AzureSqlScanProperties = AzureSqlScanPropertiesBase & ScanProperties;
-
-export declare interface AzureSqlScanPropertiesBase {
+export declare interface AzureSqlScanProperties extends ScanProperties {
     serverEndpoint?: string;
     databaseName?: string;
 }
 
-export declare type AzureStorageCredentialScan = AzureStorageCredentialScanBase & Scan;
-
-export declare interface AzureStorageCredentialScanBase {
+export declare interface AzureStorageCredentialScan extends ScanBase {
     properties?: AzureStorageCredentialScanPropertiesAutoGenerated;
+    kind: "AzureStorageCredential";
 }
 
-export declare type AzureStorageCredentialScanProperties = AzureStorageCredentialScanPropertiesBase & ScanProperties;
-
-export declare type AzureStorageCredentialScanPropertiesAutoGenerated = AzureStorageCredentialScanPropertiesAutoGeneratedBase & AzureStorageCredentialScanProperties;
-
-export declare interface AzureStorageCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface AzureStorageCredentialScanPropertiesBase {
+export declare interface AzureStorageCredentialScanProperties extends ScanProperties {
     credential?: AzureStorageCredentialScanPropertiesCredential;
 }
 
-export declare type AzureStorageCredentialScanPropertiesCredential = AzureStorageCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface AzureStorageCredentialScanPropertiesCredentialBase {
+export declare interface AzureStorageCredentialScanPropertiesAutoGenerated extends AzureStorageCredentialScanProperties {
 }
 
-export declare type AzureStorageDataSource = AzureStorageDataSourceBase & DataSource;
+export declare interface AzureStorageCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface AzureStorageDataSourceBase {
+export declare interface AzureStorageDataSource extends DataSourceBase {
     properties?: AzureStorageDataSourceProperties;
+    kind: "AzureStorage";
 }
 
-export declare type AzureStorageDataSourceProperties = AzureStorageDataSourcePropertiesBase & AzureStorageProperties;
-
-export declare interface AzureStorageDataSourcePropertiesBase {
+export declare interface AzureStorageDataSourceProperties extends AzureStorageProperties {
 }
 
-export declare type AzureStorageMsiScan = AzureStorageMsiScanBase & Scan;
-
-export declare interface AzureStorageMsiScanBase {
+export declare interface AzureStorageMsiScan extends ScanBase {
     properties?: AzureStorageMsiScanPropertiesAutoGenerated;
+    kind: "AzureStorageMsi";
 }
 
-export declare type AzureStorageMsiScanProperties = AzureStorageMsiScanPropertiesBase & ScanProperties;
-
-export declare type AzureStorageMsiScanPropertiesAutoGenerated = AzureStorageMsiScanPropertiesAutoGeneratedBase & AzureStorageMsiScanProperties;
-
-export declare interface AzureStorageMsiScanPropertiesAutoGeneratedBase {
+export declare interface AzureStorageMsiScanProperties extends ScanProperties {
 }
 
-export declare interface AzureStorageMsiScanPropertiesBase {
+export declare interface AzureStorageMsiScanPropertiesAutoGenerated extends AzureStorageMsiScanProperties {
 }
 
-export declare type AzureStorageProperties = AzureStoragePropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureStoragePropertiesBase {
+export declare interface AzureStorageProperties extends AzureDataSourceProperties {
     endpoint?: string;
 }
 
-export declare type AzureStorageScanRuleset = AzureStorageScanRulesetBase & ScanRuleset;
-
-export declare interface AzureStorageScanRulesetBase {
+export declare interface AzureStorageScanRuleset extends ScanRulesetBase {
     properties?: AzureStorageScanRulesetPropertiesAutoGenerated;
+    kind: "AzureStorage";
 }
 
-export declare type AzureStorageScanRulesetProperties = AzureStorageScanRulesetPropertiesBase & ScanningRuleScanRulesetProperties;
-
-export declare type AzureStorageScanRulesetPropertiesAutoGenerated = AzureStorageScanRulesetPropertiesAutoGeneratedBase & AzureStorageScanRulesetProperties;
-
-export declare interface AzureStorageScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureStorageScanRulesetProperties extends ScanningRuleScanRulesetProperties {
 }
 
-export declare interface AzureStorageScanRulesetPropertiesBase {
+export declare interface AzureStorageScanRulesetPropertiesAutoGenerated extends AzureStorageScanRulesetProperties {
 }
 
-export declare type AzureStorageSystemScanRuleset = AzureStorageSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureStorageSystemScanRulesetBase {
+export declare interface AzureStorageSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureStorageSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureStorageSystemScanRulesetProperties = AzureStorageSystemScanRulesetPropertiesBase & AzureStorageScanRulesetProperties;
-
-export declare interface AzureStorageSystemScanRulesetPropertiesBase {
+export declare interface AzureStorageSystemScanRulesetProperties extends AzureStorageScanRulesetProperties {
 }
 
-export declare type AzureSubscriptionCredentialScan = AzureSubscriptionCredentialScanBase & Scan;
-
-export declare interface AzureSubscriptionCredentialScanBase {
+export declare interface AzureSubscriptionCredentialScan extends ScanBase {
     properties?: AzureSubscriptionCredentialScanPropertiesAutoGenerated;
+    kind: "AzureSubscriptionCredential";
 }
 
-export declare type AzureSubscriptionCredentialScanProperties = AzureSubscriptionCredentialScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AzureSubscriptionCredentialScanPropertiesAutoGenerated = AzureSubscriptionCredentialScanPropertiesAutoGeneratedBase & AzureSubscriptionCredentialScanProperties;
-
-export declare interface AzureSubscriptionCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AzureSubscriptionCredentialScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AzureSubscriptionCredentialScanPropertiesBase {
+export declare interface AzureSubscriptionCredentialScanPropertiesAutoGenerated extends AzureSubscriptionCredentialScanProperties {
 }
 
-export declare type AzureSubscriptionDataSource = AzureSubscriptionDataSourceBase & DataSource;
-
-export declare interface AzureSubscriptionDataSourceBase {
+export declare interface AzureSubscriptionDataSource extends DataSourceBase {
     properties?: AzureSubscriptionDataSourceProperties;
+    kind: "AzureSubscription";
 }
 
-export declare type AzureSubscriptionDataSourceProperties = AzureSubscriptionDataSourcePropertiesBase & AzureSubscriptionProperties;
-
-export declare interface AzureSubscriptionDataSourcePropertiesBase {
+export declare interface AzureSubscriptionDataSourceProperties extends AzureSubscriptionProperties {
 }
 
-export declare type AzureSubscriptionMsiScan = AzureSubscriptionMsiScanBase & Scan;
-
-export declare interface AzureSubscriptionMsiScanBase {
+export declare interface AzureSubscriptionMsiScan extends ScanBase {
     properties?: AzureSubscriptionMsiScanPropertiesAutoGenerated;
+    kind: "AzureSubscriptionMsi";
 }
 
-export declare type AzureSubscriptionMsiScanProperties = AzureSubscriptionMsiScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AzureSubscriptionMsiScanPropertiesAutoGenerated = AzureSubscriptionMsiScanPropertiesAutoGeneratedBase & AzureSubscriptionMsiScanProperties;
-
-export declare interface AzureSubscriptionMsiScanPropertiesAutoGeneratedBase {
+export declare interface AzureSubscriptionMsiScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AzureSubscriptionMsiScanPropertiesBase {
+export declare interface AzureSubscriptionMsiScanPropertiesAutoGenerated extends AzureSubscriptionMsiScanProperties {
 }
 
-export declare type AzureSubscriptionProperties = AzureSubscriptionPropertiesBase & DataSourceProperties;
-
-export declare interface AzureSubscriptionPropertiesBase {
+export declare interface AzureSubscriptionProperties extends DataSourceProperties {
     subscriptionId?: string;
 }
 
-export declare type AzureSubscriptionScanRuleset = AzureSubscriptionScanRulesetBase & ScanRuleset;
-
-export declare interface AzureSubscriptionScanRulesetBase {
+export declare interface AzureSubscriptionScanRuleset extends ScanRulesetBase {
     properties?: AzureSubscriptionScanRulesetPropertiesAutoGenerated;
+    kind: "AzureSubscription";
 }
 
-export declare type AzureSubscriptionScanRulesetProperties = AzureSubscriptionScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureSubscriptionScanRulesetPropertiesAutoGenerated = AzureSubscriptionScanRulesetPropertiesAutoGeneratedBase & AzureSubscriptionScanRulesetProperties;
-
-export declare interface AzureSubscriptionScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureSubscriptionScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureSubscriptionScanRulesetPropertiesBase {
+export declare interface AzureSubscriptionScanRulesetPropertiesAutoGenerated extends AzureSubscriptionScanRulesetProperties {
 }
 
-export declare type AzureSubscriptionSystemScanRuleset = AzureSubscriptionSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureSubscriptionSystemScanRulesetBase {
+export declare interface AzureSubscriptionSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureSubscriptionSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureSubscriptionSystemScanRulesetProperties = AzureSubscriptionSystemScanRulesetPropertiesBase & AzureSubscriptionScanRulesetProperties;
-
-export declare interface AzureSubscriptionSystemScanRulesetPropertiesBase {
+export declare interface AzureSubscriptionSystemScanRulesetProperties extends AzureSubscriptionScanRulesetProperties {
 }
 
-export declare type AzureSynapseCredentialScan = AzureSynapseCredentialScanBase & Scan;
-
-export declare interface AzureSynapseCredentialScanBase {
+export declare interface AzureSynapseCredentialScan extends ScanBase {
     properties?: AzureSynapseCredentialScanPropertiesAutoGenerated;
+    kind: "AzureSynapseCredential";
 }
 
-export declare type AzureSynapseCredentialScanProperties = AzureSynapseCredentialScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AzureSynapseCredentialScanPropertiesAutoGenerated = AzureSynapseCredentialScanPropertiesAutoGeneratedBase & AzureSynapseCredentialScanProperties;
-
-export declare interface AzureSynapseCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AzureSynapseCredentialScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AzureSynapseCredentialScanPropertiesBase {
+export declare interface AzureSynapseCredentialScanPropertiesAutoGenerated extends AzureSynapseCredentialScanProperties {
 }
 
-export declare type AzureSynapseDataSource = AzureSynapseDataSourceBase & DataSource;
-
-export declare interface AzureSynapseDataSourceBase {
+export declare interface AzureSynapseDataSource extends DataSourceBase {
     properties?: AzureSynapseDataSourceProperties;
+    kind: "AzureSynapse";
 }
 
-export declare type AzureSynapseDataSourceProperties = AzureSynapseDataSourcePropertiesBase & AzureSynapseProperties;
-
-export declare interface AzureSynapseDataSourcePropertiesBase {
+export declare interface AzureSynapseDataSourceProperties extends AzureSynapseProperties {
 }
 
-export declare type AzureSynapseMsiScan = AzureSynapseMsiScanBase & Scan;
-
-export declare interface AzureSynapseMsiScanBase {
+export declare interface AzureSynapseMsiScan extends ScanBase {
     properties?: AzureSynapseMsiScanPropertiesAutoGenerated;
+    kind: "AzureSynapseMsi";
 }
 
-export declare type AzureSynapseMsiScanProperties = AzureSynapseMsiScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AzureSynapseMsiScanPropertiesAutoGenerated = AzureSynapseMsiScanPropertiesAutoGeneratedBase & AzureSynapseMsiScanProperties;
-
-export declare interface AzureSynapseMsiScanPropertiesAutoGeneratedBase {
+export declare interface AzureSynapseMsiScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AzureSynapseMsiScanPropertiesBase {
+export declare interface AzureSynapseMsiScanPropertiesAutoGenerated extends AzureSynapseMsiScanProperties {
 }
 
-export declare type AzureSynapseProperties = AzureSynapsePropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureSynapsePropertiesBase {
+export declare interface AzureSynapseProperties extends AzureDataSourceProperties {
     sqlEndpoint?: string;
     sqlOnDemandEndpoint?: string;
 }
 
-export declare type AzureSynapseScanRuleset = AzureSynapseScanRulesetBase & ScanRuleset;
-
-export declare interface AzureSynapseScanRulesetBase {
+export declare interface AzureSynapseScanRuleset extends ScanRulesetBase {
     properties?: AzureSynapseScanRulesetPropertiesAutoGenerated;
+    kind: "AzureSynapse";
 }
 
-export declare type AzureSynapseScanRulesetProperties = AzureSynapseScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureSynapseScanRulesetPropertiesAutoGenerated = AzureSynapseScanRulesetPropertiesAutoGeneratedBase & AzureSynapseScanRulesetProperties;
-
-export declare interface AzureSynapseScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureSynapseScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureSynapseScanRulesetPropertiesBase {
+export declare interface AzureSynapseScanRulesetPropertiesAutoGenerated extends AzureSynapseScanRulesetProperties {
 }
 
-export declare type AzureSynapseSystemScanRuleset = AzureSynapseSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureSynapseSystemScanRulesetBase {
+export declare interface AzureSynapseSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureSynapseSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureSynapseSystemScanRulesetProperties = AzureSynapseSystemScanRulesetPropertiesBase & AzureSynapseScanRulesetProperties;
-
-export declare interface AzureSynapseSystemScanRulesetPropertiesBase {
+export declare interface AzureSynapseSystemScanRulesetProperties extends AzureSynapseScanRulesetProperties {
 }
 
-export declare type AzureSynapseWorkspaceCredentialScan = AzureSynapseWorkspaceCredentialScanBase & Scan;
-
-export declare interface AzureSynapseWorkspaceCredentialScanBase {
+export declare interface AzureSynapseWorkspaceCredentialScan extends ScanBase {
     properties?: AzureSynapseWorkspaceCredentialScanPropertiesAutoGenerated;
+    kind: "AzureSynapseWorkspaceCredential";
 }
 
-export declare type AzureSynapseWorkspaceCredentialScanProperties = AzureSynapseWorkspaceCredentialScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AzureSynapseWorkspaceCredentialScanPropertiesAutoGenerated = AzureSynapseWorkspaceCredentialScanPropertiesAutoGeneratedBase & AzureSynapseWorkspaceCredentialScanProperties;
-
-export declare interface AzureSynapseWorkspaceCredentialScanPropertiesAutoGeneratedBase {
+export declare interface AzureSynapseWorkspaceCredentialScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AzureSynapseWorkspaceCredentialScanPropertiesBase {
+export declare interface AzureSynapseWorkspaceCredentialScanPropertiesAutoGenerated extends AzureSynapseWorkspaceCredentialScanProperties {
 }
 
-export declare type AzureSynapseWorkspaceDataSource = AzureSynapseWorkspaceDataSourceBase & DataSource;
-
-export declare interface AzureSynapseWorkspaceDataSourceBase {
+export declare interface AzureSynapseWorkspaceDataSource extends DataSourceBase {
     properties?: AzureSynapseWorkspaceDataSourceProperties;
+    kind: "AzureSynapseWorkspace";
 }
 
-export declare type AzureSynapseWorkspaceDataSourceProperties = AzureSynapseWorkspaceDataSourcePropertiesBase & AzureSynapseWorkspaceProperties;
-
-export declare interface AzureSynapseWorkspaceDataSourcePropertiesBase {
+export declare interface AzureSynapseWorkspaceDataSourceProperties extends AzureSynapseWorkspaceProperties {
 }
 
-export declare type AzureSynapseWorkspaceMsiScan = AzureSynapseWorkspaceMsiScanBase & Scan;
-
-export declare interface AzureSynapseWorkspaceMsiScanBase {
+export declare interface AzureSynapseWorkspaceMsiScan extends ScanBase {
     properties?: AzureSynapseWorkspaceMsiScanPropertiesAutoGenerated;
+    kind: "AzureSynapseWorkspaceMsi";
 }
 
-export declare type AzureSynapseWorkspaceMsiScanProperties = AzureSynapseWorkspaceMsiScanPropertiesBase & ExpandingResourceScanProperties;
-
-export declare type AzureSynapseWorkspaceMsiScanPropertiesAutoGenerated = AzureSynapseWorkspaceMsiScanPropertiesAutoGeneratedBase & AzureSynapseWorkspaceMsiScanProperties;
-
-export declare interface AzureSynapseWorkspaceMsiScanPropertiesAutoGeneratedBase {
+export declare interface AzureSynapseWorkspaceMsiScanProperties extends ExpandingResourceScanProperties {
 }
 
-export declare interface AzureSynapseWorkspaceMsiScanPropertiesBase {
+export declare interface AzureSynapseWorkspaceMsiScanPropertiesAutoGenerated extends AzureSynapseWorkspaceMsiScanProperties {
 }
 
-export declare type AzureSynapseWorkspaceProperties = AzureSynapseWorkspacePropertiesBase & AzureDataSourceProperties;
-
-export declare interface AzureSynapseWorkspacePropertiesBase {
+export declare interface AzureSynapseWorkspaceProperties extends AzureDataSourceProperties {
     dedicatedSqlEndpoint?: string;
     serverlessSqlEndpoint?: string;
 }
 
-export declare type AzureSynapseWorkspaceScanRuleset = AzureSynapseWorkspaceScanRulesetBase & ScanRuleset;
-
-export declare interface AzureSynapseWorkspaceScanRulesetBase {
+export declare interface AzureSynapseWorkspaceScanRuleset extends ScanRulesetBase {
     properties?: AzureSynapseWorkspaceScanRulesetPropertiesAutoGenerated;
+    kind: "AzureSynapseWorkspace";
 }
 
-export declare type AzureSynapseWorkspaceScanRulesetProperties = AzureSynapseWorkspaceScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type AzureSynapseWorkspaceScanRulesetPropertiesAutoGenerated = AzureSynapseWorkspaceScanRulesetPropertiesAutoGeneratedBase & AzureSynapseWorkspaceScanRulesetProperties;
-
-export declare interface AzureSynapseWorkspaceScanRulesetPropertiesAutoGeneratedBase {
+export declare interface AzureSynapseWorkspaceScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface AzureSynapseWorkspaceScanRulesetPropertiesBase {
+export declare interface AzureSynapseWorkspaceScanRulesetPropertiesAutoGenerated extends AzureSynapseWorkspaceScanRulesetProperties {
 }
 
-export declare type AzureSynapseWorkspaceSystemScanRuleset = AzureSynapseWorkspaceSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface AzureSynapseWorkspaceSystemScanRulesetBase {
+export declare interface AzureSynapseWorkspaceSystemScanRuleset extends SystemScanRulesetBase {
     properties?: AzureSynapseWorkspaceSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type AzureSynapseWorkspaceSystemScanRulesetProperties = AzureSynapseWorkspaceSystemScanRulesetPropertiesBase & AzureSynapseWorkspaceScanRulesetProperties;
-
-export declare interface AzureSynapseWorkspaceSystemScanRulesetPropertiesBase {
+export declare interface AzureSynapseWorkspaceSystemScanRulesetProperties extends AzureSynapseWorkspaceScanRulesetProperties {
 }
 
-export declare type ClassificationAction = "Keep" | "Delete";
-
-export declare type ClassificationRule = ClassificationRuleBase & ProxyResource;
+export declare type ClassificationRule = ClassificationRuleBase | SystemClassificationRule | CustomClassificationRule;
 
-export declare interface ClassificationRuleBase {
-    kind: ClassificationRuleType;
+export declare interface ClassificationRuleBase extends ProxyResource {
+    kind: "ClassificationRule" | "System" | "Custom";
 }
 
 export declare interface ClassificationRuleList {
-    value?: ClassificationRule[];
+    value?: Array<ClassificationRule>;
     nextLink?: string;
     count?: number;
 }
 
-export declare interface ClassificationRulePattern {
-    kind: ClassificationRulePatternType;
-}
+export declare type ClassificationRulePattern = RegexClassificationRulePattern;
 
-export declare type ClassificationRulePatternType = "Regex";
+export declare interface ClassificationRulePatternBase {
+    kind: "Regex";
+}
 
 /** Creates or Updates a classification rule */
 export declare interface ClassificationRulesCreateOrUpdate200Response extends HttpResponse {
@@ -1524,16 +1086,7 @@ export declare interface ClassificationRulesCreateOrUpdatedefaultResponse extend
     body: ErrorResponseModel;
 }
 
-export declare type ClassificationRulesCreateOrUpdateParameters = RequestParameters & ClassificationRulesCreateOrUpdateBodyParam;
-
-export declare interface ClassificationRulesDelete {
-    /** Get a classification rule */
-    get(options?: ClassificationRulesGetParameters): Promise<ClassificationRulesGet200Response | ClassificationRulesGetdefaultResponse>;
-    /** Creates or Updates a classification rule */
-    put(options?: ClassificationRulesCreateOrUpdateParameters): Promise<ClassificationRulesCreateOrUpdate200Response | ClassificationRulesCreateOrUpdate201Response | ClassificationRulesCreateOrUpdatedefaultResponse>;
-    /** Deletes a classification rule */
-    delete(options?: ClassificationRulesDeleteParameters): Promise<ClassificationRulesDelete200Response | ClassificationRulesDelete204Response | ClassificationRulesDeletedefaultResponse>;
-}
+export declare type ClassificationRulesCreateOrUpdateParameters = ClassificationRulesCreateOrUpdateBodyParam & RequestParameters;
 
 /** Deletes a classification rule */
 export declare interface ClassificationRulesDelete200Response extends HttpResponse {
@@ -1544,6 +1097,7 @@ export declare interface ClassificationRulesDelete200Response extends HttpRespon
 /** Deletes a classification rule */
 export declare interface ClassificationRulesDelete204Response extends HttpResponse {
     status: "204";
+    body: Record<string, unknown>;
 }
 
 /** Deletes a classification rule */
@@ -1554,6 +1108,15 @@ export declare interface ClassificationRulesDeletedefaultResponse extends HttpRe
 
 export declare type ClassificationRulesDeleteParameters = RequestParameters;
 
+export declare interface ClassificationRulesGet {
+    /** Get a classification rule */
+    get(options?: ClassificationRulesGetParameters): Promise<ClassificationRulesGet200Response | ClassificationRulesGetdefaultResponse>;
+    /** Creates or Updates a classification rule */
+    put(options?: ClassificationRulesCreateOrUpdateParameters): Promise<ClassificationRulesCreateOrUpdate200Response | ClassificationRulesCreateOrUpdate201Response | ClassificationRulesCreateOrUpdatedefaultResponse>;
+    /** Deletes a classification rule */
+    delete(options?: ClassificationRulesDeleteParameters): Promise<ClassificationRulesDelete200Response | ClassificationRulesDelete204Response | ClassificationRulesDeletedefaultResponse>;
+}
+
 /** Get a classification rule */
 export declare interface ClassificationRulesGet200Response extends HttpResponse {
     status: "200";
@@ -1608,7 +1171,7 @@ export declare type ClassificationRulesListVersionsByClassificationRuleNameParam
 
 export declare interface ClassificationRulesTagClassificationVersion {
     /** Sets Classification Action on a specific classification rule version. */
-    post(options?: ClassificationRulesTagClassificationVersionParameters): Promise<ClassificationRulesTagClassificationVersion202Response | ClassificationRulesTagClassificationVersiondefaultResponse>;
+    post(options: ClassificationRulesTagClassificationVersionParameters): Promise<ClassificationRulesTagClassificationVersion202Response | ClassificationRulesTagClassificationVersiondefaultResponse>;
 }
 
 /** Sets Classification Action on a specific classification rule version. */
@@ -1623,19 +1186,21 @@ export declare interface ClassificationRulesTagClassificationVersiondefaultRespo
     body: ErrorResponseModel;
 }
 
-export declare type ClassificationRulesTagClassificationVersionParameters = RequestParameters & ClassificationRulesTagClassificationVersionQueryParam;
+export declare type ClassificationRulesTagClassificationVersionParameters = ClassificationRulesTagClassificationVersionQueryParam & RequestParameters;
 
 export declare interface ClassificationRulesTagClassificationVersionQueryParam {
     queryParameters: ClassificationRulesTagClassificationVersionQueryParamProperties;
 }
 
 export declare interface ClassificationRulesTagClassificationVersionQueryParamProperties {
-    action: ClassificationAction;
+    action: "Keep" | "Delete";
 }
 
-export declare type ClassificationRuleStatus = "Enabled" | "Disabled";
-
-export declare type ClassificationRuleType = "System" | "Custom";
+export declare interface CollectionReference {
+    lastModifiedAt?: Date;
+    referenceName?: string;
+    type?: string;
+}
 
 export declare interface ConnectedVia {
     referenceName?: string;
@@ -1643,33 +1208,28 @@ export declare interface ConnectedVia {
 
 export declare interface CredentialReference {
     referenceName?: string;
-    credentialType?: CredentialType;
+    credentialType?: "AccountKey" | "ServicePrincipal" | "BasicAuth" | "SqlAuth" | "AmazonARN";
 }
 
-export declare type CredentialType = "AccountKey" | "ServicePrincipal" | "BasicAuth" | "SqlAuth" | "AmazonARN";
-
-export declare type CustomClassificationRule = CustomClassificationRuleBase & ClassificationRule;
-
-export declare interface CustomClassificationRuleBase {
+export declare interface CustomClassificationRule extends ClassificationRuleBase {
     properties?: CustomClassificationRulePropertiesAutoGenerated;
+    kind: "Custom";
 }
 
 export declare interface CustomClassificationRuleProperties {
     minimumPercentageMatch?: number;
-    classificationAction?: ClassificationAction;
-    dataPatterns?: ClassificationRulePattern[];
-    columnPatterns?: ClassificationRulePattern[];
+    classificationAction?: "Keep" | "Delete";
+    dataPatterns?: Array<ClassificationRulePattern>;
+    columnPatterns?: Array<ClassificationRulePattern>;
     description?: string;
     version?: number;
     classificationName?: string;
-    ruleStatus?: ClassificationRuleStatus;
+    ruleStatus?: "Enabled" | "Disabled";
     createdAt?: Date;
     lastModifiedAt?: Date;
 }
 
-export declare type CustomClassificationRulePropertiesAutoGenerated = CustomClassificationRulePropertiesAutoGeneratedBase & CustomClassificationRuleProperties;
-
-export declare interface CustomClassificationRulePropertiesAutoGeneratedBase {
+export declare interface CustomClassificationRulePropertiesAutoGenerated extends CustomClassificationRuleProperties {
 }
 
 export declare interface CustomFileExtension {
@@ -1679,25 +1239,23 @@ export declare interface CustomFileExtension {
     fileExtension?: string;
 }
 
-export declare type CustomFileExtensionCustomFileType = CustomFileExtensionCustomFileTypeBase & CustomFileType;
-
-export declare interface CustomFileExtensionCustomFileTypeBase {
+export declare interface CustomFileExtensionCustomFileType extends CustomFileType {
 }
 
 export declare interface CustomFileType {
-    builtInType?: FileExtensionsType;
+    builtInType?: "AVRO" | "ORC" | "PARQUET" | "JSON" | "TXT" | "XML" | "Documents" | "CSV" | "PSV" | "SSV" | "TSV" | "GZ" | "DOC" | "DOCM" | "DOCX" | "DOT" | "ODP" | "ODS" | "ODT" | "PDF" | "POT" | "PPS" | "PPSX" | "PPT" | "PPTM" | "PPTX" | "XLC" | "XLS" | "XLSB" | "XLSM" | "XLSX" | "XLT";
     customDelimiter?: string;
 }
 
-export declare type DataSource = DataSourceBase & ProxyResource;
+export declare type DataSource = DataSourceBase | AzureSubscriptionDataSource | AzureResourceGroupDataSource | AzureSynapseWorkspaceDataSource | AzureSynapseDataSource | AdlsGen1DataSource | AdlsGen2DataSource | AmazonAccountDataSource | AmazonS3DataSource | AmazonSqlDataSource | AzureCosmosDbDataSource | AzureDataExplorerDataSource | AzureFileServiceDataSource | AzureSqlDatabaseDataSource | AmazonPostgreSqlDataSource | AzurePostgreSqlDataSource | SqlServerDatabaseDataSource | AzureSqlDatabaseManagedInstanceDataSource | AzureSqlDataWarehouseDataSource | AzureMySqlDataSource | AzureStorageDataSource | TeradataDataSource | OracleDataSource | SapS4HanaDataSource | SapEccDataSource | PowerBIDataSource;
 
-export declare interface DataSourceBase {
-    kind: DataSourceType;
-    scans?: Scan[];
+export declare interface DataSourceBase extends ProxyResource {
+    scans?: Array<Scan>;
+    kind: "DataSource" | "AzureSubscription" | "AzureResourceGroup" | "AzureSynapseWorkspace" | "AzureSynapse" | "AdlsGen1" | "AdlsGen2" | "AmazonAccount" | "AmazonS3" | "AmazonSql" | "AzureCosmosDb" | "AzureDataExplorer" | "AzureFileService" | "AzureSqlDatabase" | "AmazonPostgreSql" | "AzurePostgreSql" | "SqlServerDatabase" | "AzureSqlDatabaseManagedInstance" | "AzureSqlDataWarehouse" | "AzureMySql" | "AzureStorage" | "Teradata" | "Oracle" | "SapS4Hana" | "SapEcc" | "PowerBI";
 }
 
 export declare interface DataSourceList {
-    value?: DataSource[];
+    value?: Array<DataSource>;
     nextLink?: string;
     count?: number;
 }
@@ -1705,6 +1263,19 @@ export declare interface DataSourceList {
 export declare interface DataSourceProperties {
     createdAt?: Date;
     lastModifiedAt?: Date;
+    collection?: DataSourcePropertiesCollection;
+}
+
+export declare interface DataSourcePropertiesCollection extends CollectionReference {
+}
+
+export declare interface DataSourcesCreateOrUpdate {
+    /** Creates or Updates a data source */
+    put(options?: DataSourcesCreateOrUpdateParameters): Promise<DataSourcesCreateOrUpdate200Response | DataSourcesCreateOrUpdate201Response | DataSourcesCreateOrUpdatedefaultResponse>;
+    /** Get a data source */
+    get(options?: DataSourcesGetParameters): Promise<DataSourcesGet200Response | DataSourcesGetdefaultResponse>;
+    /** Deletes a data source */
+    delete(options?: DataSourcesDeleteParameters): Promise<DataSourcesDelete200Response | DataSourcesDelete204Response | DataSourcesDeletedefaultResponse>;
 }
 
 /** Creates or Updates a data source */
@@ -1729,16 +1300,7 @@ export declare interface DataSourcesCreateOrUpdatedefaultResponse extends HttpRe
     body: ErrorResponseModel;
 }
 
-export declare type DataSourcesCreateOrUpdateParameters = RequestParameters & DataSourcesCreateOrUpdateBodyParam;
-
-export declare interface DataSourcesDelete {
-    /** Creates or Updates a data source */
-    put(options?: DataSourcesCreateOrUpdateParameters): Promise<DataSourcesCreateOrUpdate200Response | DataSourcesCreateOrUpdate201Response | DataSourcesCreateOrUpdatedefaultResponse>;
-    /** Get a data source */
-    get(options?: DataSourcesGetParameters): Promise<DataSourcesGet200Response | DataSourcesGetdefaultResponse>;
-    /** Deletes a data source */
-    delete(options?: DataSourcesDeleteParameters): Promise<DataSourcesDelete200Response | DataSourcesDelete204Response | DataSourcesDeletedefaultResponse>;
-}
+export declare type DataSourcesCreateOrUpdateParameters = DataSourcesCreateOrUpdateBodyParam & RequestParameters;
 
 /** Deletes a data source */
 export declare interface DataSourcesDelete200Response extends HttpResponse {
@@ -1749,6 +1311,7 @@ export declare interface DataSourcesDelete200Response extends HttpResponse {
 /** Deletes a data source */
 export declare interface DataSourcesDelete204Response extends HttpResponse {
     status: "204";
+    body: Record<string, unknown>;
 }
 
 /** Deletes a data source */
@@ -1792,99 +1355,74 @@ export declare interface DataSourcesListAlldefaultResponse extends HttpResponse
 
 export declare type DataSourcesListAllParameters = RequestParameters;
 
-export declare type DataSourceType = "None" | "AzureSubscription" | "AzureResourceGroup" | "AzureSynapseWorkspace" | "AzureSynapse" | "AdlsGen1" | "AdlsGen2" | "AmazonAccount" | "AmazonS3" | "AmazonSql" | "AzureCosmosDb" | "AzureDataExplorer" | "AzureFileService" | "AzureSqlDatabase" | "AmazonPostgreSql" | "AzurePostgreSql" | "SqlServerDatabase" | "AzureSqlDatabaseManagedInstance" | "AzureSqlDataWarehouse" | "AzureMySql" | "AzureStorage" | "Teradata" | "Oracle" | "SapS4Hana" | "SapEcc" | "PowerBI";
-
-export declare type DayOfWeek = "Sunday" | "Monday" | "Tuesday" | "Wednesday" | "Thursday" | "Friday" | "Saturday";
-
-export declare type DaysOfWeek = "Sunday" | "Monday" | "Tuesday" | "Wednesday" | "Thursday" | "Friday" | "Saturday";
-
 export declare interface ErrorInfo {
     code?: string;
     message?: string;
     target?: string;
-    details?: ErrorInfo[];
+    details?: Array<ErrorInfo>;
 }
 
 export declare interface ErrorModel {
     code?: string;
     message?: string;
     target?: string;
-    details?: ErrorModel[];
+    details?: Array<ErrorModel>;
 }
 
 export declare interface ErrorResponseModel {
     error?: ErrorResponseModelError;
 }
 
-export declare type ErrorResponseModelError = ErrorResponseModelErrorBase & ErrorModel;
-
-export declare interface ErrorResponseModelErrorBase {
+export declare interface ErrorResponseModelError extends ErrorModel {
 }
 
-export declare type ExpandingResourceScanProperties = ExpandingResourceScanPropertiesBase & ScanProperties;
-
-export declare interface ExpandingResourceScanPropertiesBase {
+export declare interface ExpandingResourceScanProperties extends ScanProperties {
     resourceTypes?: ExpandingResourceScanPropertiesResourceTypes;
     credential?: ExpandingResourceScanPropertiesCredential;
 }
 
-export declare type ExpandingResourceScanPropertiesCredential = ExpandingResourceScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface ExpandingResourceScanPropertiesCredentialBase {
+export declare interface ExpandingResourceScanPropertiesCredential extends CredentialReference {
 }
 
 export declare interface ExpandingResourceScanPropertiesResourceTypes {
-    none?: ResourceTypeFilter;
-    azureSubscription?: ResourceTypeFilter;
-    azureResourceGroup?: ResourceTypeFilter;
-    azureSynapseWorkspace?: ResourceTypeFilter;
-    azureSynapse?: ResourceTypeFilter;
-    adlsGen1?: ResourceTypeFilter;
-    adlsGen2?: ResourceTypeFilter;
-    amazonAccount?: ResourceTypeFilter;
-    amazonS3?: ResourceTypeFilter;
-    amazonSql?: ResourceTypeFilter;
-    azureCosmosDb?: ResourceTypeFilter;
-    azureDataExplorer?: ResourceTypeFilter;
-    azureFileService?: ResourceTypeFilter;
-    azureSqlDatabase?: ResourceTypeFilter;
-    amazonPostgreSql?: ResourceTypeFilter;
-    azurePostgreSql?: ResourceTypeFilter;
-    sqlServerDatabase?: ResourceTypeFilter;
-    azureSqlDatabaseManagedInstance?: ResourceTypeFilter;
-    azureSqlDataWarehouse?: ResourceTypeFilter;
-    azureMySql?: ResourceTypeFilter;
-    azureStorage?: ResourceTypeFilter;
-    teradata?: ResourceTypeFilter;
-    oracle?: ResourceTypeFilter;
-    sapS4Hana?: ResourceTypeFilter;
-    sapEcc?: ResourceTypeFilter;
-    powerBI?: ResourceTypeFilter;
-}
-
-export declare type FileExtensionsType = "AVRO" | "ORC" | "PARQUET" | "JSON" | "TXT" | "XML" | "Documents" | "CSV" | "PSV" | "SSV" | "TSV" | "GZ" | "DOC" | "DOCM" | "DOCX" | "DOT" | "ODP" | "ODS" | "ODT" | "PDF" | "POT" | "PPS" | "PPSX" | "PPT" | "PPTM" | "PPTX" | "XLC" | "XLS" | "XLSB" | "XLSM" | "XLSX" | "XLT";
-
-export declare type Filter = FilterBase & ProxyResource;
-
-export declare interface FilterBase {
-    properties?: FilterProperties;
-}
-
-export declare type FilterProperties = FilterPropertiesBase & FilterPropertiesAutoGenerated;
-
-export declare interface FilterPropertiesAutoGenerated {
-    excludeUriPrefixes?: string[];
-    includeUriPrefixes?: string[];
-}
-
-export declare interface FilterPropertiesBase {
-}
-
-export declare interface FiltersCreateOrUpdate {
-    /** Get a filter */
-    get(options?: FiltersGetParameters): Promise<FiltersGet200Response | FiltersGetdefaultResponse>;
-    /** Creates or updates a filter */
-    put(options?: FiltersCreateOrUpdateParameters): Promise<FiltersCreateOrUpdate200Response | FiltersCreateOrUpdate201Response | FiltersCreateOrUpdatedefaultResponse>;
+    None?: ResourceTypeFilter;
+    AzureSubscription?: ResourceTypeFilter;
+    AzureResourceGroup?: ResourceTypeFilter;
+    AzureSynapseWorkspace?: ResourceTypeFilter;
+    AzureSynapse?: ResourceTypeFilter;
+    AdlsGen1?: ResourceTypeFilter;
+    AdlsGen2?: ResourceTypeFilter;
+    AmazonAccount?: ResourceTypeFilter;
+    AmazonS3?: ResourceTypeFilter;
+    AmazonSql?: ResourceTypeFilter;
+    AzureCosmosDb?: ResourceTypeFilter;
+    AzureDataExplorer?: ResourceTypeFilter;
+    AzureFileService?: ResourceTypeFilter;
+    AzureSqlDatabase?: ResourceTypeFilter;
+    AmazonPostgreSql?: ResourceTypeFilter;
+    AzurePostgreSql?: ResourceTypeFilter;
+    SqlServerDatabase?: ResourceTypeFilter;
+    AzureSqlDatabaseManagedInstance?: ResourceTypeFilter;
+    AzureSqlDataWarehouse?: ResourceTypeFilter;
+    AzureMySql?: ResourceTypeFilter;
+    AzureStorage?: ResourceTypeFilter;
+    Teradata?: ResourceTypeFilter;
+    Oracle?: ResourceTypeFilter;
+    SapS4Hana?: ResourceTypeFilter;
+    SapEcc?: ResourceTypeFilter;
+    PowerBI?: ResourceTypeFilter;
+}
+
+export declare interface Filter extends ProxyResource {
+    properties?: FilterPropertiesAutoGenerated;
+}
+
+export declare interface FilterProperties {
+    excludeUriPrefixes?: Array<string>;
+    includeUriPrefixes?: Array<string>;
+}
+
+export declare interface FilterPropertiesAutoGenerated extends FilterProperties {
 }
 
 /** Creates or updates a filter */
@@ -1909,7 +1447,14 @@ export declare interface FiltersCreateOrUpdatedefaultResponse extends HttpRespon
     body: ErrorResponseModel;
 }
 
-export declare type FiltersCreateOrUpdateParameters = RequestParameters & FiltersCreateOrUpdateBodyParam;
+export declare type FiltersCreateOrUpdateParameters = FiltersCreateOrUpdateBodyParam & RequestParameters;
+
+export declare interface FiltersGet {
+    /** Get a filter */
+    get(options?: FiltersGetParameters): Promise<FiltersGet200Response | FiltersGetdefaultResponse>;
+    /** Creates or updates a filter */
+    put(options?: FiltersCreateOrUpdateParameters): Promise<FiltersCreateOrUpdate200Response | FiltersCreateOrUpdate201Response | FiltersCreateOrUpdatedefaultResponse>;
+}
 
 /** Get a filter */
 export declare interface FiltersGet200Response extends HttpResponse {
@@ -1925,6 +1470,19 @@ export declare interface FiltersGetdefaultResponse extends HttpResponse {
 
 export declare type FiltersGetParameters = RequestParameters;
 
+/**
+ * Helper type to extract the type of an array
+ */
+export declare type GetArrayType<T> = T extends Array<infer TData> ? TData : never;
+
+/**
+ * The type of a custom function that defines how to get a page and a link to the next one if any.
+ */
+export declare type GetPage<TPage> = (pageLink: string, maxPageSize?: number) => Promise<{
+    page: TPage;
+    nextPageLink?: string;
+}>;
+
 /** Creates an instance of a key vault connection */
 export declare interface KeyVaultConnectionsCreate200Response extends HttpResponse {
     status: "200";
@@ -1941,16 +1499,7 @@ export declare interface KeyVaultConnectionsCreatedefaultResponse extends HttpRe
     body: ErrorResponseModel;
 }
 
-export declare type KeyVaultConnectionsCreateParameters = RequestParameters & KeyVaultConnectionsCreateBodyParam;
-
-export declare interface KeyVaultConnectionsDelete {
-    /** Gets key vault information */
-    get(options?: KeyVaultConnectionsGetParameters): Promise<KeyVaultConnectionsGet200Response | KeyVaultConnectionsGetdefaultResponse>;
-    /** Creates an instance of a key vault connection */
-    put(options: KeyVaultConnectionsCreateParameters): Promise<KeyVaultConnectionsCreate200Response | KeyVaultConnectionsCreatedefaultResponse>;
-    /** Deletes the key vault connection associated with the account */
-    delete(options?: KeyVaultConnectionsDeleteParameters): Promise<KeyVaultConnectionsDelete200Response | KeyVaultConnectionsDelete204Response | KeyVaultConnectionsDeletedefaultResponse>;
-}
+export declare type KeyVaultConnectionsCreateParameters = KeyVaultConnectionsCreateBodyParam & RequestParameters;
 
 /** Deletes the key vault connection associated with the account */
 export declare interface KeyVaultConnectionsDelete200Response extends HttpResponse {
@@ -1961,6 +1510,7 @@ export declare interface KeyVaultConnectionsDelete200Response extends HttpRespon
 /** Deletes the key vault connection associated with the account */
 export declare interface KeyVaultConnectionsDelete204Response extends HttpResponse {
     status: "204";
+    body: Record<string, unknown>;
 }
 
 /** Deletes the key vault connection associated with the account */
@@ -1971,6 +1521,15 @@ export declare interface KeyVaultConnectionsDeletedefaultResponse extends HttpRe
 
 export declare type KeyVaultConnectionsDeleteParameters = RequestParameters;
 
+export declare interface KeyVaultConnectionsGet {
+    /** Gets key vault information */
+    get(options?: KeyVaultConnectionsGetParameters): Promise<KeyVaultConnectionsGet200Response | KeyVaultConnectionsGetdefaultResponse>;
+    /** Creates an instance of a key vault connection */
+    put(options: KeyVaultConnectionsCreateParameters): Promise<KeyVaultConnectionsCreate200Response | KeyVaultConnectionsCreatedefaultResponse>;
+    /** Deletes the key vault connection associated with the account */
+    delete(options?: KeyVaultConnectionsDeleteParameters): Promise<KeyVaultConnectionsDelete200Response | KeyVaultConnectionsDelete204Response | KeyVaultConnectionsDeletedefaultResponse>;
+}
+
 /** Gets key vault information */
 export declare interface KeyVaultConnectionsGet200Response extends HttpResponse {
     status: "200";
@@ -2004,9 +1563,7 @@ export declare interface KeyVaultConnectionsListAlldefaultResponse extends HttpR
 
 export declare type KeyVaultConnectionsListAllParameters = RequestParameters;
 
-export declare type MitiScanProperties = MitiScanPropertiesBase & ScanProperties;
-
-export declare interface MitiScanPropertiesBase {
+export declare interface MitiScanProperties extends ScanProperties {
     maximumMemoryAllowedInGb?: string;
     mitiCache?: string;
 }
@@ -2017,135 +1574,128 @@ export declare interface Notification {
 }
 
 export declare interface OperationResponse {
+    /** Value may contain a UUID */
     scanResultId?: string;
     startTime?: Date;
     endTime?: Date;
-    status?: OperationStatus;
+    status?: "Accepted" | "InProgress" | "TransientFailure" | "Succeeded" | "Failed" | "Canceled";
     error?: OperationResponseError;
 }
 
-export declare type OperationResponseError = OperationResponseErrorBase & ErrorInfo;
-
-export declare interface OperationResponseErrorBase {
+export declare interface OperationResponseError extends ErrorInfo {
 }
 
-export declare type OperationStatus = "Accepted" | "InProgress" | "TransientFailure" | "Succeeded" | "Failed" | "Canceled";
-
-export declare type OracleCredentialScan = OracleCredentialScanBase & Scan;
-
-export declare interface OracleCredentialScanBase {
+export declare interface OracleCredentialScan extends ScanBase {
     properties?: OracleCredentialScanPropertiesAutoGenerated;
+    kind: "OracleOracleCredential";
 }
 
-export declare type OracleCredentialScanProperties = OracleCredentialScanPropertiesBase & MitiScanProperties;
-
-export declare type OracleCredentialScanPropertiesAutoGenerated = OracleCredentialScanPropertiesAutoGeneratedBase & OracleCredentialScanProperties;
-
-export declare interface OracleCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface OracleCredentialScanPropertiesBase {
+export declare interface OracleCredentialScanProperties extends MitiScanProperties {
     credential?: OracleCredentialScanPropertiesCredential;
     schema?: string;
     driverLocation?: string;
 }
 
-export declare type OracleCredentialScanPropertiesCredential = OracleCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface OracleCredentialScanPropertiesCredentialBase {
+export declare interface OracleCredentialScanPropertiesAutoGenerated extends OracleCredentialScanProperties {
 }
 
-export declare type OracleDataSource = OracleDataSourceBase & DataSource;
+export declare interface OracleCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface OracleDataSourceBase {
+export declare interface OracleDataSource extends DataSourceBase {
     properties?: OracleDataSourceProperties;
+    kind: "Oracle";
 }
 
-export declare type OracleDataSourceProperties = OracleDataSourcePropertiesBase & OracleProperties;
-
-export declare interface OracleDataSourcePropertiesBase {
+export declare interface OracleDataSourceProperties extends OracleProperties {
 }
 
-export declare type OracleProperties = OraclePropertiesBase & DataSourceProperties;
-
-export declare interface OraclePropertiesBase {
+export declare interface OracleProperties extends DataSourceProperties {
     host?: string;
     port?: string;
     service?: string;
 }
 
-export declare type OracleScanRuleset = OracleScanRulesetBase & ScanRuleset;
-
-export declare interface OracleScanRulesetBase {
+export declare interface OracleScanRuleset extends ScanRulesetBase {
     properties?: OracleScanRulesetPropertiesAutoGenerated;
+    kind: "Oracle";
 }
 
-export declare type OracleScanRulesetProperties = OracleScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type OracleScanRulesetPropertiesAutoGenerated = OracleScanRulesetPropertiesAutoGeneratedBase & OracleScanRulesetProperties;
-
-export declare interface OracleScanRulesetPropertiesAutoGeneratedBase {
+export declare interface OracleScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface OracleScanRulesetPropertiesBase {
+export declare interface OracleScanRulesetPropertiesAutoGenerated extends OracleScanRulesetProperties {
 }
 
-export declare type OracleSystemScanRuleset = OracleSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface OracleSystemScanRulesetBase {
+export declare interface OracleSystemScanRuleset extends SystemScanRulesetBase {
     properties?: OracleSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type OracleSystemScanRulesetProperties = OracleSystemScanRulesetPropertiesBase & OracleScanRulesetProperties;
-
-export declare interface OracleSystemScanRulesetPropertiesBase {
+export declare interface OracleSystemScanRulesetProperties extends OracleScanRulesetProperties {
 }
 
-export declare type OracleUserPassScan = OracleUserPassScanBase & Scan;
-
-export declare interface OracleUserPassScanBase {
+export declare interface OracleUserPassScan extends ScanBase {
     properties?: OracleUserPassScanPropertiesAutoGenerated;
+    kind: "OracleOracleUserPass";
 }
 
-export declare type OracleUserPassScanProperties = OracleUserPassScanPropertiesBase & MitiScanProperties;
-
-export declare type OracleUserPassScanPropertiesAutoGenerated = OracleUserPassScanPropertiesAutoGeneratedBase & OracleUserPassScanProperties;
-
-export declare interface OracleUserPassScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface OracleUserPassScanPropertiesBase {
+export declare interface OracleUserPassScanProperties extends MitiScanProperties {
     username?: string;
     password?: string;
     schema?: string;
     driverLocation?: string;
 }
 
-export declare type PowerBIDataSource = PowerBIDataSourceBase & DataSource;
-
-export declare interface PowerBIDataSourceBase {
+export declare interface OracleUserPassScanPropertiesAutoGenerated extends OracleUserPassScanProperties {
+}
+
+/**
+ * Helper to paginate results from an initial response that follows the specification of Autorest `x-ms-pageable` extension
+ * @param client - Client to use for sending the next page requests
+ * @param initialResponse - Initial response containing the nextLink and current page of elements
+ * @param customGetPage - Optional - Function to define how to extract the page and next link to be used to paginate the results
+ * @returns - PagedAsyncIterableIterator to iterate the elements
+ */
+export declare function paginate<TResponse extends PathUncheckedResponse>(client: Client, initialResponse: TResponse, options?: PagingOptions<TResponse>): PagedAsyncIterableIterator<PaginateReturn<TResponse>>;
+
+/**
+ * Helper type to infer the Type of the paged elements from the response type
+ * This type is generated based on the swagger information for x-ms-pageable
+ * specifically on the itemName property which indicates the property of the response
+ * where the page items are found. The default value is `value`.
+ * This type will allow us to provide strongly typed Iterator based on the response we get as second parameter
+ */
+export declare type PaginateReturn<TResult> = TResult extends {
+    body: {
+        value?: infer TPage;
+    };
+} ? GetArrayType<TPage> : Array<unknown>;
+
+/**
+ * Options for the paging helper
+ */
+export declare interface PagingOptions<TResponse> {
+    /**
+     * Custom function to extract pagination details for crating the PagedAsyncIterableIterator
+     */
+    customGetPage?: GetPage<PaginateReturn<TResponse>[]>;
+}
+
+export declare interface PowerBIDataSource extends DataSourceBase {
     properties?: PowerBIDataSourceProperties;
+    kind: "PowerBI";
 }
 
-export declare type PowerBIDataSourceProperties = PowerBIDataSourcePropertiesBase & PowerBIProperties;
-
-export declare interface PowerBIDataSourcePropertiesBase {
+export declare interface PowerBIDataSourceProperties extends PowerBIProperties {
 }
 
-export declare type PowerBIDelegatedScan = PowerBIDelegatedScanBase & Scan;
-
-export declare interface PowerBIDelegatedScanBase {
+export declare interface PowerBIDelegatedScan extends ScanBase {
     properties?: PowerBIDelegatedScanPropertiesAutoGenerated;
+    kind: "PowerBIDelegated";
 }
 
-export declare type PowerBIDelegatedScanProperties = PowerBIDelegatedScanPropertiesBase & ScanProperties;
-
-export declare type PowerBIDelegatedScanPropertiesAutoGenerated = PowerBIDelegatedScanPropertiesAutoGeneratedBase & PowerBIDelegatedScanProperties;
-
-export declare interface PowerBIDelegatedScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface PowerBIDelegatedScanPropertiesBase {
+export declare interface PowerBIDelegatedScanProperties extends ScanProperties {
     tenant?: string;
     authenticationType?: string;
     clientId?: string;
@@ -2154,54 +1704,42 @@ export declare interface PowerBIDelegatedScanPropertiesBase {
     includePersonalWorkspaces?: boolean;
 }
 
-export declare type PowerBIMsiScan = PowerBIMsiScanBase & Scan;
-
-export declare interface PowerBIMsiScanBase {
-    properties?: PowerBIMsiScanPropertiesAutoGenerated;
+export declare interface PowerBIDelegatedScanPropertiesAutoGenerated extends PowerBIDelegatedScanProperties {
 }
 
-export declare type PowerBIMsiScanProperties = PowerBIMsiScanPropertiesBase & ScanProperties;
-
-export declare type PowerBIMsiScanPropertiesAutoGenerated = PowerBIMsiScanPropertiesAutoGeneratedBase & PowerBIMsiScanProperties;
-
-export declare interface PowerBIMsiScanPropertiesAutoGeneratedBase {
+export declare interface PowerBIMsiScan extends ScanBase {
+    properties?: PowerBIMsiScanPropertiesAutoGenerated;
+    kind: "PowerBIMsi";
 }
 
-export declare interface PowerBIMsiScanPropertiesBase {
+export declare interface PowerBIMsiScanProperties extends ScanProperties {
     includePersonalWorkspaces?: boolean;
 }
 
-export declare type PowerBIProperties = PowerBIPropertiesBase & DataSourceProperties;
+export declare interface PowerBIMsiScanPropertiesAutoGenerated extends PowerBIMsiScanProperties {
+}
 
-export declare interface PowerBIPropertiesBase {
+export declare interface PowerBIProperties extends DataSourceProperties {
     tenant?: string;
 }
 
-export declare type PowerBIScanRuleset = PowerBIScanRulesetBase & ScanRuleset;
-
-export declare interface PowerBIScanRulesetBase {
+export declare interface PowerBIScanRuleset extends ScanRulesetBase {
     properties?: PowerBIScanRulesetPropertiesAutoGenerated;
+    kind: "PowerBI";
 }
 
-export declare type PowerBIScanRulesetProperties = PowerBIScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type PowerBIScanRulesetPropertiesAutoGenerated = PowerBIScanRulesetPropertiesAutoGeneratedBase & PowerBIScanRulesetProperties;
-
-export declare interface PowerBIScanRulesetPropertiesAutoGeneratedBase {
+export declare interface PowerBIScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface PowerBIScanRulesetPropertiesBase {
+export declare interface PowerBIScanRulesetPropertiesAutoGenerated extends PowerBIScanRulesetProperties {
 }
 
-export declare type PowerBISystemScanRuleset = PowerBISystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface PowerBISystemScanRulesetBase {
+export declare interface PowerBISystemScanRuleset extends SystemScanRulesetBase {
     properties?: PowerBISystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type PowerBISystemScanRulesetProperties = PowerBISystemScanRulesetPropertiesBase & PowerBIScanRulesetProperties;
-
-export declare interface PowerBISystemScanRulesetPropertiesBase {
+export declare interface PowerBISystemScanRulesetProperties extends PowerBIScanRulesetProperties {
 }
 
 export declare interface ProxyResource {
@@ -2217,62 +1755,53 @@ export declare type PurviewScanningRestClient = Client & {
 };
 
 export declare interface RecurrenceSchedule {
-    /** Dictionary of <any> */
-    additionalProperties?: RecurrenceScheduleAdditionalPropertiesDictionary;
-    minutes?: number[];
-    hours?: number[];
-    weekDays?: "Sunday" | "Monday" | "Tuesday" | "Wednesday" | "Thursday" | "Friday" | "Saturday"[];
-    monthDays?: number[];
-    monthlyOccurrences?: RecurrenceScheduleOccurrence[];
+    /** Dictionary of <AnyObject> */
+    additionalProperties?: Record<string, Record<string, unknown>>;
+    minutes?: Array<number>;
+    hours?: Array<number>;
+    weekDays?: Array<"Sunday" | "Monday" | "Tuesday" | "Wednesday" | "Thursday" | "Friday" | "Saturday">;
+    monthDays?: Array<number>;
+    monthlyOccurrences?: Array<RecurrenceScheduleOccurrence>;
 }
 
-export declare type RecurrenceScheduleAdditionalPropertiesDictionary = Record<string, any>;
-
 export declare interface RecurrenceScheduleOccurrence {
-    /** Dictionary of <any> */
-    additionalProperties?: RecurrenceScheduleOccurrenceAdditionalPropertiesDictionary;
-    day?: DayOfWeek;
+    /** Dictionary of <AnyObject> */
+    additionalProperties?: Record<string, Record<string, unknown>>;
+    day?: "Sunday" | "Monday" | "Tuesday" | "Wednesday" | "Thursday" | "Friday" | "Saturday";
     occurrence?: number;
 }
 
-export declare type RecurrenceScheduleOccurrenceAdditionalPropertiesDictionary = Record<string, any>;
-
-export declare type RegexClassificationRulePattern = RegexClassificationRulePatternBase & ClassificationRulePattern;
-
-export declare interface RegexClassificationRulePatternBase {
+export declare interface RegexClassificationRulePattern extends ClassificationRulePatternBase {
     pattern?: string;
+    kind: "Regex";
 }
 
 export declare interface ResourceNameFilter {
-    excludePrefixes?: string[];
-    includePrefixes?: string[];
-    resources?: string[];
+    excludePrefixes?: Array<string>;
+    includePrefixes?: Array<string>;
+    resources?: Array<string>;
 }
 
 export declare interface ResourceTypeFilter {
     scanRulesetName?: string;
-    scanRulesetType?: ScanRulesetType;
+    scanRulesetType?: "Custom" | "System";
     resourceNameFilter?: ResourceTypeFilterResourceNameFilter;
     credential?: ResourceTypeFilterCredential;
 }
 
-export declare type ResourceTypeFilterCredential = ResourceTypeFilterCredentialBase & CredentialReference;
-
-export declare interface ResourceTypeFilterCredentialBase {
+export declare interface ResourceTypeFilterCredential extends CredentialReference {
 }
 
-export declare type ResourceTypeFilterResourceNameFilter = ResourceTypeFilterResourceNameFilterBase & ResourceNameFilter;
-
-export declare interface ResourceTypeFilterResourceNameFilterBase {
+export declare interface ResourceTypeFilterResourceNameFilter extends ResourceNameFilter {
 }
 
 export declare interface Routes {
     /** Resource for '/azureKeyVaults/\{keyVaultName\}' has methods for the following verbs: get, put, delete */
-    (path: "/azureKeyVaults/{keyVaultName}", keyVaultName: string): KeyVaultConnectionsDelete;
+    (path: "/azureKeyVaults/{keyVaultName}", keyVaultName: string): KeyVaultConnectionsGet;
     /** Resource for '/azureKeyVaults' has methods for the following verbs: get */
     (path: "/azureKeyVaults"): KeyVaultConnectionsListAll;
     /** Resource for '/classificationrules/\{classificationRuleName\}' has methods for the following verbs: get, put, delete */
-    (path: "/classificationrules/{classificationRuleName}", classificationRuleName: string): ClassificationRulesDelete;
+    (path: "/classificationrules/{classificationRuleName}", classificationRuleName: string): ClassificationRulesGet;
     /** Resource for '/classificationrules' has methods for the following verbs: get */
     (path: "/classificationrules"): ClassificationRulesListAll;
     /** Resource for '/classificationrules/\{classificationRuleName\}/versions' has methods for the following verbs: get */
@@ -2280,13 +1809,13 @@ export declare interface Routes {
     /** Resource for '/classificationrules/\{classificationRuleName\}/versions/\{classificationRuleVersion\}/:tag' has methods for the following verbs: post */
     (path: "/classificationrules/{classificationRuleName}/versions/{classificationRuleVersion}/:tag", classificationRuleName: string, classificationRuleVersion: string): ClassificationRulesTagClassificationVersion;
     /** Resource for '/datasources/\{dataSourceName\}' has methods for the following verbs: put, get, delete */
-    (path: "/datasources/{dataSourceName}", dataSourceName: string): DataSourcesDelete;
+    (path: "/datasources/{dataSourceName}", dataSourceName: string): DataSourcesCreateOrUpdate;
     /** Resource for '/datasources' has methods for the following verbs: get */
     (path: "/datasources"): DataSourcesListAll;
     /** Resource for '/datasources/\{dataSourceName\}/scans/\{scanName\}/filters/custom' has methods for the following verbs: get, put */
-    (path: "/datasources/{dataSourceName}/scans/{scanName}/filters/custom", dataSourceName: string, scanName: string): FiltersCreateOrUpdate;
+    (path: "/datasources/{dataSourceName}/scans/{scanName}/filters/custom", dataSourceName: string, scanName: string): FiltersGet;
     /** Resource for '/datasources/\{dataSourceName\}/scans/\{scanName\}' has methods for the following verbs: put, get, delete */
-    (path: "/datasources/{dataSourceName}/scans/{scanName}", dataSourceName: string, scanName: string): ScansDelete;
+    (path: "/datasources/{dataSourceName}/scans/{scanName}", dataSourceName: string, scanName: string): ScansCreateOrUpdate;
     /** Resource for '/datasources/\{dataSourceName\}/scans' has methods for the following verbs: get */
     (path: "/datasources/{dataSourceName}/scans", dataSourceName: string): ScansListByDataSource;
     /** Resource for '/datasources/\{dataSourceName\}/scans/\{scanName\}/runs/\{runId\}' has methods for the following verbs: put */
@@ -2296,7 +1825,7 @@ export declare interface Routes {
     /** Resource for '/datasources/\{dataSourceName\}/scans/\{scanName\}/runs' has methods for the following verbs: get */
     (path: "/datasources/{dataSourceName}/scans/{scanName}/runs", dataSourceName: string, scanName: string): ScanResultListScanHistory;
     /** Resource for '/scanrulesets/\{scanRulesetName\}' has methods for the following verbs: get, put, delete */
-    (path: "/scanrulesets/{scanRulesetName}", scanRulesetName: string): ScanRulesetsDelete;
+    (path: "/scanrulesets/{scanRulesetName}", scanRulesetName: string): ScanRulesetsGet;
     /** Resource for '/scanrulesets' has methods for the following verbs: get */
     (path: "/scanrulesets"): ScanRulesetsListAll;
     /** Resource for '/systemScanRulesets' has methods for the following verbs: get */
@@ -2310,246 +1839,188 @@ export declare interface Routes {
     /** Resource for '/systemScanRulesets/versions' has methods for the following verbs: get */
     (path: "/systemScanRulesets/versions"): SystemScanRulesetsListVersionsByDataSource;
     /** Resource for '/datasources/\{dataSourceName\}/scans/\{scanName\}/triggers/default' has methods for the following verbs: get, put, delete */
-    (path: "/datasources/{dataSourceName}/scans/{scanName}/triggers/default", dataSourceName: string, scanName: string): TriggersDeleteTrigger;
+    (path: "/datasources/{dataSourceName}/scans/{scanName}/triggers/default", dataSourceName: string, scanName: string): TriggersGetTrigger;
 }
 
-export declare type SapEccCredentialScan = SapEccCredentialScanBase & Scan;
-
-export declare interface SapEccCredentialScanBase {
+export declare interface SapEccCredentialScan extends ScanBase {
     properties?: SapEccCredentialScanPropertiesAutoGenerated;
+    kind: "SapEccSapEccCredential";
 }
 
-export declare type SapEccCredentialScanProperties = SapEccCredentialScanPropertiesBase & MitiScanProperties;
-
-export declare type SapEccCredentialScanPropertiesAutoGenerated = SapEccCredentialScanPropertiesAutoGeneratedBase & SapEccCredentialScanProperties;
-
-export declare interface SapEccCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface SapEccCredentialScanPropertiesBase {
+export declare interface SapEccCredentialScanProperties extends MitiScanProperties {
     clientId?: string;
     credential?: SapEccCredentialScanPropertiesCredential;
     jCoLibraryPath?: string;
 }
 
-export declare type SapEccCredentialScanPropertiesCredential = SapEccCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface SapEccCredentialScanPropertiesCredentialBase {
+export declare interface SapEccCredentialScanPropertiesAutoGenerated extends SapEccCredentialScanProperties {
 }
 
-export declare type SapEccDataSource = SapEccDataSourceBase & DataSource;
+export declare interface SapEccCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface SapEccDataSourceBase {
+export declare interface SapEccDataSource extends DataSourceBase {
     properties?: SapEccDataSourceProperties;
+    kind: "SapEcc";
 }
 
-export declare type SapEccDataSourceProperties = SapEccDataSourcePropertiesBase & SapEccProperties;
-
-export declare interface SapEccDataSourcePropertiesBase {
+export declare interface SapEccDataSourceProperties extends SapEccProperties {
 }
 
-export declare type SapEccProperties = SapEccPropertiesBase & DataSourceProperties;
-
-export declare interface SapEccPropertiesBase {
+export declare interface SapEccProperties extends DataSourceProperties {
     applicationServer?: string;
     systemNumber?: string;
 }
 
-export declare type SapEccScanRuleset = SapEccScanRulesetBase & ScanRuleset;
-
-export declare interface SapEccScanRulesetBase {
+export declare interface SapEccScanRuleset extends ScanRulesetBase {
     properties?: SapEccScanRulesetPropertiesAutoGenerated;
+    kind: "SapEcc";
 }
 
-export declare type SapEccScanRulesetProperties = SapEccScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type SapEccScanRulesetPropertiesAutoGenerated = SapEccScanRulesetPropertiesAutoGeneratedBase & SapEccScanRulesetProperties;
-
-export declare interface SapEccScanRulesetPropertiesAutoGeneratedBase {
+export declare interface SapEccScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface SapEccScanRulesetPropertiesBase {
+export declare interface SapEccScanRulesetPropertiesAutoGenerated extends SapEccScanRulesetProperties {
 }
 
-export declare type SapEccSystemScanRuleset = SapEccSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface SapEccSystemScanRulesetBase {
+export declare interface SapEccSystemScanRuleset extends SystemScanRulesetBase {
     properties?: SapEccSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type SapEccSystemScanRulesetProperties = SapEccSystemScanRulesetPropertiesBase & SapEccScanRulesetProperties;
-
-export declare interface SapEccSystemScanRulesetPropertiesBase {
+export declare interface SapEccSystemScanRulesetProperties extends SapEccScanRulesetProperties {
 }
 
-export declare type SapEccUserPassScan = SapEccUserPassScanBase & Scan;
-
-export declare interface SapEccUserPassScanBase {
+export declare interface SapEccUserPassScan extends ScanBase {
     properties?: SapEccUserPassScanPropertiesAutoGenerated;
+    kind: "SapEccSapEccUserPass";
 }
 
-export declare type SapEccUserPassScanProperties = SapEccUserPassScanPropertiesBase & MitiScanProperties;
-
-export declare type SapEccUserPassScanPropertiesAutoGenerated = SapEccUserPassScanPropertiesAutoGeneratedBase & SapEccUserPassScanProperties;
-
-export declare interface SapEccUserPassScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface SapEccUserPassScanPropertiesBase {
+export declare interface SapEccUserPassScanProperties extends MitiScanProperties {
     clientId?: string;
     username?: string;
     password?: string;
     jCoLibraryPath?: string;
 }
 
-export declare type SapS4HanaDataSource = SapS4HanaDataSourceBase & DataSource;
+export declare interface SapEccUserPassScanPropertiesAutoGenerated extends SapEccUserPassScanProperties {
+}
 
-export declare interface SapS4HanaDataSourceBase {
+export declare interface SapS4HanaDataSource extends DataSourceBase {
     properties?: SapS4HanaDataSourceProperties;
+    kind: "SapS4Hana";
 }
 
-export declare type SapS4HanaDataSourceProperties = SapS4HanaDataSourcePropertiesBase & SapS4HanaProperties;
-
-export declare interface SapS4HanaDataSourcePropertiesBase {
+export declare interface SapS4HanaDataSourceProperties extends SapS4HanaProperties {
 }
 
-export declare type SapS4HanaProperties = SapS4HanaPropertiesBase & DataSourceProperties;
-
-export declare interface SapS4HanaPropertiesBase {
+export declare interface SapS4HanaProperties extends DataSourceProperties {
     applicationServer?: string;
     systemNumber?: string;
 }
 
-export declare type SapS4HanaSapS4HanaCredentialScan = SapS4HanaSapS4HanaCredentialScanBase & Scan;
-
-export declare interface SapS4HanaSapS4HanaCredentialScanBase {
+export declare interface SapS4HanaSapS4HanaCredentialScan extends ScanBase {
     properties?: SapS4HanaSapS4HanaCredentialScanPropertiesAutoGenerated;
+    kind: "SapS4HanaSapS4HanaCredential";
 }
 
-export declare type SapS4HanaSapS4HanaCredentialScanProperties = SapS4HanaSapS4HanaCredentialScanPropertiesBase & MitiScanProperties;
-
-export declare type SapS4HanaSapS4HanaCredentialScanPropertiesAutoGenerated = SapS4HanaSapS4HanaCredentialScanPropertiesAutoGeneratedBase & SapS4HanaSapS4HanaCredentialScanProperties;
-
-export declare interface SapS4HanaSapS4HanaCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface SapS4HanaSapS4HanaCredentialScanPropertiesBase {
+export declare interface SapS4HanaSapS4HanaCredentialScanProperties extends MitiScanProperties {
     clientId?: string;
     credential?: SapS4HanaSapS4HanaCredentialScanPropertiesCredential;
     jCoLibraryPath?: string;
 }
 
-export declare type SapS4HanaSapS4HanaCredentialScanPropertiesCredential = SapS4HanaSapS4HanaCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface SapS4HanaSapS4HanaCredentialScanPropertiesCredentialBase {
+export declare interface SapS4HanaSapS4HanaCredentialScanPropertiesAutoGenerated extends SapS4HanaSapS4HanaCredentialScanProperties {
 }
 
-export declare type SapS4HanaSapS4HanaUserPassScan = SapS4HanaSapS4HanaUserPassScanBase & Scan;
-
-export declare interface SapS4HanaSapS4HanaUserPassScanBase {
-    properties?: SapS4HanaSapS4HanaUserPassScanPropertiesAutoGenerated;
+export declare interface SapS4HanaSapS4HanaCredentialScanPropertiesCredential extends CredentialReference {
 }
 
-export declare type SapS4HanaSapS4HanaUserPassScanProperties = SapS4HanaSapS4HanaUserPassScanPropertiesBase & MitiScanProperties;
-
-export declare type SapS4HanaSapS4HanaUserPassScanPropertiesAutoGenerated = SapS4HanaSapS4HanaUserPassScanPropertiesAutoGeneratedBase & SapS4HanaSapS4HanaUserPassScanProperties;
-
-export declare interface SapS4HanaSapS4HanaUserPassScanPropertiesAutoGeneratedBase {
+export declare interface SapS4HanaSapS4HanaUserPassScan extends ScanBase {
+    properties?: SapS4HanaSapS4HanaUserPassScanPropertiesAutoGenerated;
+    kind: "SapS4HanaSapS4HanaUserPass";
 }
 
-export declare interface SapS4HanaSapS4HanaUserPassScanPropertiesBase {
+export declare interface SapS4HanaSapS4HanaUserPassScanProperties extends MitiScanProperties {
     clientId?: string;
     username?: string;
     password?: string;
     jCoLibraryPath?: string;
 }
 
-export declare type SapS4HanaScanRuleset = SapS4HanaScanRulesetBase & ScanRuleset;
+export declare interface SapS4HanaSapS4HanaUserPassScanPropertiesAutoGenerated extends SapS4HanaSapS4HanaUserPassScanProperties {
+}
 
-export declare interface SapS4HanaScanRulesetBase {
+export declare interface SapS4HanaScanRuleset extends ScanRulesetBase {
     properties?: SapS4HanaScanRulesetPropertiesAutoGenerated;
+    kind: "SapS4Hana";
 }
 
-export declare type SapS4HanaScanRulesetProperties = SapS4HanaScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type SapS4HanaScanRulesetPropertiesAutoGenerated = SapS4HanaScanRulesetPropertiesAutoGeneratedBase & SapS4HanaScanRulesetProperties;
-
-export declare interface SapS4HanaScanRulesetPropertiesAutoGeneratedBase {
+export declare interface SapS4HanaScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface SapS4HanaScanRulesetPropertiesBase {
+export declare interface SapS4HanaScanRulesetPropertiesAutoGenerated extends SapS4HanaScanRulesetProperties {
 }
 
-export declare type SapS4HanaSystemScanRuleset = SapS4HanaSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface SapS4HanaSystemScanRulesetBase {
+export declare interface SapS4HanaSystemScanRuleset extends SystemScanRulesetBase {
     properties?: SapS4HanaSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type SapS4HanaSystemScanRulesetProperties = SapS4HanaSystemScanRulesetPropertiesBase & SapS4HanaScanRulesetProperties;
-
-export declare interface SapS4HanaSystemScanRulesetPropertiesBase {
+export declare interface SapS4HanaSystemScanRulesetProperties extends SapS4HanaScanRulesetProperties {
 }
 
-export declare type Scan = ScanBase & ProxyResource;
-
-export declare type ScanAuthorizationType = "AzureSubscriptionCredential" | "AzureSubscriptionMsi" | "AzureResourceGroupCredential" | "AzureResourceGroupMsi" | "AzureSynapseWorkspaceCredential" | "AzureSynapseWorkspaceMsi" | "AzureSynapseCredential" | "AzureSynapseMsi" | "AdlsGen1Credential" | "AdlsGen1Msi" | "AdlsGen2Credential" | "AdlsGen2Msi" | "AmazonAccountCredential" | "AmazonS3Credential" | "AmazonS3RoleARN" | "AmazonSqlCredential" | "AzureCosmosDbCredential" | "AzureDataExplorerCredential" | "AzureDataExplorerMsi" | "AzureFileServiceCredential" | "AzureSqlDatabaseCredential" | "AzureSqlDatabaseMsi" | "AmazonPostgreSqlCredential" | "AzurePostgreSqlCredential" | "SqlServerDatabaseCredential" | "AzureSqlDatabaseManagedInstanceCredential" | "AzureSqlDatabaseManagedInstanceMsi" | "AzureSqlDataWarehouseCredential" | "AzureSqlDataWarehouseMsi" | "AzureMySqlCredential" | "AzureStorageCredential" | "AzureStorageMsi" | "TeradataTeradataCredential" | "TeradataTeradataUserPass" | "TeradataUserPass" | "OracleOracleCredential" | "OracleOracleUserPass" | "SapS4HanaSapS4HanaCredential" | "SapS4HanaSapS4HanaUserPass" | "SapEccSapEccCredential" | "SapEccSapEccUserPass" | "PowerBIDelegated" | "PowerBIMsi";
+export declare type Scan = ScanBase | AzureSubscriptionCredentialScan | AzureSubscriptionMsiScan | AzureResourceGroupCredentialScan | AzureResourceGroupMsiScan | AzureSynapseWorkspaceCredentialScan | AzureSynapseWorkspaceMsiScan | AzureSynapseCredentialScan | AzureSynapseMsiScan | AdlsGen1CredentialScan | AdlsGen1MsiScan | AdlsGen2CredentialScan | AdlsGen2MsiScan | AmazonAccountCredentialScan | AmazonS3CredentialScan | AmazonS3RoleARNScan | AmazonSqlCredentialScan | AzureCosmosDbCredentialScan | AzureDataExplorerCredentialScan | AzureDataExplorerMsiScan | AzureFileServiceCredentialScan | AzureSqlDatabaseCredentialScan | AzureSqlDatabaseMsiScan | AmazonPostgreSqlCredentialScan | AzurePostgreSqlCredentialScan | SqlServerDatabaseCredentialScan | AzureSqlDatabaseManagedInstanceCredentialScan | AzureSqlDatabaseManagedInstanceMsiScan | AzureSqlDataWarehouseCredentialScan | AzureSqlDataWarehouseMsiScan | AzureMySqlCredentialScan | AzureStorageCredentialScan | AzureStorageMsiScan | TeradataCredentialScan | TeradataUserPassScan | TeradataUserPassScanAutoGenerated | OracleCredentialScan | OracleUserPassScan | SapS4HanaSapS4HanaCredentialScan | SapS4HanaSapS4HanaUserPassScan | SapEccCredentialScan | SapEccUserPassScan | PowerBIDelegatedScan | PowerBIMsiScan;
 
-export declare interface ScanBase {
-    kind: ScanAuthorizationType;
-    scanResults?: ScanResult[];
+export declare interface ScanBase extends ProxyResource {
+    scanResults?: Array<ScanResult>;
+    kind: "Scan" | "AzureSubscriptionCredential" | "AzureSubscriptionMsi" | "AzureResourceGroupCredential" | "AzureResourceGroupMsi" | "AzureSynapseWorkspaceCredential" | "AzureSynapseWorkspaceMsi" | "AzureSynapseCredential" | "AzureSynapseMsi" | "AdlsGen1Credential" | "AdlsGen1Msi" | "AdlsGen2Credential" | "AdlsGen2Msi" | "AmazonAccountCredential" | "AmazonS3Credential" | "AmazonS3RoleARN" | "AmazonSqlCredential" | "AzureCosmosDbCredential" | "AzureDataExplorerCredential" | "AzureDataExplorerMsi" | "AzureFileServiceCredential" | "AzureSqlDatabaseCredential" | "AzureSqlDatabaseMsi" | "AmazonPostgreSqlCredential" | "AzurePostgreSqlCredential" | "SqlServerDatabaseCredential" | "AzureSqlDatabaseManagedInstanceCredential" | "AzureSqlDatabaseManagedInstanceMsi" | "AzureSqlDataWarehouseCredential" | "AzureSqlDataWarehouseMsi" | "AzureMySqlCredential" | "AzureStorageCredential" | "AzureStorageMsi" | "TeradataTeradataCredential" | "TeradataUserPass" | "TeradataTeradataUserPass" | "OracleOracleCredential" | "OracleOracleUserPass" | "SapS4HanaSapS4HanaCredential" | "SapS4HanaSapS4HanaUserPass" | "SapEccSapEccCredential" | "SapEccSapEccUserPass" | "PowerBIDelegated" | "PowerBIMsi";
 }
 
 export declare interface ScanDiagnostics {
-    notifications?: Notification[];
+    notifications?: Array<Notification>;
     /** Dictionary of <integer> */
-    exceptionCountMap?: ScanDiagnosticsExceptionCountMapDictionary;
+    exceptionCountMap?: Record<string, number>;
 }
 
-export declare type ScanDiagnosticsExceptionCountMapDictionary = Record<string, number>;
-
 export declare interface ScanHistoryList {
-    value?: ScanResult[];
+    value?: Array<ScanResult>;
     nextLink?: string;
     count?: number;
 }
 
-export declare type ScanLevelType = "Full" | "Incremental";
-
 export declare interface ScanList {
-    value?: Scan[];
+    value?: Array<Scan>;
     nextLink?: string;
     count?: number;
 }
 
 export declare interface ScanningRule {
-    fileExtensions?: "AVRO" | "ORC" | "PARQUET" | "JSON" | "TXT" | "XML" | "Documents" | "CSV" | "PSV" | "SSV" | "TSV" | "GZ" | "DOC" | "DOCM" | "DOCX" | "DOT" | "ODP" | "ODS" | "ODT" | "PDF" | "POT" | "PPS" | "PPSX" | "PPT" | "PPTM" | "PPTX" | "XLC" | "XLS" | "XLSB" | "XLSM" | "XLSX" | "XLT"[];
-    customFileExtensions?: CustomFileExtension[];
+    fileExtensions?: Array<"AVRO" | "ORC" | "PARQUET" | "JSON" | "TXT" | "XML" | "Documents" | "CSV" | "PSV" | "SSV" | "TSV" | "GZ" | "DOC" | "DOCM" | "DOCX" | "DOT" | "ODP" | "ODS" | "ODT" | "PDF" | "POT" | "PPS" | "PPSX" | "PPT" | "PPTM" | "PPTX" | "XLC" | "XLS" | "XLSB" | "XLSM" | "XLSX" | "XLT">;
+    customFileExtensions?: Array<CustomFileExtension>;
 }
 
-export declare type ScanningRuleScanRulesetProperties = ScanningRuleScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare interface ScanningRuleScanRulesetPropertiesBase {
+export declare interface ScanningRuleScanRulesetProperties extends ScanRulesetProperties {
     scanningRule?: ScanningRuleScanRulesetPropertiesScanningRule;
 }
 
-export declare type ScanningRuleScanRulesetPropertiesScanningRule = ScanningRuleScanRulesetPropertiesScanningRuleBase & ScanningRule;
-
-export declare interface ScanningRuleScanRulesetPropertiesScanningRuleBase {
+export declare interface ScanningRuleScanRulesetPropertiesScanningRule extends ScanningRule {
 }
 
 export declare interface ScanProperties {
     scanRulesetName?: string;
-    scanRulesetType?: ScanRulesetType;
+    scanRulesetType?: "Custom" | "System";
+    collection?: ScanPropertiesCollection;
     workers?: number;
     createdAt?: Date;
     lastModifiedAt?: Date;
     connectedVia?: ScanPropertiesConnectedVia;
 }
 
-export declare type ScanPropertiesConnectedVia = ScanPropertiesConnectedViaBase & ConnectedVia;
+export declare interface ScanPropertiesCollection extends CollectionReference {
+}
 
-export declare interface ScanPropertiesConnectedViaBase {
+export declare interface ScanPropertiesConnectedVia extends ConnectedVia {
 }
 
 export declare interface ScanResult {
@@ -2565,12 +2036,12 @@ export declare interface ScanResult {
     pipelineStartTime?: Date;
     endTime?: Date;
     scanRulesetVersion?: number;
-    scanRulesetType?: ScanRulesetType;
-    scanLevelType?: ScanLevelType;
+    scanRulesetType?: "Custom" | "System";
+    scanLevelType?: "Full" | "Incremental";
     errorMessage?: string;
     error?: ScanResultError;
     runType?: string;
-    dataSourceType?: DataSourceType;
+    dataSourceType?: "None" | "AzureSubscription" | "AzureResourceGroup" | "AzureSynapseWorkspace" | "AzureSynapse" | "AdlsGen1" | "AdlsGen2" | "AmazonAccount" | "AmazonS3" | "AmazonSql" | "AzureCosmosDb" | "AzureDataExplorer" | "AzureFileService" | "AzureSqlDatabase" | "AmazonPostgreSql" | "AzurePostgreSql" | "SqlServerDatabase" | "AzureSqlDatabaseManagedInstance" | "AzureSqlDataWarehouse" | "AzureMySql" | "AzureStorage" | "Teradata" | "Oracle" | "SapS4Hana" | "SapEcc" | "PowerBI";
 }
 
 export declare interface ScanResultCancelScan {
@@ -2592,14 +2063,10 @@ export declare interface ScanResultCancelScandefaultResponse extends HttpRespons
 
 export declare type ScanResultCancelScanParameters = RequestParameters;
 
-export declare type ScanResultDiagnostics = ScanResultDiagnosticsBase & ScanDiagnostics;
-
-export declare interface ScanResultDiagnosticsBase {
+export declare interface ScanResultDiagnostics extends ScanDiagnostics {
 }
 
-export declare type ScanResultError = ScanResultErrorBase & ErrorModel;
-
-export declare interface ScanResultErrorBase {
+export declare interface ScanResultError extends ErrorModel {
 }
 
 export declare interface ScanResultListScanHistory {
@@ -2638,24 +2105,24 @@ export declare interface ScanResultRunScandefaultResponse extends HttpResponse {
     body: ErrorResponseModel;
 }
 
-export declare type ScanResultRunScanParameters = RequestParameters & ScanResultRunScanQueryParam;
+export declare type ScanResultRunScanParameters = ScanResultRunScanQueryParam & RequestParameters;
 
 export declare interface ScanResultRunScanQueryParam {
     queryParameters?: ScanResultRunScanQueryParamProperties;
 }
 
 export declare interface ScanResultRunScanQueryParamProperties {
-    scanLevel?: ScanLevelType;
+    scanLevel?: "Full" | "Incremental";
 }
 
-export declare type ScanRuleset = ScanRulesetBase & VersionedScanRuleset;
+export declare type ScanRuleset = ScanRulesetBase | AzureSubscriptionScanRuleset | AzureResourceGroupScanRuleset | AzureSynapseWorkspaceScanRuleset | AzureSynapseScanRuleset | AdlsGen1ScanRuleset | AdlsGen2ScanRuleset | AmazonAccountScanRuleset | AmazonS3ScanRuleset | AmazonSqlScanRuleset | AzureCosmosDbScanRuleset | AzureDataExplorerScanRuleset | AzureFileServiceScanRuleset | AzureSqlDatabaseScanRuleset | AmazonPostgreSqlScanRuleset | AzurePostgreSqlScanRuleset | SqlServerDatabaseScanRuleset | AzureSqlDatabaseManagedInstanceScanRuleset | AzureSqlDataWarehouseScanRuleset | AzureMySqlScanRuleset | AzureStorageScanRuleset | TeradataScanRuleset | OracleScanRuleset | SapS4HanaScanRuleset | SapEccScanRuleset | PowerBIScanRuleset;
 
-export declare interface ScanRulesetBase {
-    kind: DataSourceType;
+export declare interface ScanRulesetBase extends VersionedScanRuleset {
+    kind: "ScanRuleset" | "AzureSubscription" | "AzureResourceGroup" | "AzureSynapseWorkspace" | "AzureSynapse" | "AdlsGen1" | "AdlsGen2" | "AmazonAccount" | "AmazonS3" | "AmazonSql" | "AzureCosmosDb" | "AzureDataExplorer" | "AzureFileService" | "AzureSqlDatabase" | "AmazonPostgreSql" | "AzurePostgreSql" | "SqlServerDatabase" | "AzureSqlDatabaseManagedInstance" | "AzureSqlDataWarehouse" | "AzureMySql" | "AzureStorage" | "Teradata" | "Oracle" | "SapS4Hana" | "SapEcc" | "PowerBI";
 }
 
 export declare interface ScanRulesetList {
-    value?: ScanRuleset[];
+    value?: Array<ScanRuleset>;
     nextLink?: string;
     count?: number;
 }
@@ -2663,8 +2130,8 @@ export declare interface ScanRulesetList {
 export declare interface ScanRulesetProperties {
     createdAt?: Date;
     description?: string;
-    excludedSystemClassifications?: string[];
-    includedCustomClassificationRuleNames?: string[];
+    excludedSystemClassifications?: Array<string>;
+    includedCustomClassificationRuleNames?: Array<string>;
     lastModifiedAt?: Date;
 }
 
@@ -2690,16 +2157,7 @@ export declare interface ScanRulesetsCreateOrUpdatedefaultResponse extends HttpR
     body: ErrorResponseModel;
 }
 
-export declare type ScanRulesetsCreateOrUpdateParameters = RequestParameters & ScanRulesetsCreateOrUpdateBodyParam;
-
-export declare interface ScanRulesetsDelete {
-    /** Get a scan ruleset */
-    get(options?: ScanRulesetsGetParameters): Promise<ScanRulesetsGet200Response | ScanRulesetsGetdefaultResponse>;
-    /** Creates or Updates a scan ruleset */
-    put(options?: ScanRulesetsCreateOrUpdateParameters): Promise<ScanRulesetsCreateOrUpdate200Response | ScanRulesetsCreateOrUpdate201Response | ScanRulesetsCreateOrUpdatedefaultResponse>;
-    /** Deletes a scan ruleset */
-    delete(options?: ScanRulesetsDeleteParameters): Promise<ScanRulesetsDelete200Response | ScanRulesetsDelete204Response | ScanRulesetsDeletedefaultResponse>;
-}
+export declare type ScanRulesetsCreateOrUpdateParameters = ScanRulesetsCreateOrUpdateBodyParam & RequestParameters;
 
 /** Deletes a scan ruleset */
 export declare interface ScanRulesetsDelete200Response extends HttpResponse {
@@ -2710,6 +2168,7 @@ export declare interface ScanRulesetsDelete200Response extends HttpResponse {
 /** Deletes a scan ruleset */
 export declare interface ScanRulesetsDelete204Response extends HttpResponse {
     status: "204";
+    body: Record<string, unknown>;
 }
 
 /** Deletes a scan ruleset */
@@ -2720,6 +2179,15 @@ export declare interface ScanRulesetsDeletedefaultResponse extends HttpResponse
 
 export declare type ScanRulesetsDeleteParameters = RequestParameters;
 
+export declare interface ScanRulesetsGet {
+    /** Get a scan ruleset */
+    get(options?: ScanRulesetsGetParameters): Promise<ScanRulesetsGet200Response | ScanRulesetsGetdefaultResponse>;
+    /** Creates or Updates a scan ruleset */
+    put(options?: ScanRulesetsCreateOrUpdateParameters): Promise<ScanRulesetsCreateOrUpdate200Response | ScanRulesetsCreateOrUpdate201Response | ScanRulesetsCreateOrUpdatedefaultResponse>;
+    /** Deletes a scan ruleset */
+    delete(options?: ScanRulesetsDeleteParameters): Promise<ScanRulesetsDelete200Response | ScanRulesetsDelete204Response | ScanRulesetsDeletedefaultResponse>;
+}
+
 /** Get a scan ruleset */
 export declare interface ScanRulesetsGet200Response extends HttpResponse {
     status: "200";
@@ -2753,9 +2221,14 @@ export declare interface ScanRulesetsListAlldefaultResponse extends HttpResponse
 
 export declare type ScanRulesetsListAllParameters = RequestParameters;
 
-export declare type ScanRulesetStatus = "Enabled" | "Disabled";
-
-export declare type ScanRulesetType = "Custom" | "System";
+export declare interface ScansCreateOrUpdate {
+    /** Creates an instance of a scan */
+    put(options: ScansCreateOrUpdateParameters): Promise<ScansCreateOrUpdate200Response | ScansCreateOrUpdate201Response | ScansCreateOrUpdatedefaultResponse>;
+    /** Gets a scan information */
+    get(options?: ScansGetParameters): Promise<ScansGet200Response | ScansGetdefaultResponse>;
+    /** Deletes the scan associated with the data source */
+    delete(options?: ScansDeleteParameters): Promise<ScansDelete200Response | ScansDelete204Response | ScansDeletedefaultResponse>;
+}
 
 /** Creates an instance of a scan */
 export declare interface ScansCreateOrUpdate200Response extends HttpResponse {
@@ -2779,16 +2252,7 @@ export declare interface ScansCreateOrUpdatedefaultResponse extends HttpResponse
     body: ErrorResponseModel;
 }
 
-export declare type ScansCreateOrUpdateParameters = RequestParameters & ScansCreateOrUpdateBodyParam;
-
-export declare interface ScansDelete {
-    /** Creates an instance of a scan */
-    put(options: ScansCreateOrUpdateParameters): Promise<ScansCreateOrUpdate200Response | ScansCreateOrUpdate201Response | ScansCreateOrUpdatedefaultResponse>;
-    /** Gets a scan information */
-    get(options?: ScansGetParameters): Promise<ScansGet200Response | ScansGetdefaultResponse>;
-    /** Deletes the scan associated with the data source */
-    delete(options?: ScansDeleteParameters): Promise<ScansDelete200Response | ScansDelete204Response | ScansDeletedefaultResponse>;
-}
+export declare type ScansCreateOrUpdateParameters = ScansCreateOrUpdateBodyParam & RequestParameters;
 
 /** Deletes the scan associated with the data source */
 export declare interface ScansDelete200Response extends HttpResponse {
@@ -2799,6 +2263,7 @@ export declare interface ScansDelete200Response extends HttpResponse {
 /** Deletes the scan associated with the data source */
 export declare interface ScansDelete204Response extends HttpResponse {
     status: "204";
+    body: Record<string, unknown>;
 }
 
 /** Deletes the scan associated with the data source */
@@ -2842,94 +2307,73 @@ export declare interface ScansListByDataSourcedefaultResponse extends HttpRespon
 
 export declare type ScansListByDataSourceParameters = RequestParameters;
 
-export declare type SqlServerDatabaseCredentialScan = SqlServerDatabaseCredentialScanBase & Scan;
-
-export declare interface SqlServerDatabaseCredentialScanBase {
+export declare interface SqlServerDatabaseCredentialScan extends ScanBase {
     properties?: SqlServerDatabaseCredentialScanPropertiesAutoGenerated;
+    kind: "SqlServerDatabaseCredential";
 }
 
-export declare type SqlServerDatabaseCredentialScanProperties = SqlServerDatabaseCredentialScanPropertiesBase & AzureSqlCredentialScanProperties;
-
-export declare type SqlServerDatabaseCredentialScanPropertiesAutoGenerated = SqlServerDatabaseCredentialScanPropertiesAutoGeneratedBase & SqlServerDatabaseCredentialScanProperties;
-
-export declare interface SqlServerDatabaseCredentialScanPropertiesAutoGeneratedBase {
+export declare interface SqlServerDatabaseCredentialScanProperties extends AzureSqlCredentialScanProperties {
 }
 
-export declare interface SqlServerDatabaseCredentialScanPropertiesBase {
+export declare interface SqlServerDatabaseCredentialScanPropertiesAutoGenerated extends SqlServerDatabaseCredentialScanProperties {
 }
 
-export declare type SqlServerDatabaseDataSource = SqlServerDatabaseDataSourceBase & DataSource;
-
-export declare interface SqlServerDatabaseDataSourceBase {
+export declare interface SqlServerDatabaseDataSource extends DataSourceBase {
     properties?: SqlServerDatabaseDataSourceProperties;
+    kind: "SqlServerDatabase";
 }
 
-export declare type SqlServerDatabaseDataSourceProperties = SqlServerDatabaseDataSourcePropertiesBase & SqlServerDatabaseProperties;
-
-export declare interface SqlServerDatabaseDataSourcePropertiesBase {
+export declare interface SqlServerDatabaseDataSourceProperties extends SqlServerDatabaseProperties {
 }
 
-export declare type SqlServerDatabaseProperties = SqlServerDatabasePropertiesBase & AzureDataSourceProperties;
-
-export declare interface SqlServerDatabasePropertiesBase {
+export declare interface SqlServerDatabaseProperties extends AzureDataSourceProperties {
     serverEndpoint?: string;
 }
 
-export declare type SqlServerDatabaseScanRuleset = SqlServerDatabaseScanRulesetBase & ScanRuleset;
-
-export declare interface SqlServerDatabaseScanRulesetBase {
+export declare interface SqlServerDatabaseScanRuleset extends ScanRulesetBase {
     properties?: SqlServerDatabaseScanRulesetPropertiesAutoGenerated;
+    kind: "SqlServerDatabase";
 }
 
-export declare type SqlServerDatabaseScanRulesetProperties = SqlServerDatabaseScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type SqlServerDatabaseScanRulesetPropertiesAutoGenerated = SqlServerDatabaseScanRulesetPropertiesAutoGeneratedBase & SqlServerDatabaseScanRulesetProperties;
-
-export declare interface SqlServerDatabaseScanRulesetPropertiesAutoGeneratedBase {
+export declare interface SqlServerDatabaseScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface SqlServerDatabaseScanRulesetPropertiesBase {
+export declare interface SqlServerDatabaseScanRulesetPropertiesAutoGenerated extends SqlServerDatabaseScanRulesetProperties {
 }
 
-export declare type SqlServerDatabaseSystemScanRuleset = SqlServerDatabaseSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface SqlServerDatabaseSystemScanRulesetBase {
+export declare interface SqlServerDatabaseSystemScanRuleset extends SystemScanRulesetBase {
     properties?: SqlServerDatabaseSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type SqlServerDatabaseSystemScanRulesetProperties = SqlServerDatabaseSystemScanRulesetPropertiesBase & SqlServerDatabaseScanRulesetProperties;
-
-export declare interface SqlServerDatabaseSystemScanRulesetPropertiesBase {
+export declare interface SqlServerDatabaseSystemScanRulesetProperties extends SqlServerDatabaseScanRulesetProperties {
 }
 
-export declare type SystemClassificationRule = SystemClassificationRuleBase & ClassificationRule;
-
-export declare interface SystemClassificationRuleBase {
+export declare interface SystemClassificationRule extends ClassificationRuleBase {
     properties?: SystemClassificationRulePropertiesAutoGenerated;
+    kind: "System";
 }
 
 export declare interface SystemClassificationRuleProperties {
     description?: string;
     version?: number;
     classificationName?: string;
-    ruleStatus?: ClassificationRuleStatus;
+    ruleStatus?: "Enabled" | "Disabled";
     createdAt?: Date;
     lastModifiedAt?: Date;
 }
 
-export declare type SystemClassificationRulePropertiesAutoGenerated = SystemClassificationRulePropertiesAutoGeneratedBase & SystemClassificationRuleProperties;
-
-export declare interface SystemClassificationRulePropertiesAutoGeneratedBase {
+export declare interface SystemClassificationRulePropertiesAutoGenerated extends SystemClassificationRuleProperties {
 }
 
-export declare type SystemScanRuleset = SystemScanRulesetBase & VersionedScanRuleset;
+export declare type SystemScanRuleset = SystemScanRulesetBase | AzureSubscriptionSystemScanRuleset | AzureResourceGroupSystemScanRuleset | AzureSynapseWorkspaceSystemScanRuleset | AzureSynapseSystemScanRuleset | AdlsGen1SystemScanRuleset | AdlsGen2SystemScanRuleset | AmazonAccountSystemScanRuleset | AmazonS3SystemScanRuleset | AmazonSqlSystemScanRuleset | AzureCosmosDbSystemScanRuleset | AzureDataExplorerSystemScanRuleset | AzureFileServiceSystemScanRuleset | AzureSqlDatabaseSystemScanRuleset | AmazonPostgreSqlSystemScanRuleset | AzurePostgreSqlSystemScanRuleset | SqlServerDatabaseSystemScanRuleset | AzureSqlDatabaseManagedInstanceSystemScanRuleset | AzureSqlDataWarehouseSystemScanRuleset | AzureMySqlSystemScanRuleset | AzureStorageSystemScanRuleset | TeradataSystemScanRuleset | OracleSystemScanRuleset | SapS4HanaSystemScanRuleset | SapEccSystemScanRuleset | PowerBISystemScanRuleset;
 
-export declare interface SystemScanRulesetBase {
-    kind: DataSourceType;
+export declare interface SystemScanRulesetBase extends VersionedScanRuleset {
+    kind: "SystemScanRuleset" | "None";
 }
 
 export declare interface SystemScanRulesetList {
-    value?: SystemScanRuleset[];
+    value?: Array<SystemScanRuleset>;
     nextLink?: string;
     count?: number;
 }
@@ -2962,14 +2406,14 @@ export declare interface SystemScanRulesetsGetByVersiondefaultResponse extends H
     body: ErrorResponseModel;
 }
 
-export declare type SystemScanRulesetsGetByVersionParameters = RequestParameters & SystemScanRulesetsGetByVersionQueryParam;
+export declare type SystemScanRulesetsGetByVersionParameters = SystemScanRulesetsGetByVersionQueryParam & RequestParameters;
 
 export declare interface SystemScanRulesetsGetByVersionQueryParam {
     queryParameters?: SystemScanRulesetsGetByVersionQueryParamProperties;
 }
 
 export declare interface SystemScanRulesetsGetByVersionQueryParamProperties {
-    dataSourceType?: DataSourceType;
+    dataSourceType?: "None" | "AzureSubscription" | "AzureResourceGroup" | "AzureSynapseWorkspace" | "AzureSynapse" | "AdlsGen1" | "AdlsGen2" | "AmazonAccount" | "AmazonS3" | "AmazonSql" | "AzureCosmosDb" | "AzureDataExplorer" | "AzureFileService" | "AzureSqlDatabase" | "AmazonPostgreSql" | "AzurePostgreSql" | "SqlServerDatabase" | "AzureSqlDatabaseManagedInstance" | "AzureSqlDataWarehouse" | "AzureMySql" | "AzureStorage" | "Teradata" | "Oracle" | "SapS4Hana" | "SapEcc" | "PowerBI";
 }
 
 /** Get a system scan ruleset for a data source */
@@ -2995,14 +2439,14 @@ export declare interface SystemScanRulesetsGetLatestdefaultResponse extends Http
     body: ErrorResponseModel;
 }
 
-export declare type SystemScanRulesetsGetLatestParameters = RequestParameters & SystemScanRulesetsGetLatestQueryParam;
+export declare type SystemScanRulesetsGetLatestParameters = SystemScanRulesetsGetLatestQueryParam & RequestParameters;
 
 export declare interface SystemScanRulesetsGetLatestQueryParam {
     queryParameters?: SystemScanRulesetsGetLatestQueryParamProperties;
 }
 
 export declare interface SystemScanRulesetsGetLatestQueryParamProperties {
-    dataSourceType?: DataSourceType;
+    dataSourceType?: "None" | "AzureSubscription" | "AzureResourceGroup" | "AzureSynapseWorkspace" | "AzureSynapse" | "AdlsGen1" | "AdlsGen2" | "AmazonAccount" | "AmazonS3" | "AmazonSql" | "AzureCosmosDb" | "AzureDataExplorer" | "AzureFileService" | "AzureSqlDatabase" | "AmazonPostgreSql" | "AzurePostgreSql" | "SqlServerDatabase" | "AzureSqlDatabaseManagedInstance" | "AzureSqlDataWarehouse" | "AzureMySql" | "AzureStorage" | "Teradata" | "Oracle" | "SapS4Hana" | "SapEcc" | "PowerBI";
 }
 
 export declare type SystemScanRulesetsGetParameters = RequestParameters;
@@ -3043,152 +2487,114 @@ export declare interface SystemScanRulesetsListVersionsByDataSourcedefaultRespon
     body: ErrorResponseModel;
 }
 
-export declare type SystemScanRulesetsListVersionsByDataSourceParameters = RequestParameters & SystemScanRulesetsListVersionsByDataSourceQueryParam;
+export declare type SystemScanRulesetsListVersionsByDataSourceParameters = SystemScanRulesetsListVersionsByDataSourceQueryParam & RequestParameters;
 
 export declare interface SystemScanRulesetsListVersionsByDataSourceQueryParam {
     queryParameters?: SystemScanRulesetsListVersionsByDataSourceQueryParamProperties;
 }
 
 export declare interface SystemScanRulesetsListVersionsByDataSourceQueryParamProperties {
-    dataSourceType?: DataSourceType;
+    dataSourceType?: "None" | "AzureSubscription" | "AzureResourceGroup" | "AzureSynapseWorkspace" | "AzureSynapse" | "AdlsGen1" | "AdlsGen2" | "AmazonAccount" | "AmazonS3" | "AmazonSql" | "AzureCosmosDb" | "AzureDataExplorer" | "AzureFileService" | "AzureSqlDatabase" | "AmazonPostgreSql" | "AzurePostgreSql" | "SqlServerDatabase" | "AzureSqlDatabaseManagedInstance" | "AzureSqlDataWarehouse" | "AzureMySql" | "AzureStorage" | "Teradata" | "Oracle" | "SapS4Hana" | "SapEcc" | "PowerBI";
 }
 
-export declare type TeradataCredentialScan = TeradataCredentialScanBase & Scan;
-
-export declare interface TeradataCredentialScanBase {
+export declare interface TeradataCredentialScan extends ScanBase {
     properties?: TeradataCredentialScanPropertiesAutoGenerated;
+    kind: "TeradataTeradataCredential";
 }
 
-export declare type TeradataCredentialScanProperties = TeradataCredentialScanPropertiesBase & MitiScanProperties;
-
-export declare type TeradataCredentialScanPropertiesAutoGenerated = TeradataCredentialScanPropertiesAutoGeneratedBase & TeradataCredentialScanProperties;
-
-export declare interface TeradataCredentialScanPropertiesAutoGeneratedBase {
-}
-
-export declare interface TeradataCredentialScanPropertiesBase {
+export declare interface TeradataCredentialScanProperties extends MitiScanProperties {
     credential?: TeradataCredentialScanPropertiesCredential;
     schema?: string;
     driverLocation?: string;
 }
 
-export declare type TeradataCredentialScanPropertiesCredential = TeradataCredentialScanPropertiesCredentialBase & CredentialReference;
-
-export declare interface TeradataCredentialScanPropertiesCredentialBase {
+export declare interface TeradataCredentialScanPropertiesAutoGenerated extends TeradataCredentialScanProperties {
 }
 
-export declare type TeradataDataSource = TeradataDataSourceBase & DataSource;
+export declare interface TeradataCredentialScanPropertiesCredential extends CredentialReference {
+}
 
-export declare interface TeradataDataSourceBase {
+export declare interface TeradataDataSource extends DataSourceBase {
     properties?: TeradataDataSourceProperties;
+    kind: "Teradata";
 }
 
-export declare type TeradataDataSourceProperties = TeradataDataSourcePropertiesBase & TeradataProperties;
-
-export declare interface TeradataDataSourcePropertiesBase {
+export declare interface TeradataDataSourceProperties extends TeradataProperties {
 }
 
-export declare type TeradataProperties = TeradataPropertiesBase & DataSourceProperties;
-
-export declare interface TeradataPropertiesBase {
+export declare interface TeradataProperties extends DataSourceProperties {
     host?: string;
 }
 
-export declare type TeradataScanRuleset = TeradataScanRulesetBase & ScanRuleset;
-
-export declare interface TeradataScanRulesetBase {
+export declare interface TeradataScanRuleset extends ScanRulesetBase {
     properties?: TeradataScanRulesetPropertiesAutoGenerated;
+    kind: "Teradata";
 }
 
-export declare type TeradataScanRulesetProperties = TeradataScanRulesetPropertiesBase & ScanRulesetProperties;
-
-export declare type TeradataScanRulesetPropertiesAutoGenerated = TeradataScanRulesetPropertiesAutoGeneratedBase & TeradataScanRulesetProperties;
-
-export declare interface TeradataScanRulesetPropertiesAutoGeneratedBase {
+export declare interface TeradataScanRulesetProperties extends ScanRulesetProperties {
 }
 
-export declare interface TeradataScanRulesetPropertiesBase {
+export declare interface TeradataScanRulesetPropertiesAutoGenerated extends TeradataScanRulesetProperties {
 }
 
-export declare type TeradataSystemScanRuleset = TeradataSystemScanRulesetBase & SystemScanRuleset;
-
-export declare interface TeradataSystemScanRulesetBase {
+export declare interface TeradataSystemScanRuleset extends SystemScanRulesetBase {
     properties?: TeradataSystemScanRulesetProperties;
+    kind: "None";
 }
 
-export declare type TeradataSystemScanRulesetProperties = TeradataSystemScanRulesetPropertiesBase & TeradataScanRulesetProperties;
-
-export declare interface TeradataSystemScanRulesetPropertiesBase {
-}
-
-export declare type TeradataUserPassScan = TeradataUserPassScanBase & Scan;
-
-export declare type TeradataUserPassScanAutoGenerated = TeradataUserPassScanAutoGeneratedBase & Scan;
-
-export declare interface TeradataUserPassScanAutoGeneratedBase {
-    properties?: TeradataUserPassScanPropertiesAutoGenerated3;
+export declare interface TeradataSystemScanRulesetProperties extends TeradataScanRulesetProperties {
 }
 
-export declare interface TeradataUserPassScanBase {
+export declare interface TeradataUserPassScan extends ScanBase {
     properties?: TeradataUserPassScanPropertiesAutoGenerated;
+    kind: "TeradataUserPass";
 }
 
-export declare type TeradataUserPassScanProperties = TeradataUserPassScanPropertiesBase & ScanProperties;
-
-export declare type TeradataUserPassScanPropertiesAutoGenerated = TeradataUserPassScanPropertiesAutoGeneratedBase & TeradataUserPassScanProperties;
-
-export declare type TeradataUserPassScanPropertiesAutoGenerated2 = TeradataUserPassScanPropertiesAutoGenerated2Base & MitiScanProperties;
+export declare interface TeradataUserPassScanAutoGenerated extends ScanBase {
+    properties?: TeradataUserPassScanPropertiesAutoGenerated3;
+    kind: "TeradataTeradataUserPass";
+}
 
-export declare interface TeradataUserPassScanPropertiesAutoGenerated2Base {
+export declare interface TeradataUserPassScanProperties extends ScanProperties {
     username?: string;
     password?: string;
-    schema?: string;
-    driverLocation?: string;
-}
-
-export declare type TeradataUserPassScanPropertiesAutoGenerated3 = TeradataUserPassScanPropertiesAutoGenerated3Base & TeradataUserPassScanPropertiesAutoGenerated2;
-
-export declare interface TeradataUserPassScanPropertiesAutoGenerated3Base {
 }
 
-export declare interface TeradataUserPassScanPropertiesAutoGeneratedBase {
+export declare interface TeradataUserPassScanPropertiesAutoGenerated extends TeradataUserPassScanProperties {
 }
 
-export declare interface TeradataUserPassScanPropertiesBase {
+export declare interface TeradataUserPassScanPropertiesAutoGenerated2 extends MitiScanProperties {
     username?: string;
     password?: string;
+    schema?: string;
+    driverLocation?: string;
 }
 
-export declare type Trigger = TriggerBase & ProxyResource;
-
-export declare interface TriggerBase {
-    properties?: TriggerProperties;
+export declare interface TeradataUserPassScanPropertiesAutoGenerated3 extends TeradataUserPassScanPropertiesAutoGenerated2 {
 }
 
-export declare type TriggerFrequency = "Week" | "Month";
-
-export declare type TriggerProperties = TriggerPropertiesBase & TriggerPropertiesAutoGenerated;
+export declare interface Trigger extends ProxyResource {
+    properties?: TriggerPropertiesAutoGenerated;
+}
 
-export declare interface TriggerPropertiesAutoGenerated {
+export declare interface TriggerProperties {
     recurrence?: TriggerPropertiesRecurrence;
     recurrenceInterval?: string;
     createdAt?: Date;
     lastModifiedAt?: Date;
     lastScheduled?: Date;
-    scanLevel?: ScanLevelType;
+    scanLevel?: "Full" | "Incremental";
     incrementalScanStartTime?: Date;
 }
 
-export declare interface TriggerPropertiesBase {
+export declare interface TriggerPropertiesAutoGenerated extends TriggerProperties {
 }
 
-export declare type TriggerPropertiesRecurrence = TriggerPropertiesRecurrenceBase & TriggerRecurrence;
-
-export declare interface TriggerPropertiesRecurrenceBase {
+export declare interface TriggerPropertiesRecurrence extends TriggerRecurrence {
 }
 
 export declare interface TriggerRecurrence {
-    frequency?: TriggerFrequency;
+    frequency?: "Week" | "Month";
     interval?: number;
     startTime?: Date;
     endTime?: Date;
@@ -3196,9 +2602,7 @@ export declare interface TriggerRecurrence {
     timeZone?: string;
 }
 
-export declare type TriggerRecurrenceSchedule = TriggerRecurrenceScheduleBase & RecurrenceSchedule;
-
-export declare interface TriggerRecurrenceScheduleBase {
+export declare interface TriggerRecurrenceSchedule extends RecurrenceSchedule {
 }
 
 /** Creates an instance of a trigger */
@@ -3223,16 +2627,7 @@ export declare interface TriggersCreateTriggerdefaultResponse extends HttpRespon
     body: ErrorResponseModel;
 }
 
-export declare type TriggersCreateTriggerParameters = RequestParameters & TriggersCreateTriggerBodyParam;
-
-export declare interface TriggersDeleteTrigger {
-    /** Gets trigger information */
-    get(options?: TriggersGetTriggerParameters): Promise<TriggersGetTrigger200Response | TriggersGetTriggerdefaultResponse>;
-    /** Creates an instance of a trigger */
-    put(options: TriggersCreateTriggerParameters): Promise<TriggersCreateTrigger200Response | TriggersCreateTrigger201Response | TriggersCreateTriggerdefaultResponse>;
-    /** Deletes the trigger associated with the scan */
-    delete(options?: TriggersDeleteTriggerParameters): Promise<TriggersDeleteTrigger200Response | TriggersDeleteTrigger204Response | TriggersDeleteTriggerdefaultResponse>;
-}
+export declare type TriggersCreateTriggerParameters = TriggersCreateTriggerBodyParam & RequestParameters;
 
 /** Deletes the trigger associated with the scan */
 export declare interface TriggersDeleteTrigger200Response extends HttpResponse {
@@ -3243,6 +2638,7 @@ export declare interface TriggersDeleteTrigger200Response extends HttpResponse {
 /** Deletes the trigger associated with the scan */
 export declare interface TriggersDeleteTrigger204Response extends HttpResponse {
     status: "204";
+    body: Record<string, unknown>;
 }
 
 /** Deletes the trigger associated with the scan */
@@ -3253,6 +2649,15 @@ export declare interface TriggersDeleteTriggerdefaultResponse extends HttpRespon
 
 export declare type TriggersDeleteTriggerParameters = RequestParameters;
 
+export declare interface TriggersGetTrigger {
+    /** Gets trigger information */
+    get(options?: TriggersGetTriggerParameters): Promise<TriggersGetTrigger200Response | TriggersGetTriggerdefaultResponse>;
+    /** Creates an instance of a trigger */
+    put(options: TriggersCreateTriggerParameters): Promise<TriggersCreateTrigger200Response | TriggersCreateTrigger201Response | TriggersCreateTriggerdefaultResponse>;
+    /** Deletes the trigger associated with the scan */
+    delete(options?: TriggersDeleteTriggerParameters): Promise<TriggersDeleteTrigger200Response | TriggersDeleteTrigger204Response | TriggersDeleteTriggerdefaultResponse>;
+}
+
 /** Gets trigger information */
 export declare interface TriggersGetTrigger200Response extends HttpResponse {
     status: "200";
@@ -3267,11 +2672,9 @@ export declare interface TriggersGetTriggerdefaultResponse extends HttpResponse
 
 export declare type TriggersGetTriggerParameters = RequestParameters;
 
-export declare type VersionedScanRuleset = VersionedScanRulesetBase & ProxyResource;
-
-export declare interface VersionedScanRulesetBase {
-    scanRulesetType?: ScanRulesetType;
-    status?: ScanRulesetStatus;
+export declare interface VersionedScanRuleset extends ProxyResource {
+    scanRulesetType?: "Custom" | "System";
+    status?: "Enabled" | "Disabled";
     version?: number;
 }