[AutoPR sql/resource-manager] Use common Resource & Sku definitions in all Sql specs

lib/services/sqlManagement2/lib/models/database.js

@@ -21,14 +21,19 @@ class Database extends models['TrackedResource'] {
   /**
    * Create a Database.
    * @member {object} [sku] The name and tier of the SKU.
-   * @member {string} [sku.name] The name of the SKU, typically, a letter +
-   * Number code, e.g. P3.
-   * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic,
-   * Premium.
-   * @member {string} [sku.size] Size of the particular SKU
+   * @member {string} [sku.name] The name of the SKU. Ex - P3. It is typically
+   * a letter+number code
+   * @member {string} [sku.tier] This field is required to be implemented by
+   * the Resource Provider if the service has more than one tier, but is not
+   * required on a PUT.
+   * @member {string} [sku.size] The SKU size. When the name field is the
+   * combination of tier and some other value, this would be the standalone
+   * code.
    * @member {string} [sku.family] If the service has different generations of
    * hardware, for the same SKU, then that can be captured here.
-   * @member {number} [sku.capacity] Capacity of the particular SKU.
+   * @member {number} [sku.capacity] If the SKU supports scale out/in then the
+   * capacity integer should be included. If scale out/in is not possible for
+   * the resource this may be omitted.
    * @member {string} [kind] Kind of database. This is metadata used for the
    * Azure portal experience.
    * @member {string} [managedBy] Resource that manages the database.
@@ -126,14 +131,19 @@ class Database extends models['TrackedResource'] {
    * connection string may be routed to a readonly secondary replica in the
    * same region. Possible values include: 'Enabled', 'Disabled'
    * @member {object} [currentSku] The name and tier of the SKU.
-   * @member {string} [currentSku.name] The name of the SKU, typically, a
-   * letter + Number code, e.g. P3.
-   * @member {string} [currentSku.tier] The tier of the particular SKU, e.g.
-   * Basic, Premium.
-   * @member {string} [currentSku.size] Size of the particular SKU
+   * @member {string} [currentSku.name] The name of the SKU. Ex - P3. It is
+   * typically a letter+number code
+   * @member {string} [currentSku.tier] This field is required to be
+   * implemented by the Resource Provider if the service has more than one
+   * tier, but is not required on a PUT.
+   * @member {string} [currentSku.size] The SKU size. When the name field is
+   * the combination of tier and some other value, this would be the standalone
+   * code.
    * @member {string} [currentSku.family] If the service has different
    * generations of hardware, for the same SKU, then that can be captured here.
-   * @member {number} [currentSku.capacity] Capacity of the particular SKU.
+   * @member {number} [currentSku.capacity] If the SKU supports scale out/in
+   * then the capacity integer should be included. If scale out/in is not
+   * possible for the resource this may be omitted.
    */
   constructor() {
     super();
@@ -177,6 +187,13 @@ class Database extends models['TrackedResource'] {
               name: 'String'
             }
           },
+          location: {
+            required: true,
+            serializedName: 'location',
+            type: {
+              name: 'String'
+            }
+          },
           tags: {
             required: false,
             serializedName: 'tags',
@@ -191,13 +208,6 @@ class Database extends models['TrackedResource'] {
               }
             }
           },
