Skip to content

Commit

Permalink
Generated from 6d7d583a7f0bc7ce5561295515ac2aa6eafa5e19
Browse files Browse the repository at this point in the history 
merge with master & solve conflict
  • Loading branch information
SDK Automation committed Aug 6, 2020
1 parent d51b305 commit ab6630a
Show file tree
Hide file tree
Showing 186 changed files with 16,540 additions and 8,251 deletions.
2 changes: 1 addition & 1 deletion sdk/sql/arm-sql/LICENSE.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2019 Microsoft
Copyright (c) 2020 Microsoft

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
14 changes: 13 additions & 1 deletion sdk/sql/arm-sql/src/models/backupLongTermRetentionPoliciesMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,19 @@ export {
ManagedInstanceAdministrator,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -91,11 +97,13 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDnsAlias,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerVulnerabilityAssessment,
ServiceObjective,
Expand All @@ -114,9 +122,13 @@ export {
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
14 changes: 13 additions & 1 deletion sdk/sql/arm-sql/src/models/backupShortTermRetentionPoliciesMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,19 @@ export {
ManagedInstanceAdministrator,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -92,11 +98,13 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDnsAlias,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerVulnerabilityAssessment,
ServiceObjective,
Expand All @@ -115,9 +123,13 @@ export {
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
9 changes: 8 additions & 1 deletion sdk/sql/arm-sql/src/models/capabilitiesMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,16 @@
*/

export {
AutoPauseDelayTimeRange,
CloudError,
EditionCapability,
ElasticPoolEditionCapability,
ElasticPoolPerDatabaseMaxPerformanceLevelCapability,
ElasticPoolPerDatabaseMinPerformanceLevelCapability,
ElasticPoolPerformanceLevelCapability,
InstancePoolEditionCapability,
InstancePoolFamilyCapability,
InstancePoolVcoresCapability,
LicenseTypeCapability,
LocationCapabilities,
LogSizeCapability,
Expand All @@ -22,8 +26,11 @@ export {
ManagedInstanceVersionCapability,
MaxSizeCapability,
MaxSizeRangeCapability,
MinCapacityCapability,
PerformanceLevelCapability,
ReadScaleCapability,
ServerVersionCapability,
ServiceObjectiveCapability,
Sku
Sku,
StorageCapability
} from "../models/mappers";
14 changes: 13 additions & 1 deletion sdk/sql/arm-sql/src/models/dataMaskingPoliciesMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,19 @@ export {
ManagedInstanceAdministrator,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -91,11 +97,13 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDnsAlias,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerVulnerabilityAssessment,
ServiceObjective,
Expand All @@ -114,9 +122,13 @@ export {
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
14 changes: 13 additions & 1 deletion sdk/sql/arm-sql/src/models/dataMaskingRulesMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,19 @@ export {
ManagedInstanceAdministrator,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -92,11 +98,13 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDnsAlias,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerVulnerabilityAssessment,
ServiceObjective,
Expand All @@ -115,9 +123,13 @@ export {
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
14 changes: 13 additions & 1 deletion sdk/sql/arm-sql/src/models/databaseAutomaticTuningOperationsMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,19 @@ export {
ManagedInstanceAdministrator,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -91,11 +97,13 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDnsAlias,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerVulnerabilityAssessment,
ServiceObjective,
Expand All @@ -114,9 +122,13 @@ export {
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
14 changes: 13 additions & 1 deletion sdk/sql/arm-sql/src/models/databaseBlobAuditingPoliciesMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,19 @@ export {
ManagedInstanceAdministrator,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -92,11 +98,13 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDnsAlias,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerVulnerabilityAssessment,
ServiceObjective,
Expand All @@ -115,9 +123,13 @@ export {
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
14 changes: 13 additions & 1 deletion sdk/sql/arm-sql/src/models/databaseOperationsMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,19 @@ export {
ManagedInstanceAdministrator,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -92,11 +98,13 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDnsAlias,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerVulnerabilityAssessment,
ServiceObjective,
Expand All @@ -115,9 +123,13 @@ export {
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
Loading

0 comments on commit ab6630a

Please sign in to comment.