[AutoPR sql/resource-manager] [DO NOT MERGE] VA List Api version edit

lib/services/sqlManagement2/lib/models/backupLongTermRetentionPolicy.js

@@ -22,8 +22,8 @@ class BackupLongTermRetentionPolicy extends models['ProxyResource'] {
    * Create a BackupLongTermRetentionPolicy.
    * @member {string} [weeklyRetention] The weekly retention policy for an LTR
    * backup in an ISO 8601 format.
-   * @member {string} [monthlyRetention] The montly retention policy for an LTR
-   * backup in an ISO 8601 format.
+   * @member {string} [monthlyRetention] The monthly retention policy for an
+   * LTR backup in an ISO 8601 format.
    * @member {string} [yearlyRetention] The yearly retention policy for an LTR
    * backup in an ISO 8601 format.
    * @member {number} [weekOfYear] The week of year to take the yearly backup

lib/services/sqlManagement2/lib/models/databaseBlobAuditingPolicy.js

@@ -22,16 +22,16 @@ class DatabaseBlobAuditingPolicy extends models['ProxyResource'] {
    * Create a DatabaseBlobAuditingPolicy.
    * @member {string} [kind] Resource kind.
    * @member {string} state Specifies the state of the policy. If state is
-   * Enabled, storageEndpoint and storageAccountAccessKey are required.
+   * Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.
    * Possible values include: 'Enabled', 'Disabled'
    * @member {string} [storageEndpoint] Specifies the blob storage endpoint
    * (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled,
    * storageEndpoint is required.
    * @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.
    * @member {number} [retentionDays] Specifies the number of days to keep in
-   * the audit logs.
+   * the audit logs in the storage account.
    * @member {array} [auditActionsAndGroups] Specifies the Actions-Groups and
    * Actions to audit.
    *
@@ -108,6 +108,24 @@ class DatabaseBlobAuditingPolicy extends models['ProxyResource'] {
    * subscription Id.
    * @member {boolean} [isStorageSecondaryKeyInUse] Specifies whether
    * storageAccountAccessKey value is the storage's secondary key.
+   * @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)
    */
   constructor() {
     super();
@@ -215,6 +233,13 @@ class DatabaseBlobAuditingPolicy extends models['ProxyResource'] {
             type: {
               name: 'Boolean'
             }
+          },
+          isAzureMonitorTargetEnabled: {
+            required: false,
+            serializedName: 'properties.isAzureMonitorTargetEnabled',
+            type: {
+              name: 'Boolean'
+            }
           }
         }
       }

lib/services/sqlManagement2/lib/models/databaseVulnerabilityAssessment.js

@@ -20,16 +20,18 @@ const models = require('./index');
 class DatabaseVulnerabilityAssessment extends models['ProxyResource'] {
   /**
    * Create a DatabaseVulnerabilityAssessment.
-   * @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
    * @member {string} [storageContainerSasKey] A shared access signature (SAS
    * Key) that has write access to the blob container specified in
    * 'storageContainerPath' parameter. If 'storageAccountAccessKey' isn't
    * specified, StorageContainerSasKey is required.
    * @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.
    * @member {object} [recurringScans] The recurring scans settings
    * @member {boolean} [recurringScans.isEnabled] Recurring scans state.
    * @member {boolean} [recurringScans.emailSubscriptionAdmins] Specifies that
@@ -81,7 +83,7 @@ class DatabaseVulnerabilityAssessment extends models['ProxyResource'] {
             }
           },
           storageContainerPath: {
-            required: true,
+            required: false,
             serializedName: 'properties.storageContainerPath',
             type: {
               name: 'String'

lib/services/sqlManagement2/lib/models/databaseVulnerabilityAssessmentListResult.js

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+/**
+ * A list of the database's vulnerability assessments.
+ */
+class DatabaseVulnerabilityAssessmentListResult extends Array {
+  /**
+   * Create a DatabaseVulnerabilityAssessmentListResult.
+   * @member {string} [nextLink] Link to retrieve next page of results.
+   */
+  constructor() {
+    super();
+  }
+
+  /**
+   * Defines the metadata of DatabaseVulnerabilityAssessmentListResult
+   *
+   * @returns {object} metadata of DatabaseVulnerabilityAssessmentListResult
+   *
+   */
+  mapper() {
+    return {
+      required: false,
+      serializedName: 'DatabaseVulnerabilityAssessmentListResult',
+      type: {
+        name: 'Composite',
+        className: 'DatabaseVulnerabilityAssessmentListResult',
+        modelProperties: {
+          value: {
+            required: false,
+            readOnly: true,
+            serializedName: '',
+            type: {
+              name: 'Sequence',
+              element: {
+                  required: false,
+                  serializedName: 'DatabaseVulnerabilityAssessmentElementType',
+                  type: {
+                    name: 'Composite',
+                    className: 'DatabaseVulnerabilityAssessment'
+                  }
+              }
+            }
+          },
+          nextLink: {
+            required: false,
+            readOnly: true,
+            serializedName: 'nextLink',
+            type: {
+              name: 'String'
+            }
+          }
+        }
+      }
+    };
+  }
+}
+
+module.exports = DatabaseVulnerabilityAssessmentListResult;

lib/services/sqlManagement2/lib/models/extendedDatabaseBlobAuditingPolicy.js

@@ -23,16 +23,16 @@ class ExtendedDatabaseBlobAuditingPolicy extends models['ProxyResource'] {
    * @member {string} [predicateExpression] Specifies condition of where clause
    * when creating an audit.
    * @member {string} state Specifies the state of the policy. If state is
-   * Enabled, storageEndpoint and storageAccountAccessKey are required.
+   * Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.
    * Possible values include: 'Enabled', 'Disabled'
    * @member {string} [storageEndpoint] Specifies the blob storage endpoint
    * (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled,
    * storageEndpoint is required.
    * @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.
    * @member {number} [retentionDays] Specifies the number of days to keep in
-   * the audit logs.
+   * the audit logs in the storage account.
    * @member {array} [auditActionsAndGroups] Specifies the Actions-Groups and
    * Actions to audit.
    *
@@ -109,6 +109,24 @@ class ExtendedDatabaseBlobAuditingPolicy extends models['ProxyResource'] {
    * subscription Id.
    * @member {boolean} [isStorageSecondaryKeyInUse] Specifies whether
    * storageAccountAccessKey value is the storage's secondary key.
+   * @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)
    */
   constructor() {
     super();
@@ -215,6 +233,13 @@ class ExtendedDatabaseBlobAuditingPolicy extends models['ProxyResource'] {
             type: {
               name: 'Boolean'
             }
+          },
+          isAzureMonitorTargetEnabled: {
+            required: false,
+            serializedName: 'properties.isAzureMonitorTargetEnabled',
+            type: {
+              name: 'Boolean'
+            }
           }
         }
       }

lib/services/sqlManagement2/lib/models/extendedServerBlobAuditingPolicy.js

@@ -23,16 +23,16 @@ class ExtendedServerBlobAuditingPolicy extends models['ProxyResource'] {
    * @member {string} [predicateExpression] Specifies condition of where clause
    * when creating an audit.
    * @member {string} state Specifies the state of the policy. If state is
-   * Enabled, storageEndpoint and storageAccountAccessKey are required.
+   * Enabled, storageEndpoint or isAzureMonitorTargetEnabled are required.
    * Possible values include: 'Enabled', 'Disabled'
    * @member {string} [storageEndpoint] Specifies the blob storage endpoint
    * (e.g. https://MyAccount.blob.core.windows.net). If state is Enabled,
    * storageEndpoint is required.
    * @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.
    * @member {number} [retentionDays] Specifies the number of days to keep in
-   * the audit logs.
+   * the audit logs in the storage account.
    * @member {array} [auditActionsAndGroups] Specifies the Actions-Groups and
    * Actions to audit.
    *
@@ -109,6 +109,24 @@ class ExtendedServerBlobAuditingPolicy extends models['ProxyResource'] {
    * subscription Id.
    * @member {boolean} [isStorageSecondaryKeyInUse] Specifies whether
    * storageAccountAccessKey value is the storage's secondary key.
+   * @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)
    */
   constructor() {
     super();
@@ -215,6 +233,13 @@ class ExtendedServerBlobAuditingPolicy extends models['ProxyResource'] {
             type: {
               name: 'Boolean'
             }
+          },
+          isAzureMonitorTargetEnabled: {
+            required: false,
+            serializedName: 'properties.isAzureMonitorTargetEnabled',
+            type: {
+              name: 'Boolean'
+            }
           }
         }
       }