-          location: {
-            required: true,
-            serializedName: 'location',
-            type: {
-              name: 'String'
-            }
-          },
           sku: {
             required: false,
             serializedName: 'sku',

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

@@ -20,14 +20,19 @@ class DatabaseUpdate {
   /**
    * Create a DatabaseUpdate.
    * @member {object} [sku] The name and tier of the SKU.
-   * @member {string} [sku.name] The name of the SKU, typically, a letter +
-   * Number code, e.g. P3.
-   * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic,
-   * Premium.
-   * @member {string} [sku.size] Size of the particular SKU
+   * @member {string} [sku.name] The name of the SKU. Ex - P3. It is typically
+   * a letter+number code
+   * @member {string} [sku.tier] This field is required to be implemented by
+   * the Resource Provider if the service has more than one tier, but is not
+   * required on a PUT.
+   * @member {string} [sku.size] The SKU size. When the name field is the
+   * combination of tier and some other value, this would be the standalone
+   * code.
    * @member {string} [sku.family] If the service has different generations of
    * hardware, for the same SKU, then that can be captured here.
-   * @member {number} [sku.capacity] Capacity of the particular SKU.
+   * @member {number} [sku.capacity] If the SKU supports scale out/in then the
+   * capacity integer should be included. If scale out/in is not possible for
+   * the resource this may be omitted.
    * @member {string} [createMode] Specifies the mode of database creation.
    *
    * Default: regular database creation.
@@ -122,14 +127,19 @@ class DatabaseUpdate {
    * connection string may be routed to a readonly secondary replica in the
    * same region. Possible values include: 'Enabled', 'Disabled'
    * @member {object} [currentSku] The name and tier of the SKU.
-   * @member {string} [currentSku.name] The name of the SKU, typically, a
-   * letter + Number code, e.g. P3.
-   * @member {string} [currentSku.tier] The tier of the particular SKU, e.g.
-   * Basic, Premium.
-   * @member {string} [currentSku.size] Size of the particular SKU
+   * @member {string} [currentSku.name] The name of the SKU. Ex - P3. It is
+   * typically a letter+number code
+   * @member {string} [currentSku.tier] This field is required to be
+   * implemented by the Resource Provider if the service has more than one
+   * tier, but is not required on a PUT.
+   * @member {string} [currentSku.size] The SKU size. When the name field is
+   * the combination of tier and some other value, this would be the standalone
+   * code.
    * @member {string} [currentSku.family] If the service has different
    * generations of hardware, for the same SKU, then that can be captured here.
-   * @member {number} [currentSku.capacity] Capacity of the particular SKU.
+   * @member {number} [currentSku.capacity] If the SKU supports scale out/in
+   * then the capacity integer should be included. If scale out/in is not
+   * possible for the resource this may be omitted.
    * @member {object} [tags] Resource tags.
    */
   constructor() {

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

@@ -20,10 +20,10 @@ 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/).
-   * @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.
    * @member {object} [recurringScans] The recurring scans settings
@@ -77,14 +77,14 @@ class DatabaseVulnerabilityAssessment extends models['ProxyResource'] {
             }
           },
           storageContainerPath: {
-            required: false,
+            required: true,
             serializedName: 'properties.storageContainerPath',
             type: {
               name: 'String'
             }
           },
           storageContainerSasKey: {
-            required: false,
+            required: true,
             serializedName: 'properties.storageContainerSasKey',
             type: {
               name: 'String'

lib/services/sqlManagement2/lib/models/elasticPool.js

@@ -21,14 +21,19 @@ class ElasticPool extends models['TrackedResource'] {
   /**
    * Create a ElasticPool.
    * @member {object} [sku]
-   * @member {string} [sku.name] The name of the SKU, typically, a letter +
-   * Number code, e.g. P3.
-   * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic,
-   * Premium.
-   * @member {string} [sku.size] Size of the particular SKU
+   * @member {string} [sku.name] The name of the SKU. Ex - P3. It is typically
+   * a letter+number code
+   * @member {string} [sku.tier] This field is required to be implemented by
+   * the Resource Provider if the service has more than one tier, but is not
+   * required on a PUT.
+   * @member {string} [sku.size] The SKU size. When the name field is the
+   * combination of tier and some other value, this would be the standalone
+   * code.
    * @member {string} [sku.family] If the service has different generations of
    * hardware, for the same SKU, then that can be captured here.
-   * @member {number} [sku.capacity] Capacity of the particular SKU.
+   * @member {number} [sku.capacity] If the SKU supports scale out/in then the
+   * capacity integer should be included. If scale out/in is not possible for
+   * the resource this may be omitted.
    * @member {string} [kind] Kind of elastic pool. This is metadata used for
    * the Azure portal experience.
    * @member {string} [state] The state of the elastic pool. Possible values
@@ -91,6 +96,13 @@ class ElasticPool extends models['TrackedResource'] {
               name: 'String'
             }
           },
+          location: {
+            required: true,
+            serializedName: 'location',
+            type: {
+              name: 'String'
+            }
+          },
           tags: {
             required: false,
             serializedName: 'tags',
@@ -105,13 +117,6 @@ class ElasticPool extends models['TrackedResource'] {
               }
             }
           },
-          location: {
-            required: true,
-            serializedName: 'location',
-            type: {
-              name: 'String'
-            }
-          },
           sku: {
             required: false,
             serializedName: 'sku',

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

@@ -24,14 +24,19 @@ class ElasticPoolPerformanceLevelCapability {
    * @member {string} [performanceLevel.unit] Unit type used to measure
    * performance level. Possible values include: 'DTU', 'VCores'
    * @member {object} [sku] The sku.
-   * @member {string} [sku.name] The name of the SKU, typically, a letter +
-   * Number code, e.g. P3.
-   * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic,
-   * Premium.
-   * @member {string} [sku.size] Size of the particular SKU
+   * @member {string} [sku.name] The name of the SKU. Ex - P3. It is typically
+   * a letter+number code
+   * @member {string} [sku.tier] This field is required to be implemented by
+   * the Resource Provider if the service has more than one tier, but is not
+   * required on a PUT.
+   * @member {string} [sku.size] The SKU size. When the name field is the
+   * combination of tier and some other value, this would be the standalone
+   * code.
    * @member {string} [sku.family] If the service has different generations of
    * hardware, for the same SKU, then that can be captured here.
-   * @member {number} [sku.capacity] Capacity of the particular SKU.
+   * @member {number} [sku.capacity] If the SKU supports scale out/in then the
+   * capacity integer should be included. If scale out/in is not possible for
+   * the resource this may be omitted.
    * @member {array} [supportedLicenseTypes] List of supported license types.
    * @member {number} [maxDatabaseCount] The maximum number of databases
    * supported.

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

@@ -20,14 +20,19 @@ class ElasticPoolUpdate {
   /**
    * Create a ElasticPoolUpdate.
    * @member {object} [sku]
-   * @member {string} [sku.name] The name of the SKU, typically, a letter +
-   * Number code, e.g. P3.
-   * @member {string} [sku.tier] The tier of the particular SKU, e.g. Basic,
-   * Premium.
-   * @member {string} [sku.size] Size of the particular SKU
+   * @member {string} [sku.name] The name of the SKU. Ex - P3. It is typically
+   * a letter+number code
+   * @member {string} [sku.tier] This field is required to be implemented by
+   * the Resource Provider if the service has more than one tier, but is not
+   * required on a PUT.
+   * @member {string} [sku.size] The SKU size. When the name field is the
+   * combination of tier and some other value, this would be the standalone
+   * code.
    * @member {string} [sku.family] If the service has different generations of
    * hardware, for the same SKU, then that can be captured here.
-   * @member {number} [sku.capacity] Capacity of the particular SKU.
+   * @member {number} [sku.capacity] If the SKU supports scale out/in then the
+   * capacity integer should be included. If scale out/in is not possible for
+   * the resource this may be omitted.
    * @member {number} [maxSizeBytes] The storage limit for the database elastic
    * pool in bytes.
    * @member {object} [perDatabaseSettings] The per database settings for the