Merge pull request #3293 from Azure/restapi_auto_sql/resource-manager

[AutoPR] sql/resource-manager

lib/services/sqlManagement2/lib/models/databaseUpdate.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * A database resource.
  *

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

@@ -23,9 +23,13 @@ class DatabaseVulnerabilityAssessment extends models['ProxyResource'] {
    * @member {string} storageContainerPath A blob storage container path to
    * hold the scan results (e.g.
    * https://myStorage.blob.core.windows.net/VaScans/).
-   * @member {string} storageContainerSasKey A shared access signature (SAS
+   * @member {string} [storageContainerSasKey] A shared access signature (SAS
    * Key) that has write access to the blob container specified in
-   * 'storageContainerPath' parameter.
+   * '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.
    * @member {object} [recurringScans] The recurring scans settings
    * @member {boolean} [recurringScans.isEnabled] Recurring scans state.
    * @member {boolean} [recurringScans.emailSubscriptionAdmins] Specifies that
@@ -84,12 +88,19 @@ class DatabaseVulnerabilityAssessment extends models['ProxyResource'] {
             }
           },
           storageContainerSasKey: {
-            required: true,
+            required: false,
             serializedName: 'properties.storageContainerSasKey',
             type: {
               name: 'String'
             }
           },
+          storageAccountAccessKey: {
+            required: false,
+            serializedName: 'properties.storageAccountAccessKey',
+            type: {
+              name: 'String'
+            }
+          },
           recurringScans: {
             required: false,
             serializedName: 'properties.recurringScans',

lib/services/sqlManagement2/lib/models/editionCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The edition capability.
  *

lib/services/sqlManagement2/lib/models/elasticPoolEditionCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The elastic pool edition capability.
  *

lib/services/sqlManagement2/lib/models/elasticPoolPerDatabaseMaxPerformanceLevelCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The max per-database performance level capability.
  *

lib/services/sqlManagement2/lib/models/elasticPoolPerformanceLevelCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The Elastic Pool performance level capability.
  *

lib/services/sqlManagement2/lib/models/elasticPoolUpdate.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * An elastic pool update.
  *

lib/services/sqlManagement2/lib/models/failoverGroupUpdate.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * A failover group update request.
  *

lib/services/sqlManagement2/lib/models/index.d.ts

@@ -2331,9 +2331,13 @@ export interface VulnerabilityAssessmentRecurringScansProperties {
  *
  * @member {string} storageContainerPath A blob storage container path to hold
  * the scan results (e.g. https://myStorage.blob.core.windows.net/VaScans/).
- * @member {string} storageContainerSasKey A shared access signature (SAS Key)
- * that has write access to the blob container specified in
- * 'storageContainerPath' parameter.
+ * @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.
  * @member {object} [recurringScans] The recurring scans settings
  * @member {boolean} [recurringScans.isEnabled] Recurring scans state.
  * @member {boolean} [recurringScans.emailSubscriptionAdmins] Specifies that
@@ -2344,7 +2348,8 @@ export interface VulnerabilityAssessmentRecurringScansProperties {
  */
 export interface DatabaseVulnerabilityAssessment extends ProxyResource {
   storageContainerPath: string;
-  storageContainerSasKey: string;
+  storageContainerSasKey?: string;
+  storageAccountAccessKey?: string;
   recurringScans?: VulnerabilityAssessmentRecurringScansProperties;
 }
 

lib/services/sqlManagement2/lib/models/locationCapabilities.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The location capability.
  *

lib/services/sqlManagement2/lib/models/managedInstanceEditionCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The managed server capability
  *

lib/services/sqlManagement2/lib/models/managedInstanceFamilyCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The managed server family capability.
  *

lib/services/sqlManagement2/lib/models/managedInstanceUpdate.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * An update request for an Azure SQL Database managed instance.
  *

lib/services/sqlManagement2/lib/models/managedInstanceVersionCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The managed instance capability
  *

lib/services/sqlManagement2/lib/models/maxSizeRangeCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The maximum size range capability.
  *

lib/services/sqlManagement2/lib/models/metric.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Database metrics.
  *

lib/services/sqlManagement2/lib/models/metricDefinition.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * A database metric definition.
  *

lib/services/sqlManagement2/lib/models/operation.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * SQL REST API operation definition.
  *

lib/services/sqlManagement2/lib/models/serverVersionCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The server capability
  *

lib/services/sqlManagement2/lib/models/serviceObjectiveCapability.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * The service objectives capability.
  *

lib/services/sqlManagement2/lib/models/syncFullSchemaProperties.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Properties of the database full schema.
  *

lib/services/sqlManagement2/lib/models/syncFullSchemaTable.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Properties of the table in the database full schema.
  *

lib/services/sqlManagement2/lib/models/syncGroupSchema.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Properties of sync group schema.
  *

lib/services/sqlManagement2/lib/models/syncGroupSchemaTable.js

@@ -10,8 +10,6 @@
 
 'use strict';
 
-const models = require('./index');
-
 /**
  * Properties of table in sync group schema.
  *

lib/services/sqlManagement2/lib/operations/databaseVulnerabilityAssessments.js

@@ -187,9 +187,15 @@ function _get(resourceGroupName, serverName, databaseName, options, callback) {
  * path to hold the scan results (e.g.
  * https://myStorage.blob.core.windows.net/VaScans/).
  *
- * @param {string} parameters.storageContainerSasKey A shared access signature
- * (SAS Key) that has write access to the blob container specified in
- * 'storageContainerPath' parameter.
+ * @param {string} [parameters.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.
+ *
+ * @param {string} [parameters.storageAccountAccessKey] Specifies the
+ * identifier key of the vulnerability assessment storage account. If
+ * 'StorageContainerSasKey' isn't specified, storageAccountAccessKey is
+ * required.
  *
  * @param {object} [parameters.recurringScans] The recurring scans settings
  *
@@ -644,9 +650,15 @@ class DatabaseVulnerabilityAssessments {
    * path to hold the scan results (e.g.
    * https://myStorage.blob.core.windows.net/VaScans/).
    *
-   * @param {string} parameters.storageContainerSasKey A shared access signature
-   * (SAS Key) that has write access to the blob container specified in
-   * 'storageContainerPath' parameter.
+   * @param {string} [parameters.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.
+   *
+   * @param {string} [parameters.storageAccountAccessKey] Specifies the
+   * identifier key of the vulnerability assessment storage account. If
+   * 'StorageContainerSasKey' isn't specified, storageAccountAccessKey is
+   * required.
    *
    * @param {object} [parameters.recurringScans] The recurring scans settings
    *
@@ -703,9 +715,15 @@ class DatabaseVulnerabilityAssessments {
    * path to hold the scan results (e.g.
    * https://myStorage.blob.core.windows.net/VaScans/).
    *
-   * @param {string} parameters.storageContainerSasKey A shared access signature
-   * (SAS Key) that has write access to the blob container specified in
-   * 'storageContainerPath' parameter.
+   * @param {string} [parameters.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.
+   *
+   * @param {string} [parameters.storageAccountAccessKey] Specifies the
+   * identifier key of the vulnerability assessment storage account. If
+   * 'StorageContainerSasKey' isn't specified, storageAccountAccessKey is
+   * required.
    *
    * @param {object} [parameters.recurringScans] The recurring scans settings
    *