diff --git a/packages/@azure/arm-sql/README.md b/packages/@azure/arm-sql/README.md index fd114bf7f2b5..53d21b390613 100644 --- a/packages/@azure/arm-sql/README.md +++ b/packages/@azure/arm-sql/README.md @@ -1,83 +1,83 @@ -# Azure SqlManagementClient SDK for JavaScript -This package contains an isomorphic SDK for SqlManagementClient. - -## Currently supported environments -- Node.js version 6.x.x or higher -- Browser JavaScript - -## How to Install -``` -npm install @azure/arm-sql -``` - - -## How to use - -### nodejs - Authentication, client creation and get recoverableDatabases as an example written in TypeScript. - -```ts -import * as msRest from "ms-rest-js"; -import * as msRestAzure from "ms-rest-azure-js"; -import * as msRestNodeAuth from "ms-rest-nodeauth"; -import { SqlManagementClient, SqlManagementModels, SqlManagementMappers } from "@azure/arm-sql"; -const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; - -msRestNodeAuth.interactiveLogin().then((creds) => { - const client = new SqlManagementClient(creds, subscriptionId); - const resourceGroupName = "testresourceGroupName"; - const serverName = "testserverName"; - const databaseName = "testdatabaseName"; - client.recoverableDatabases.get(resourceGroupName, serverName, databaseName).then((result) => { - console.log("The result is:"); - console.log(result); - }); -}).catch((err) => { - console.error(err); -}); -``` - -### browser - Authentication, client creation and get recoverableDatabases as an example written in JavaScript. -See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. - -- index.html -```html - - - - @azure/arm-sql sample - - - - - - - - - -``` - -# Related projects - - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) +# Azure SqlManagementClient SDK for JavaScript +This package contains an isomorphic SDK for SqlManagementClient. + +## Currently supported environments +- Node.js version 6.x.x or higher +- Browser JavaScript + +## How to Install +``` +npm install @azure/arm-sql +``` + + +## How to use + +### nodejs - Authentication, client creation and get recoverableDatabases as an example written in TypeScript. + +```ts +import * as msRest from "ms-rest-js"; +import * as msRestAzure from "ms-rest-azure-js"; +import * as msRestNodeAuth from "ms-rest-nodeauth"; +import { SqlManagementClient, SqlManagementModels, SqlManagementMappers } from "@azure/arm-sql"; +const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; + +msRestNodeAuth.interactiveLogin().then((creds) => { + const client = new SqlManagementClient(creds, subscriptionId); + const resourceGroupName = "testresourceGroupName"; + const serverName = "testserverName"; + const databaseName = "testdatabaseName"; + client.recoverableDatabases.get(resourceGroupName, serverName, databaseName).then((result) => { + console.log("The result is:"); + console.log(result); + }); +}).catch((err) => { + console.error(err); +}); +``` + +### browser - Authentication, client creation and get recoverableDatabases as an example written in JavaScript. +See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to Azure in the browser. + +- index.html +```html + + + + @azure/arm-sql sample + + + + + + + + + +``` + +# Related projects + - [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js) diff --git a/packages/@azure/arm-sql/lib/models/databaseVulnerabilityAssessmentScansMappers.ts b/packages/@azure/arm-sql/lib/models/databaseVulnerabilityAssessmentScansMappers.ts index e5c8650c35ad..4918050ab296 100644 --- a/packages/@azure/arm-sql/lib/models/databaseVulnerabilityAssessmentScansMappers.ts +++ b/packages/@azure/arm-sql/lib/models/databaseVulnerabilityAssessmentScansMappers.ts @@ -9,13 +9,13 @@ */ export { + VulnerabilityAssessmentScanRecordListResult, VulnerabilityAssessmentScanRecord, ProxyResource, Resource, BaseResource, VulnerabilityAssessmentScanError, CloudError, - VulnerabilityAssessmentScanRecordListResult, DatabaseVulnerabilityAssessmentScansExport, RecoverableDatabase, RestorableDroppedDatabase, diff --git a/packages/@azure/arm-sql/lib/models/databaseVulnerabilityAssessmentsMappers.ts b/packages/@azure/arm-sql/lib/models/databaseVulnerabilityAssessmentsMappers.ts index 77fbde5f43b3..d3613306eb3f 100644 --- a/packages/@azure/arm-sql/lib/models/databaseVulnerabilityAssessmentsMappers.ts +++ b/packages/@azure/arm-sql/lib/models/databaseVulnerabilityAssessmentsMappers.ts @@ -15,6 +15,7 @@ export { BaseResource, VulnerabilityAssessmentRecurringScansProperties, CloudError, + DatabaseVulnerabilityAssessmentListResult, RecoverableDatabase, RestorableDroppedDatabase, TrackedResource, diff --git a/packages/@azure/arm-sql/lib/models/index.ts b/packages/@azure/arm-sql/lib/models/index.ts index 540a9d64f83b..3128960563c8 100644 --- a/packages/@azure/arm-sql/lib/models/index.ts +++ b/packages/@azure/arm-sql/lib/models/index.ts @@ -3143,7 +3143,7 @@ export interface ExtendedDatabaseBlobAuditingPolicy extends ProxyResource { predicateExpression?: string; /** * @member {BlobAuditingPolicyState} state Specifies the state of the policy. - * If state is Enabled, storageEndpoint and storageAccountAccessKey are + * If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are * required. Possible values include: 'Enabled', 'Disabled' */ state: BlobAuditingPolicyState; @@ -3155,13 +3155,13 @@ export interface ExtendedDatabaseBlobAuditingPolicy extends ProxyResource { storageEndpoint?: string; /** * @member {string} [storageAccountAccessKey] Specifies the identifier key of - * the auditing storage account. If state is Enabled, storageAccountAccessKey - * is required. + * the auditing storage account. If state is Enabled and storageEndpoint is + * specified, storageAccountAccessKey is required. */ storageAccountAccessKey?: string; /** * @member {number} [retentionDays] Specifies the number of days to keep in - * the audit logs. + * the audit logs in the storage account. */ retentionDays?: number; /** @@ -3223,11 +3223,11 @@ export interface ExtendedDatabaseBlobAuditingPolicy extends ProxyResource { * REFERENCES * * The general form for defining an action to be audited is: - * ON BY + * {action} ON {object} BY {principal} * * Note that in the above format can refer to an object like a * table, view, or stored procedure, or an entire database or schema. For the - * latter cases, the forms DATABASE:: and SCHEMA:: are + * latter cases, the forms DATABASE::{db_name} and SCHEMA::{schema_name} are * used, respectively. * * For example: @@ -3249,6 +3249,28 @@ export interface ExtendedDatabaseBlobAuditingPolicy extends ProxyResource { * storageAccountAccessKey value is the storage's secondary key. */ isStorageSecondaryKeyInUse?: boolean; + /** + * @member {boolean} [isAzureMonitorTargetEnabled] Specifies whether audit + * events are sent to Azure Monitor. + * In order to send the events to Azure Monitor, specify 'State' as 'Enabled' + * and 'IsAzureMonitorTargetEnabled' as true. + * + * When using REST API to configure auditing, Diagnostic Settings with + * 'SQLSecurityAuditEvents' diagnostic logs category on the database should + * be also created. + * Note that for server level audit you should use the 'master' database as + * {databaseName}. + * + * Diagnostic Settings URI format: + * PUT + * https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview + * + * For more information, see [Diagnostic Settings REST + * API](https://go.microsoft.com/fwlink/?linkid=2033207) + * or [Diagnostic Settings + * PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043) + */ + isAzureMonitorTargetEnabled?: boolean; } /** @@ -3266,7 +3288,7 @@ export interface ExtendedServerBlobAuditingPolicy extends ProxyResource { predicateExpression?: string; /** * @member {BlobAuditingPolicyState} state Specifies the state of the policy. - * If state is Enabled, storageEndpoint and storageAccountAccessKey are + * If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are * required. Possible values include: 'Enabled', 'Disabled' */ state: BlobAuditingPolicyState; @@ -3278,13 +3300,13 @@ export interface ExtendedServerBlobAuditingPolicy extends ProxyResource { storageEndpoint?: string; /** * @member {string} [storageAccountAccessKey] Specifies the identifier key of - * the auditing storage account. If state is Enabled, storageAccountAccessKey - * is required. + * the auditing storage account. If state is Enabled and storageEndpoint is + * specified, storageAccountAccessKey is required. */ storageAccountAccessKey?: string; /** * @member {number} [retentionDays] Specifies the number of days to keep in - * the audit logs. + * the audit logs in the storage account. */ retentionDays?: number; /** @@ -3346,11 +3368,11 @@ export interface ExtendedServerBlobAuditingPolicy extends ProxyResource { * REFERENCES * * The general form for defining an action to be audited is: - * ON BY + * {action} ON {object} BY {principal} * * Note that in the above format can refer to an object like a * table, view, or stored procedure, or an entire database or schema. For the - * latter cases, the forms DATABASE:: and SCHEMA:: are + * latter cases, the forms DATABASE::{db_name} and SCHEMA::{schema_name} are * used, respectively. * * For example: @@ -3372,6 +3394,28 @@ export interface ExtendedServerBlobAuditingPolicy extends ProxyResource { * storageAccountAccessKey value is the storage's secondary key. */ isStorageSecondaryKeyInUse?: boolean; + /** + * @member {boolean} [isAzureMonitorTargetEnabled] Specifies whether audit + * events are sent to Azure Monitor. + * In order to send the events to Azure Monitor, specify 'State' as 'Enabled' + * and 'IsAzureMonitorTargetEnabled' as true. + * + * When using REST API to configure auditing, Diagnostic Settings with + * 'SQLSecurityAuditEvents' diagnostic logs category on the database should + * be also created. + * Note that for server level audit you should use the 'master' database as + * {databaseName}. + * + * Diagnostic Settings URI format: + * PUT + * https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview + * + * For more information, see [Diagnostic Settings REST + * API](https://go.microsoft.com/fwlink/?linkid=2033207) + * or [Diagnostic Settings + * PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043) + */ + isAzureMonitorTargetEnabled?: boolean; } /** @@ -3384,7 +3428,7 @@ export interface ExtendedServerBlobAuditingPolicy extends ProxyResource { export interface ServerBlobAuditingPolicy extends ProxyResource { /** * @member {BlobAuditingPolicyState} state Specifies the state of the policy. - * If state is Enabled, storageEndpoint and storageAccountAccessKey are + * If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are * required. Possible values include: 'Enabled', 'Disabled' */ state: BlobAuditingPolicyState; @@ -3396,13 +3440,13 @@ export interface ServerBlobAuditingPolicy extends ProxyResource { storageEndpoint?: string; /** * @member {string} [storageAccountAccessKey] Specifies the identifier key of - * the auditing storage account. If state is Enabled, storageAccountAccessKey - * is required. + * the auditing storage account. If state is Enabled and storageEndpoint is + * specified, storageAccountAccessKey is required. */ storageAccountAccessKey?: string; /** * @member {number} [retentionDays] Specifies the number of days to keep in - * the audit logs. + * the audit logs in the storage account. */ retentionDays?: number; /** @@ -3464,11 +3508,11 @@ export interface ServerBlobAuditingPolicy extends ProxyResource { * REFERENCES * * The general form for defining an action to be audited is: - * ON BY + * {action} ON {object} BY {principal} * * Note that in the above format can refer to an object like a * table, view, or stored procedure, or an entire database or schema. For the - * latter cases, the forms DATABASE:: and SCHEMA:: are + * latter cases, the forms DATABASE::{db_name} and SCHEMA::{schema_name} are * used, respectively. * * For example: @@ -3490,6 +3534,28 @@ export interface ServerBlobAuditingPolicy extends ProxyResource { * storageAccountAccessKey value is the storage's secondary key. */ isStorageSecondaryKeyInUse?: boolean; + /** + * @member {boolean} [isAzureMonitorTargetEnabled] Specifies whether audit + * events are sent to Azure Monitor. + * In order to send the events to Azure Monitor, specify 'State' as 'Enabled' + * and 'IsAzureMonitorTargetEnabled' as true. + * + * When using REST API to configure auditing, Diagnostic Settings with + * 'SQLSecurityAuditEvents' diagnostic logs category on the database should + * be also created. + * Note that for server level audit you should use the 'master' database as + * {databaseName}. + * + * Diagnostic Settings URI format: + * PUT + * https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview + * + * For more information, see [Diagnostic Settings REST + * API](https://go.microsoft.com/fwlink/?linkid=2033207) + * or [Diagnostic Settings + * PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043) + */ + isAzureMonitorTargetEnabled?: boolean; } /** @@ -3508,7 +3574,7 @@ export interface DatabaseBlobAuditingPolicy extends ProxyResource { readonly kind?: string; /** * @member {BlobAuditingPolicyState} state Specifies the state of the policy. - * If state is Enabled, storageEndpoint and storageAccountAccessKey are + * If state is Enabled, storageEndpoint or isAzureMonitorTargetEnabled are * required. Possible values include: 'Enabled', 'Disabled' */ state: BlobAuditingPolicyState; @@ -3520,13 +3586,13 @@ export interface DatabaseBlobAuditingPolicy extends ProxyResource { storageEndpoint?: string; /** * @member {string} [storageAccountAccessKey] Specifies the identifier key of - * the auditing storage account. If state is Enabled, storageAccountAccessKey - * is required. + * the auditing storage account. If state is Enabled and storageEndpoint is + * specified, storageAccountAccessKey is required. */ storageAccountAccessKey?: string; /** * @member {number} [retentionDays] Specifies the number of days to keep in - * the audit logs. + * the audit logs in the storage account. */ retentionDays?: number; /** @@ -3588,11 +3654,11 @@ export interface DatabaseBlobAuditingPolicy extends ProxyResource { * REFERENCES * * The general form for defining an action to be audited is: - * ON BY + * {action} ON {object} BY {principal} * * Note that in the above format can refer to an object like a * table, view, or stored procedure, or an entire database or schema. For the - * latter cases, the forms DATABASE:: and SCHEMA:: are + * latter cases, the forms DATABASE::{db_name} and SCHEMA::{schema_name} are * used, respectively. * * For example: @@ -3614,6 +3680,28 @@ export interface DatabaseBlobAuditingPolicy extends ProxyResource { * storageAccountAccessKey value is the storage's secondary key. */ isStorageSecondaryKeyInUse?: boolean; + /** + * @member {boolean} [isAzureMonitorTargetEnabled] Specifies whether audit + * events are sent to Azure Monitor. + * In order to send the events to Azure Monitor, specify 'State' as 'Enabled' + * and 'IsAzureMonitorTargetEnabled' as true. + * + * When using REST API to configure auditing, Diagnostic Settings with + * 'SQLSecurityAuditEvents' diagnostic logs category on the database should + * be also created. + * Note that for server level audit you should use the 'master' database as + * {databaseName}. + * + * Diagnostic Settings URI format: + * PUT + * https://management.azure.com/subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/providers/microsoft.insights/diagnosticSettings/{settingsName}?api-version=2017-05-01-preview + * + * For more information, see [Diagnostic Settings REST + * API](https://go.microsoft.com/fwlink/?linkid=2033207) + * or [Diagnostic Settings + * PowerShell](https://go.microsoft.com/fwlink/?linkid=2033043) + */ + isAzureMonitorTargetEnabled?: boolean; } /** @@ -3678,11 +3766,12 @@ export interface VulnerabilityAssessmentRecurringScansProperties { */ export interface DatabaseVulnerabilityAssessment extends ProxyResource { /** - * @member {string} storageContainerPath A blob storage container path to + * @member {string} [storageContainerPath] A blob storage container path to * hold the scan results (e.g. - * https://myStorage.blob.core.windows.net/VaScans/). + * https://myStorage.blob.core.windows.net/VaScans/). It is required if + * server level vulnerability assessment policy doesn't set */ - storageContainerPath: string; + storageContainerPath?: string; /** * @member {string} [storageContainerSasKey] A shared access signature (SAS * Key) that has write access to the blob container specified in @@ -3692,8 +3781,9 @@ export interface DatabaseVulnerabilityAssessment extends ProxyResource { storageContainerSasKey?: string; /** * @member {string} [storageAccountAccessKey] Specifies the identifier key of - * the vulnerability assessment storage account. If 'StorageContainerSasKey' - * isn't specified, storageAccountAccessKey is required. + * the storage account for vulnerability assessment scan results. If + * 'StorageContainerSasKey' isn't specified, storageAccountAccessKey is + * required. */ storageAccountAccessKey?: string; /** @@ -7222,6 +7312,22 @@ export interface VirtualNetworkRuleListResult extends Array readonly nextLink?: string; } +/** + * @interface + * An interface representing the DatabaseVulnerabilityAssessmentListResult. + * A list of the database's vulnerability assessments. + * + * @extends Array + */ +export interface DatabaseVulnerabilityAssessmentListResult extends Array { + /** + * @member {string} [nextLink] Link to retrieve next page of results. + * **NOTE: This property will not be serialized. It can only be populated by + * the server.** + */ + readonly nextLink?: string; +} + /** * @interface * An interface representing the JobAgentListResult. @@ -12074,6 +12180,44 @@ export type DatabaseVulnerabilityAssessmentsCreateOrUpdateResponse = DatabaseVul }; }; +/** + * Contains response data for the listByDatabase operation. + */ +export type DatabaseVulnerabilityAssessmentsListByDatabaseResponse = DatabaseVulnerabilityAssessmentListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + /** + * The response body as parsed JSON or XML + */ + parsedBody: DatabaseVulnerabilityAssessmentListResult; + }; +}; + +/** + * Contains response data for the listByDatabaseNext operation. + */ +export type DatabaseVulnerabilityAssessmentsListByDatabaseNextResponse = DatabaseVulnerabilityAssessmentListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + /** + * The response body as parsed JSON or XML + */ + parsedBody: DatabaseVulnerabilityAssessmentListResult; + }; +}; + /** * Contains response data for the listByServer operation. */ @@ -13652,9 +13796,9 @@ export type CapabilitiesListByLocationResponse = LocationCapabilities & { }; /** - * Contains response data for the get operation. + * Contains response data for the listByDatabase operation. */ -export type DatabaseVulnerabilityAssessmentScansGetResponse = VulnerabilityAssessmentScanRecord & { +export type DatabaseVulnerabilityAssessmentScansListByDatabaseResponse = VulnerabilityAssessmentScanRecordListResult & { /** * The underlying HTTP response. */ @@ -13666,14 +13810,14 @@ export type DatabaseVulnerabilityAssessmentScansGetResponse = VulnerabilityAsses /** * The response body as parsed JSON or XML */ - parsedBody: VulnerabilityAssessmentScanRecord; + parsedBody: VulnerabilityAssessmentScanRecordListResult; }; }; /** - * Contains response data for the listByDatabase operation. + * Contains response data for the get operation. */ -export type DatabaseVulnerabilityAssessmentScansListByDatabaseResponse = VulnerabilityAssessmentScanRecordListResult & { +export type DatabaseVulnerabilityAssessmentScansGetResponse = VulnerabilityAssessmentScanRecord & { /** * The underlying HTTP response. */ @@ -13685,7 +13829,7 @@ export type DatabaseVulnerabilityAssessmentScansListByDatabaseResponse = Vulnera /** * The response body as parsed JSON or XML */ - parsedBody: VulnerabilityAssessmentScanRecordListResult; + parsedBody: VulnerabilityAssessmentScanRecord; }; }; @@ -13879,6 +14023,44 @@ export type ManagedDatabaseVulnerabilityAssessmentsCreateOrUpdateResponse = Data }; }; +/** + * Contains response data for the listByDatabase operation. + */ +export type ManagedDatabaseVulnerabilityAssessmentsListByDatabaseResponse = DatabaseVulnerabilityAssessmentListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + /** + * The response body as parsed JSON or XML + */ + parsedBody: DatabaseVulnerabilityAssessmentListResult; + }; +}; + +/** + * Contains response data for the listByDatabaseNext operation. + */ +export type ManagedDatabaseVulnerabilityAssessmentsListByDatabaseNextResponse = DatabaseVulnerabilityAssessmentListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + /** + * The response body as parsed JSON or XML + */ + parsedBody: DatabaseVulnerabilityAssessmentListResult; + }; +}; + /** * Contains response data for the get operation. */ diff --git a/packages/@azure/arm-sql/lib/models/managedDatabaseVulnerabilityAssessmentsMappers.ts b/packages/@azure/arm-sql/lib/models/managedDatabaseVulnerabilityAssessmentsMappers.ts index 77fbde5f43b3..d3613306eb3f 100644 --- a/packages/@azure/arm-sql/lib/models/managedDatabaseVulnerabilityAssessmentsMappers.ts +++ b/packages/@azure/arm-sql/lib/models/managedDatabaseVulnerabilityAssessmentsMappers.ts @@ -15,6 +15,7 @@ export { BaseResource, VulnerabilityAssessmentRecurringScansProperties, CloudError, + DatabaseVulnerabilityAssessmentListResult, RecoverableDatabase, RestorableDroppedDatabase, TrackedResource, diff --git a/packages/@azure/arm-sql/lib/models/mappers.ts b/packages/@azure/arm-sql/lib/models/mappers.ts index 1209800c98d2..fe6bdb437e26 100644 --- a/packages/@azure/arm-sql/lib/models/mappers.ts +++ b/packages/@azure/arm-sql/lib/models/mappers.ts @@ -3838,6 +3838,12 @@ export const ExtendedDatabaseBlobAuditingPolicy: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + isAzureMonitorTargetEnabled: { + serializedName: "properties.isAzureMonitorTargetEnabled", + type: { + name: "Boolean" + } } } } @@ -3907,6 +3913,12 @@ export const ExtendedServerBlobAuditingPolicy: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + isAzureMonitorTargetEnabled: { + serializedName: "properties.isAzureMonitorTargetEnabled", + type: { + name: "Boolean" + } } } } @@ -3970,6 +3982,12 @@ export const ServerBlobAuditingPolicy: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + isAzureMonitorTargetEnabled: { + serializedName: "properties.isAzureMonitorTargetEnabled", + type: { + name: "Boolean" + } } } } @@ -4040,6 +4058,12 @@ export const DatabaseBlobAuditingPolicy: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + isAzureMonitorTargetEnabled: { + serializedName: "properties.isAzureMonitorTargetEnabled", + type: { + name: "Boolean" + } } } } @@ -4133,7 +4157,6 @@ export const DatabaseVulnerabilityAssessment: msRest.CompositeMapper = { modelProperties: { ...ProxyResource.type.modelProperties, storageContainerPath: { - required: true, serializedName: "properties.storageContainerPath", type: { name: "String" @@ -8341,6 +8364,36 @@ export const VirtualNetworkRuleListResult: msRest.CompositeMapper = { } }; +export const DatabaseVulnerabilityAssessmentListResult: msRest.CompositeMapper = { + serializedName: "DatabaseVulnerabilityAssessmentListResult", + type: { + name: "Composite", + className: "DatabaseVulnerabilityAssessmentListResult", + modelProperties: { + value: { + readOnly: true, + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DatabaseVulnerabilityAssessment" + } + } + } + }, + nextLink: { + readOnly: true, + serializedName: "nextLink", + type: { + name: "String" + } + } + } + } +}; + export const JobAgentListResult: msRest.CompositeMapper = { serializedName: "JobAgentListResult", type: { diff --git a/packages/@azure/arm-sql/lib/models/parameters.ts b/packages/@azure/arm-sql/lib/models/parameters.ts index 3f364f4f144d..089818eaf567 100644 --- a/packages/@azure/arm-sql/lib/models/parameters.ts +++ b/packages/@azure/arm-sql/lib/models/parameters.ts @@ -184,45 +184,45 @@ export const credentialName: msRest.OperationURLParameter = { } } }; -export const dataMaskingPolicyName: msRest.OperationURLParameter = { - parameterPath: "dataMaskingPolicyName", +export const databaseName: msRest.OperationURLParameter = { + parameterPath: "databaseName", mapper: { required: true, - isConstant: true, - serializedName: "dataMaskingPolicyName", - defaultValue: 'Default', + serializedName: "databaseName", type: { name: "String" } } }; -export const dataMaskingRuleName: msRest.OperationURLParameter = { - parameterPath: "dataMaskingRuleName", +export const databaseState: msRest.OperationQueryParameter = { + parameterPath: [ + "options", + "databaseState" + ], mapper: { - required: true, - serializedName: "dataMaskingRuleName", + serializedName: "databaseState", type: { name: "String" } } }; -export const databaseName: msRest.OperationURLParameter = { - parameterPath: "databaseName", +export const dataMaskingPolicyName: msRest.OperationURLParameter = { + parameterPath: "dataMaskingPolicyName", mapper: { required: true, - serializedName: "databaseName", + isConstant: true, + serializedName: "dataMaskingPolicyName", + defaultValue: 'Default', type: { name: "String" } } }; -export const databaseState: msRest.OperationQueryParameter = { - parameterPath: [ - "options", - "databaseState" - ], +export const dataMaskingRuleName: msRest.OperationURLParameter = { + parameterPath: "dataMaskingRuleName", mapper: { - serializedName: "databaseState", + required: true, + serializedName: "dataMaskingRuleName", type: { name: "String" } diff --git a/packages/@azure/arm-sql/lib/operations/databaseVulnerabilityAssessmentScans.ts b/packages/@azure/arm-sql/lib/operations/databaseVulnerabilityAssessmentScans.ts index f897e4781cd0..1a5b2ad8434b 100644 --- a/packages/@azure/arm-sql/lib/operations/databaseVulnerabilityAssessmentScans.ts +++ b/packages/@azure/arm-sql/lib/operations/databaseVulnerabilityAssessmentScans.ts @@ -28,100 +28,100 @@ export class DatabaseVulnerabilityAssessmentScans { } /** - * Gets a vulnerability assessment scan record of a database. + * Lists the vulnerability assessment scans of a database. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param serverName The name of the server. * @param databaseName The name of the database. - * @param scanId The vulnerability assessment scan Id of the scan to retrieve. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - get(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, options?: msRest.RequestOptionsBase): Promise; + listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param serverName The name of the server. * @param databaseName The name of the database. - * @param scanId The vulnerability assessment scan Id of the scan to retrieve. * @param callback The callback */ - get(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, callback: msRest.ServiceCallback): void; + listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param serverName The name of the server. * @param databaseName The name of the database. - * @param scanId The vulnerability assessment scan Id of the scan to retrieve. * @param options The optional parameters * @param callback The callback */ - get(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, serverName, databaseName, - scanId, options }, - getOperationSpec, - callback) as Promise; + listByDatabaseOperationSpec, + callback) as Promise; } /** - * Executes a Vulnerability Assessment database scan. + * Gets a vulnerability assessment scan record of a database. * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param serverName The name of the server. * @param databaseName The name of the database. * @param scanId The vulnerability assessment scan Id of the scan to retrieve. * @param [options] The optional parameters - * @returns Promise - */ - initiateScan(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, options?: msRest.RequestOptionsBase): Promise { - return this.beginInitiateScan(resourceGroupName,serverName,databaseName,scanId,options) - .then(lroPoller => lroPoller.pollUntilFinished()); - } - - /** - * Lists the vulnerability assessment scans of a database. - * @param resourceGroupName The name of the resource group that contains the resource. You can - * obtain this value from the Azure Resource Manager API or the portal. - * @param serverName The name of the server. - * @param databaseName The name of the database. - * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options?: msRest.RequestOptionsBase): Promise; + get(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, options?: msRest.RequestOptionsBase): Promise; /** * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param serverName The name of the server. * @param databaseName The name of the database. + * @param scanId The vulnerability assessment scan Id of the scan to retrieve. * @param callback The callback */ - listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, callback: msRest.ServiceCallback): void; /** * @param resourceGroupName The name of the resource group that contains the resource. You can * obtain this value from the Azure Resource Manager API or the portal. * @param serverName The name of the server. * @param databaseName The name of the database. + * @param scanId The vulnerability assessment scan Id of the scan to retrieve. * @param options The optional parameters * @param callback The callback */ - listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + get(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, serverName, databaseName, + scanId, options }, - listByDatabaseOperationSpec, - callback) as Promise; + getOperationSpec, + callback) as Promise; + } + + /** + * Executes a Vulnerability Assessment database scan. + * @param resourceGroupName The name of the resource group that contains the resource. You can + * obtain this value from the Azure Resource Manager API or the portal. + * @param serverName The name of the server. + * @param databaseName The name of the database. + * @param scanId The vulnerability assessment scan Id of the scan to retrieve. + * @param [options] The optional parameters + * @returns Promise + */ + initiateScan(resourceGroupName: string, serverName: string, databaseName: string, scanId: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginInitiateScan(resourceGroupName,serverName,databaseName,scanId,options) + .then(lroPoller => lroPoller.pollUntilFinished()); } /** @@ -221,15 +221,14 @@ export class DatabaseVulnerabilityAssessmentScans { // Operation Specifications const serializer = new msRest.Serializer(Mappers); -const getOperationSpec: msRest.OperationSpec = { +const listByDatabaseOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/vulnerabilityAssessments/{vulnerabilityAssessmentName}/scans/{scanId}", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/vulnerabilityAssessments/{vulnerabilityAssessmentName}/scans", urlParameters: [ Parameters.resourceGroupName, Parameters.serverName, Parameters.databaseName, Parameters.vulnerabilityAssessmentName, - Parameters.scanId, Parameters.subscriptionId ], queryParameters: [ @@ -240,7 +239,7 @@ const getOperationSpec: msRest.OperationSpec = { ], responses: { 200: { - bodyMapper: Mappers.VulnerabilityAssessmentScanRecord + bodyMapper: Mappers.VulnerabilityAssessmentScanRecordListResult }, default: { bodyMapper: Mappers.CloudError @@ -249,14 +248,15 @@ const getOperationSpec: msRest.OperationSpec = { serializer }; -const listByDatabaseOperationSpec: msRest.OperationSpec = { +const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/vulnerabilityAssessments/{vulnerabilityAssessmentName}/scans", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/vulnerabilityAssessments/{vulnerabilityAssessmentName}/scans/{scanId}", urlParameters: [ Parameters.resourceGroupName, Parameters.serverName, Parameters.databaseName, Parameters.vulnerabilityAssessmentName, + Parameters.scanId, Parameters.subscriptionId ], queryParameters: [ @@ -267,7 +267,7 @@ const listByDatabaseOperationSpec: msRest.OperationSpec = { ], responses: { 200: { - bodyMapper: Mappers.VulnerabilityAssessmentScanRecordListResult + bodyMapper: Mappers.VulnerabilityAssessmentScanRecord }, default: { bodyMapper: Mappers.CloudError diff --git a/packages/@azure/arm-sql/lib/operations/databaseVulnerabilityAssessments.ts b/packages/@azure/arm-sql/lib/operations/databaseVulnerabilityAssessments.ts index 40519a05d735..4cc14b598567 100644 --- a/packages/@azure/arm-sql/lib/operations/databaseVulnerabilityAssessments.ts +++ b/packages/@azure/arm-sql/lib/operations/databaseVulnerabilityAssessments.ts @@ -146,6 +146,76 @@ export class DatabaseVulnerabilityAssessments { deleteMethodOperationSpec, callback); } + + /** + * Lists the vulnerability assessment policies associated with a database. + * @param resourceGroupName The name of the resource group that contains the resource. You can + * obtain this value from the Azure Resource Manager API or the portal. + * @param serverName The name of the server. + * @param databaseName The name of the database for which the vulnerability assessment policies are + * defined. + * @param [options] The optional parameters + * @returns Promise + */ + listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group that contains the resource. You can + * obtain this value from the Azure Resource Manager API or the portal. + * @param serverName The name of the server. + * @param databaseName The name of the database for which the vulnerability assessment policies are + * defined. + * @param callback The callback + */ + listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group that contains the resource. You can + * obtain this value from the Azure Resource Manager API or the portal. + * @param serverName The name of the server. + * @param databaseName The name of the database for which the vulnerability assessment policies are + * defined. + * @param options The optional parameters + * @param callback The callback + */ + listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByDatabase(resourceGroupName: string, serverName: string, databaseName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + serverName, + databaseName, + options + }, + listByDatabaseOperationSpec, + callback) as Promise; + } + + /** + * Lists the vulnerability assessment policies associated with a database. + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param [options] The optional parameters + * @returns Promise + */ + listByDatabaseNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param callback The callback + */ + listByDatabaseNext(nextPageLink: string, callback: msRest.ServiceCallback): void; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param options The optional parameters + * @param callback The callback + */ + listByDatabaseNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByDatabaseNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + nextPageLink, + options + }, + listByDatabaseNextOperationSpec, + callback) as Promise; + } } // Operation Specifications @@ -238,3 +308,50 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { }, serializer }; + +const listByDatabaseOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/vulnerabilityAssessments", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.serverName, + Parameters.databaseName, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion3 + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.DatabaseVulnerabilityAssessmentListResult + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const listByDatabaseNextOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + baseUrl: "https://management.azure.com", + path: "{nextLink}", + urlParameters: [ + Parameters.nextPageLink + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.DatabaseVulnerabilityAssessmentListResult + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; diff --git a/packages/@azure/arm-sql/lib/operations/managedDatabaseVulnerabilityAssessments.ts b/packages/@azure/arm-sql/lib/operations/managedDatabaseVulnerabilityAssessments.ts index e3f16e6df7c5..e750987e8fc4 100644 --- a/packages/@azure/arm-sql/lib/operations/managedDatabaseVulnerabilityAssessments.ts +++ b/packages/@azure/arm-sql/lib/operations/managedDatabaseVulnerabilityAssessments.ts @@ -146,6 +146,73 @@ export class ManagedDatabaseVulnerabilityAssessments { deleteMethodOperationSpec, callback); } + + /** + * Lists the vulnerability assessments of a managed database. + * @param resourceGroupName The name of the resource group that contains the resource. You can + * obtain this value from the Azure Resource Manager API or the portal. + * @param managedInstanceName The name of the managed instance. + * @param databaseName The name of the database for which the vulnerability assessment is defined. + * @param [options] The optional parameters + * @returns Promise + */ + listByDatabase(resourceGroupName: string, managedInstanceName: string, databaseName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group that contains the resource. You can + * obtain this value from the Azure Resource Manager API or the portal. + * @param managedInstanceName The name of the managed instance. + * @param databaseName The name of the database for which the vulnerability assessment is defined. + * @param callback The callback + */ + listByDatabase(resourceGroupName: string, managedInstanceName: string, databaseName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group that contains the resource. You can + * obtain this value from the Azure Resource Manager API or the portal. + * @param managedInstanceName The name of the managed instance. + * @param databaseName The name of the database for which the vulnerability assessment is defined. + * @param options The optional parameters + * @param callback The callback + */ + listByDatabase(resourceGroupName: string, managedInstanceName: string, databaseName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByDatabase(resourceGroupName: string, managedInstanceName: string, databaseName: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + managedInstanceName, + databaseName, + options + }, + listByDatabaseOperationSpec, + callback) as Promise; + } + + /** + * Lists the vulnerability assessments of a managed database. + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param [options] The optional parameters + * @returns Promise + */ + listByDatabaseNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param callback The callback + */ + listByDatabaseNext(nextPageLink: string, callback: msRest.ServiceCallback): void; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param options The optional parameters + * @param callback The callback + */ + listByDatabaseNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listByDatabaseNext(nextPageLink: string, options?: msRest.RequestOptionsBase, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + nextPageLink, + options + }, + listByDatabaseNextOperationSpec, + callback) as Promise; + } } // Operation Specifications @@ -238,3 +305,50 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { }, serializer }; + +const listByDatabaseOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/managedInstances/{managedInstanceName}/databases/{databaseName}/vulnerabilityAssessments", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.managedInstanceName, + Parameters.databaseName, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion2 + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.DatabaseVulnerabilityAssessmentListResult + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; + +const listByDatabaseNextOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + baseUrl: "https://management.azure.com", + path: "{nextLink}", + urlParameters: [ + Parameters.nextPageLink + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.DatabaseVulnerabilityAssessmentListResult + }, + default: { + bodyMapper: Mappers.CloudError + } + }, + serializer +}; diff --git a/packages/@azure/arm-sql/lib/sqlManagementClientContext.ts b/packages/@azure/arm-sql/lib/sqlManagementClientContext.ts index 3b7dd7021f73..90e0186f833f 100644 --- a/packages/@azure/arm-sql/lib/sqlManagementClientContext.ts +++ b/packages/@azure/arm-sql/lib/sqlManagementClientContext.ts @@ -16,15 +16,9 @@ const packageName = "@azure/arm-sql"; const packageVersion = "1.0.0-preview"; export class SqlManagementClientContext extends msRestAzure.AzureServiceClient { - credentials: msRest.ServiceClientCredentials; - subscriptionId: string; - acceptLanguage: string; - - longRunningOperationRetryTimeout: number; - /** * Initializes a new instance of the SqlManagementClient class. * @param credentials Credentials needed for the client to connect to Azure.