Update storage generator to suppress FxCop issues (#17181)

Azure · Nov 25, 2020 · 256df13 · 256df13
1 parent 1eb8d21
commit 256df13
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs b/sdk/storage/Azure.Storage.Blobs/src/Generated/BlobRestClient.cs
diff --git a/sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts b/sdk/storage/Azure.Storage.Common/swagger/Generator/src/generator.ts
@@ -902,12 +902,17 @@ function generateObject(w: IndentWriter, model: IServiceModel, type: IObjectType
                 w.line(`/// <summary>`);
                 w.line(`/// ${property.description || property.model.description || property.name}`);
                 w.line(`/// </summary>`);
+                let internalSetter = !property.isNullable && (property.readonly || property.model.type === `array`);
+                let isCollection = isPrimitiveType(property.model) && property.model.itemType && !type.struct;
                 if (property.model.type === `byte`) {
                     w.line(`#pragma warning disable CA1819 // Properties should not return arrays`);
                 }
+                if (isCollection && !internalSetter) {
+                    w.line(`#pragma warning disable CA2227 // Collection properties should be readonly`);
+                }
                 w.write(`public ${types.getDeclarationType(property.model, property.required, property.readonly)} ${naming.property(property.clientName)} { get; `);
                 if (!type.struct) {
-                    if (!property.isNullable && (property.readonly || property.model.type === `array`)) {
+                    if (internalSetter) {
                         w.write(`internal `);
                     }
                     w.write(`set; `);
@@ -917,6 +922,9 @@ function generateObject(w: IndentWriter, model: IServiceModel, type: IObjectType
                 if (property.model.type === `byte`) {
                     w.line(`#pragma warning restore CA1819 // Properties should not return arrays`);
                 }
+                if (isCollection && !internalSetter) {
+                    w.line(`#pragma warning restore CA2227 // Collection properties should be readonly`);
+                }
             }
 
             // Instantiate nested models if necessary

diff --git a/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs b/sdk/storage/Azure.Storage.Files.Shares/src/Generated/FileRestClient.cs
diff --git a/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs b/sdk/storage/Azure.Storage.Queues/src/Generated/QueueRestClient.cs