[Storage] Make the CORS rules nullable

sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs

@@ -14546,7 +14546,7 @@ public partial class BlobServiceProperties
         /// <summary>
         /// The set of CORS rules.
         /// </summary>
-        public System.Collections.Generic.IList<Azure.Storage.Blobs.Models.CorsRule> Cors { get; internal set; }
+        public System.Collections.Generic.IList<Azure.Storage.Blobs.Models.CorsRule> Cors { get; set; }
 
         /// <summary>
         /// The default version to use for requests to the Blob service if an incoming request's version is not specified. Possible values include version 2008-10-27 and all more recent versions
@@ -14582,7 +14582,6 @@ internal BlobServiceProperties(bool skipInitialization)
                 Logging = new Azure.Storage.Blobs.Models.Logging();
                 HourMetrics = new Azure.Storage.Blobs.Models.Metrics();
                 MinuteMetrics = new Azure.Storage.Blobs.Models.Metrics();
-                Cors = new System.Collections.Generic.List<Azure.Storage.Blobs.Models.CorsRule>();
                 DeleteRetentionPolicy = new Azure.Storage.Blobs.Models.RetentionPolicy();
                 StaticWebsite = new Azure.Storage.Blobs.Models.StaticWebsite();
             }

sdk/storage/Azure.Storage.Blobs/swagger/readme.md

@@ -147,6 +147,16 @@ directive:
     }
 ```
 
+### Make CORS allow null values
+It should be possible to pass null for CORS to update service properties without changing existing rules.
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.BlobServiceProperties
+  transform: >
+    $.properties.Cors["x-az-nullable-array"] = true;
+```
+
 ### /?restype=service&comp=stats
 ``` yaml
 directive:

sdk/storage/Azure.Storage.Common/swagger/Generator/readme.md

@@ -13,6 +13,7 @@ We support a number of extensions including using the vendor prefix `x-az-`:
 - `x-az-skip-path-components`: Whether to skip any path components and always assume a fully formed URL to the resource (this currently must be set to `true`).
 - `x-az-include-sync-methods`: Whether to generate support for sync methods.  The default value is `false` (this flag should go away soon and always be `true`).
 - `x-az-stream`: Whether to generate a non buffered request that takes owhership of the response stream. The default value is `false`.
+- `x-az-nullable-array`:  Allows list to be null. The default value is `false`.
 
 ### Autorest plugin configuration
 The AutoRest example at https://github.com/Azure/autorest-extension-helloworld

sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts

@@ -843,7 +843,7 @@ function generateObject(w: IndentWriter, model: IServiceModel, type: IObjectType
                     w.line(`#pragma warning disable CA1819 // Properties should not return arrays`);
                 }
                 w.write(`public ${types.getDeclarationType(property.model, property.required, property.readonly)} ${naming.property(property.clientName)} { get; `);
