Skip to content

Commit

Permalink
CodeGen from PR 12293 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Fix ARM Errors and update the swagger files. (Azure#12293)

* Fix ARM Errors and update the swagger files.

* update

* update import export spec file.

* remove import/export from v2 and v1

in the original pr: Azure/azure-rest-api-specs@99b5b0c
the import export APIs were only added to v3.

* update import export spec file.

* separate db import export from this PR.

* revert importdatabases
  • Loading branch information
SDKAuto committed Jan 14, 2021
1 parent ea1f4e7 commit 49fdf75
Show file tree
Hide file tree
Showing 199 changed files with 22,395 additions and 8,650 deletions.
2 changes: 1 addition & 1 deletion sdk/sql/arm-sql/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2019 Microsoft
Copyright (c) 2021 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
9 changes: 4 additions & 5 deletions sdk/sql/arm-sql/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ npm install @azure/arm-sql

### How to use

#### nodejs - Authentication, client creation and get recoverableDatabases as an example written in TypeScript.
#### nodejs - client creation and get recoverableDatabases as an example written in TypeScript.

##### Install @azure/ms-rest-nodeauth

Expand All @@ -26,11 +26,10 @@ npm install @azure/ms-rest-nodeauth@"^3.0.0"

##### Sample code

While the below sample uses the interactive login, other authentication options can be found in the [README.md file of @azure/ms-rest-nodeauth](https://www.npmjs.com/package/@azure/ms-rest-nodeauth) package
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
import { SqlManagementClient, SqlManagementModels, SqlManagementMappers } from "@azure/arm-sql";
const msRestNodeAuth = require("@azure/ms-rest-nodeauth");
const { SqlManagementClient } = require("@azure/arm-sql");
const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"];

msRestNodeAuth.interactiveLogin().then((creds) => {
Expand Down
4 changes: 2 additions & 2 deletions sdk/sql/arm-sql/rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const config = {
"@azure/ms-rest-azure-js": "msRestAzure"
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -37,7 +37,7 @@ export {
FailoverGroupReadWriteEndpoint,
FirewallRule,
GeoBackupPolicy,
ImportExportResponse,
ImportExportOperationResult,
InstanceFailoverGroup,
InstanceFailoverGroupReadOnlyEndpoint,
InstanceFailoverGroupReadWriteEndpoint,
Expand All @@ -62,15 +62,27 @@ export {
ManagedDatabaseSecurityAlertPolicy,
ManagedInstance,
ManagedInstanceAdministrator,
ManagedInstanceAzureADOnlyAuthentication,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstancePecProperty,
ManagedInstancePrivateEndpointConnectionProperties,
ManagedInstancePrivateEndpointProperty,
ManagedInstancePrivateLinkServiceConnectionStateProperty,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointConnectionRequestStatus,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -91,12 +103,17 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDevOpsAuditingSettings,
ServerDnsAlias,
ServerInfo,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerTrustGroup,
ServerVulnerabilityAssessment,
ServiceObjective,
ServiceTierAdvisor,
Expand All @@ -110,13 +127,18 @@ export {
SyncGroupSchemaTable,
SyncGroupSchemaTableColumn,
SyncMember,
SystemData,
TdeCertificate,
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -38,7 +38,7 @@ export {
FailoverGroupReadWriteEndpoint,
FirewallRule,
GeoBackupPolicy,
ImportExportResponse,
ImportExportOperationResult,
InstanceFailoverGroup,
InstanceFailoverGroupReadOnlyEndpoint,
InstanceFailoverGroupReadWriteEndpoint,
Expand All @@ -63,15 +63,27 @@ export {
ManagedDatabaseSecurityAlertPolicy,
ManagedInstance,
ManagedInstanceAdministrator,
ManagedInstanceAzureADOnlyAuthentication,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstancePecProperty,
ManagedInstancePrivateEndpointConnectionProperties,
ManagedInstancePrivateEndpointProperty,
ManagedInstancePrivateLinkServiceConnectionStateProperty,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointConnectionRequestStatus,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -92,12 +104,17 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDevOpsAuditingSettings,
ServerDnsAlias,
ServerInfo,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerTrustGroup,
ServerVulnerabilityAssessment,
ServiceObjective,
ServiceTierAdvisor,
Expand All @@ -111,13 +128,18 @@ export {
SyncGroupSchemaTable,
SyncGroupSchemaTableColumn,
SyncMember,
SystemData,
TdeCertificate,
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
15 changes: 12 additions & 3 deletions sdk/sql/arm-sql/src/models/capabilitiesMappers.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,38 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

export {
AutoPauseDelayTimeRange,
CloudError,
EditionCapability,
ElasticPoolEditionCapability,
ElasticPoolPerDatabaseMaxPerformanceLevelCapability,
ElasticPoolPerDatabaseMinPerformanceLevelCapability,
ElasticPoolPerformanceLevelCapability,
InstancePoolEditionCapability,
InstancePoolFamilyCapability,
InstancePoolVcoresCapability,
LicenseTypeCapability,
LocationCapabilities,
LogSizeCapability,
MaintenanceConfigurationCapability,
ManagedInstanceEditionCapability,
ManagedInstanceFamilyCapability,
ManagedInstanceMaintenanceConfigurationCapability,
ManagedInstanceVcoresCapability,
ManagedInstanceVersionCapability,
MaxSizeCapability,
MaxSizeRangeCapability,
MinCapacityCapability,
PerformanceLevelCapability,
ReadScaleCapability,
ServerVersionCapability,
ServiceObjectiveCapability,
Sku
Sku,
StorageCapability
} from "../models/mappers";
30 changes: 26 additions & 4 deletions sdk/sql/arm-sql/src/models/dataMaskingPoliciesMappers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
* Copyright (c) Microsoft Corporation.
* Licensed under the MIT License.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
Expand Down Expand Up @@ -37,7 +37,7 @@ export {
FailoverGroupReadWriteEndpoint,
FirewallRule,
GeoBackupPolicy,
ImportExportResponse,
ImportExportOperationResult,
InstanceFailoverGroup,
InstanceFailoverGroupReadOnlyEndpoint,
InstanceFailoverGroupReadWriteEndpoint,
Expand All @@ -62,15 +62,27 @@ export {
ManagedDatabaseSecurityAlertPolicy,
ManagedInstance,
ManagedInstanceAdministrator,
ManagedInstanceAzureADOnlyAuthentication,
ManagedInstanceEncryptionProtector,
ManagedInstanceKey,
ManagedInstanceLongTermRetentionBackup,
ManagedInstanceLongTermRetentionPolicy,
ManagedInstanceOperation,
ManagedInstanceOperationParametersPair,
ManagedInstanceOperationSteps,
ManagedInstancePairInfo,
ManagedInstancePecProperty,
ManagedInstancePrivateEndpointConnectionProperties,
ManagedInstancePrivateEndpointProperty,
ManagedInstancePrivateLinkServiceConnectionStateProperty,
ManagedInstanceVulnerabilityAssessment,
ManagedServerSecurityAlertPolicy,
OperationImpact,
PartnerInfo,
PartnerRegionInfo,
PrivateEndpointConnection,
PrivateEndpointConnectionProperties,
PrivateEndpointConnectionRequestStatus,
PrivateEndpointProperty,
PrivateLinkResource,
PrivateLinkResourceProperties,
Expand All @@ -91,12 +103,17 @@ export {
Server,
ServerAutomaticTuning,
ServerAzureADAdministrator,
ServerAzureADOnlyAuthentication,
ServerBlobAuditingPolicy,
ServerCommunicationLink,
ServerConnectionPolicy,
ServerDevOpsAuditingSettings,
ServerDnsAlias,
ServerInfo,
ServerKey,
ServerPrivateEndpointConnection,
ServerSecurityAlertPolicy,
ServerTrustGroup,
ServerVulnerabilityAssessment,
ServiceObjective,
ServiceTierAdvisor,
Expand All @@ -110,13 +127,18 @@ export {
SyncGroupSchemaTable,
SyncGroupSchemaTableColumn,
SyncMember,
SystemData,
TdeCertificate,
TrackedResource,
TransparentDataEncryption,
TransparentDataEncryptionActivity,
UpsertManagedServerOperationParameters,
UpsertManagedServerOperationStep,
VirtualCluster,
VirtualNetworkRule,
VulnerabilityAssessmentRecurringScansProperties,
VulnerabilityAssessmentScanError,
VulnerabilityAssessmentScanRecord
VulnerabilityAssessmentScanRecord,
WorkloadClassifier,
WorkloadGroup
} from "../models/mappers";
Loading

0 comments on commit 49fdf75

Please sign in to comment.