-                if (property.readonly || property.model.type === `array`) {
+                if (!property.isNullable && (property.readonly || property.model.type === `array`)) {
                     w.write(`internal `);
                 }
                 w.line(`set; }`);
@@ -853,7 +853,7 @@ function generateObject(w: IndentWriter, model: IServiceModel, type: IObjectType
             }
 
             // Instantiate nested models if necessary
-            const nested = (<IProperty[]>Object.values(type.properties)).filter(p => isObjectType(p.model) || (isPrimitiveType(p.model) && (p.model.itemType || p.model.type === `dictionary`)));
+            const nested = (<IProperty[]>Object.values(type.properties)).filter(p => !p.isNullable && (isObjectType(p.model) || (isPrimitiveType(p.model) && (p.model.itemType || p.model.type === `dictionary`))));
             if (nested.length > 0) {
                 const skipInitName = `skipInitialization`;
                 if (separator()) { w.line(); }

sdk/storage/Azure.Storage.Common/swagger/Generator/src/models.ts

@@ -151,7 +151,8 @@ export interface IProperty {
     required?: boolean,
     readonly: boolean,
     xml?: IXmlSettings,
-    model: IModelType
+    model: IModelType,
+    isNullable?: boolean
 }
 
 export interface IXmlSettings {

sdk/storage/Azure.Storage.Common/swagger/Generator/src/serviceModel.ts

@@ -390,13 +390,19 @@ function createObjectType(project: IProject, name: string, swagger: any, locatio
         unsupported(() => def[`x-ms-client-flatten`], `${location}.properties['${name}']`);
         unsupported(() => def[`x-ms-mutability`], `${location}.properties['${name}']`);
 
+        let isNullable: boolean|undefined = def[`x-az-nullable-array`];
+        if (isNullable === undefined) {
+            isNullable = false;
+        }
+
         properties[name] = {
             name,
             clientName: optional(() => def[`x-ms-client-name`], name),
             description: def.description,
             readonly: true,
             xml: def.xml || { },
-            model: createType(project, name, def, `${location}.properties['${name}']`)
+            model: createType(project, name, def, `${location}.properties['${name}']`),
+            isNullable: isNullable
         };
     }
 

sdk/storage/Azure.Storage.Files/src/Generated/FileRestClient.cs

@@ -6795,7 +6795,7 @@ public partial class FileServiceProperties
         /// <summary>
         /// The set of CORS rules.
         /// </summary>
-        public System.Collections.Generic.IList<Azure.Storage.Files.Models.CorsRule> Cors { get; internal set; }
+        public System.Collections.Generic.IList<Azure.Storage.Files.Models.CorsRule> Cors { get; set; }
 
         /// <summary>
         /// Creates a new FileServiceProperties instance
@@ -6815,7 +6815,6 @@ internal FileServiceProperties(bool skipInitialization)
             {
                 HourMetrics = new Azure.Storage.Files.Models.Metrics();
                 MinuteMetrics = new Azure.Storage.Files.Models.Metrics();
-                Cors = new System.Collections.Generic.List<Azure.Storage.Files.Models.CorsRule>();
             }
         }
 

sdk/storage/Azure.Storage.Files/swagger/readme.md

@@ -117,6 +117,16 @@ directive:
     }
 ```
 
+### Make CORS allow null values
+It should be possible to pass null for CORS to update service properties without changing existing rules.
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.FileServiceProperties
+  transform: >
+    $.properties.Cors["x-az-nullable-array"] = true;
+```
+
 ### /?comp=list
 ``` yaml
 directive:

sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs

@@ -3721,7 +3721,7 @@ public partial class QueueServiceProperties
         /// <summary>
         /// The set of CORS rules.
         /// </summary>
-        public System.Collections.Generic.IList<Azure.Storage.Queues.Models.CorsRule> Cors { get; internal set; }
+        public System.Collections.Generic.IList<Azure.Storage.Queues.Models.CorsRule> Cors { get; set; }
 
         /// <summary>
         /// Creates a new QueueServiceProperties instance
@@ -3742,7 +3742,6 @@ internal QueueServiceProperties(bool skipInitialization)
                 Logging = new Azure.Storage.Queues.Models.Logging();
                 HourMetrics = new Azure.Storage.Queues.Models.Metrics();
                 MinuteMetrics = new Azure.Storage.Queues.Models.Metrics();
-                Cors = new System.Collections.Generic.List<Azure.Storage.Queues.Models.CorsRule>();
             }
         }
 

sdk/storage/Azure.Storage.Queues/swagger/readme.md

@@ -98,6 +98,16 @@ directive:
     }
 ```
 
+### Make CORS allow null values
+It should be possible to pass null for CORS to update service properties without changing existing rules.
+``` yaml
+directive:
+- from: swagger-document
+  where: $.definitions.QueueServiceProperties
+  transform: >
+    $.properties.Cors["x-az-nullable-array"] = true;
+```
+
 ### QueueServiceStatistics
 ``` yaml
 directive: