Fixed tests related to storage changes

.editorconfig

@@ -9,4 +9,7 @@ insert_final_newline = false
 
 [*.{fs,fsx}]
 fsharp_multiline_bracket_style = stroustrup
-fsharp_newline_before_multiline_computation_expression = false
+fsharp_newline_before_multiline_computation_expression = false
+
+[*.json]
+indent_size = 2

src/Farmer/Arm/Storage.fs

@@ -175,8 +175,8 @@ type StorageAccount = {
                     | Blobs _ -> "BlobStorage"
                     | Files _ -> "FileStorage"
                     | BlockBlobs _ -> "BlockBlobStorage"
-                extendedLocation = "" // TODO:
-                identity = "" // TODO: user assigned identityt
+                extendedLocation = None // TODO:
+                identity = None // TODO: user assigned identity
                 properties = {|
                     accessTier =
                         match this.Sku with
@@ -206,13 +206,15 @@ type StorageAccount = {
                             defaultAction = networkRuleSet.DefaultAction.ArmValue
                         |})
                         |> Option.defaultValue Unchecked.defaultof<_>
-                    allowBlobPublicAccess = this.DisableBlobPublicAccess.BooleanValue()
-                    allowSharedKeyAccess = this.DisableSharedKeyAccess.BooleanValue()
-                    defaultToOAuthAuthentication = this.DefaultToOAuthAuthentication.BooleanValue()
+                    allowBlobPublicAccess = this.DisableBlobPublicAccess.AsInvertedBoolean()
+                    allowSharedKeyAccess = this.DisableSharedKeyAccess.AsInvertedBoolean()
+                    defaultToOAuthAuthentication = this.DefaultToOAuthAuthentication.AsBoolean()
                     dnsEndpointType = this.DnsZoneType |> Option.toObj
-                    encryption = {|
-                        requireInfrastructureEncryption = this.RequireInfrastructureEncryption |> Option.toNullable
-                    |}
+                    encryption =
+                        this.RequireInfrastructureEncryption
+                        |> Option.map (fun _ -> {|
+                            requireInfrastructureEncryption = this.RequireInfrastructureEncryption
+                        |})
                     immutableStorageWithVersioning =
                         this.ImmutableStorageWithVersioning
                         |> Option.map (fun immutableStorage -> {|
@@ -229,8 +231,8 @@ type StorageAccount = {
                         |})
                     isHnsEnabled = this.EnableHierarchicalNamespace |> Option.toNullable
                     minimumTlsVersion = this.MinTlsVersion.ArmValue()
-                    publicNetworkAccess = this.DisablePublicNetworkAccess.ArmValue()
-                    supportsHttpsTrafficOnly = this.SupportsHttpsTrafficOnly.BooleanValue()
+                    publicNetworkAccess = this.DisablePublicNetworkAccess.ArmInvertedValue()
+                    supportsHttpsTrafficOnly = this.SupportsHttpsTrafficOnly.AsBoolean()
                 |}
         |}
 

src/Farmer/Types.fs

@@ -417,16 +417,21 @@ type FeatureFlag =
         | Enabled -> true
         | Disabled -> false
 
-    member this.BooleanValue =
+    member this.AsInvertedBoolean =
         match this with
-        | Enabled -> "true"
-        | Disabled -> "false"
+        | Enabled -> false
+        | Disabled -> true
 
     member this.ArmValue =
         match this with
         | Enabled -> "Enabled"
         | Disabled -> "Disabled"
 
+    member this.ArmInvertedValue =
+        match this with
+        | Enabled -> "Disabled"
+        | Disabled -> "Enabled"
+
 [<AbstractClass; Sealed; Extension>]
 type FeatureFlagExtensions =
 
@@ -435,13 +440,17 @@ type FeatureFlagExtensions =
         featureFlag |> Option.map (fun f -> f.AsBoolean) |> Option.toNullable
 
     [<Extension>]
-    static member BooleanValue(featureFlag: FeatureFlag option) =
-        featureFlag |> Option.map (fun f -> f.BooleanValue) |> Option.toObj
+    static member AsInvertedBoolean(featureFlag: FeatureFlag option) =
+        featureFlag |> Option.map (fun f -> f.AsInvertedBoolean) |> Option.toNullable
 
     [<Extension>]
     static member ArmValue(featureFlag: FeatureFlag option) =
         featureFlag |> Option.map (fun f -> f.ArmValue) |> Option.toObj
 
+    [<Extension>]
+    static member ArmInvertedValue(featureFlag: FeatureFlag option) =
+        featureFlag |> Option.map (fun f -> f.ArmInvertedValue) |> Option.toObj
+
 module FeatureFlag =
     let ofBool enabled = if enabled then Enabled else Disabled
     let toBool (flag: FeatureFlag) = flag.AsBoolean

src/Tests/JsonRegression.fs

@@ -329,7 +329,7 @@ let tests =
         test "Can parse JSON into an ARM template" {
             let json =
                 """    {
-      "apiVersion": "2019-06-01",
+      "apiVersion": "2023-05-01",
       "dependsOn": [],
       "kind": "StorageV2",
       "location": "northeurope",

src/Tests/Storage.fs

@@ -456,7 +456,7 @@ let tests =
 
             Expect.equal
                 builder.WebsitePrimaryEndpoint.Value
-                "reference(resourceId('Microsoft.Storage/storageAccounts', 'foo'), '2022-05-01').primaryEndpoints.web"
+                "reference(resourceId('Microsoft.Storage/storageAccounts', 'foo'), '2023-05-01').primaryEndpoints.web"
                 "Zone names are not fixed and should be related to a storage account name"
         }
         test "Creates different SKU kinds correctly" {
@@ -736,8 +736,8 @@ let tests =
             let jobj = jsn |> Newtonsoft.Json.Linq.JObject.Parse
 
             Expect.equal
-                (jobj.SelectToken("resources[0].properties.supportsHttpsTrafficOnly").ToString())
-                "false"
+                (jobj.SelectToken("resources[0].properties.supportsHttpsTrafficOnly").ToObject<bool>())
+                false
                 "https traffic only should be disabled"
         }
 
@@ -754,8 +754,8 @@ let tests =
             let jobj = jsn |> Newtonsoft.Json.Linq.JObject.Parse
 
             Expect.equal
-                (jobj.SelectToken("resources[0].properties.supportsHttpsTrafficOnly").ToString())
-                "true"
+                (jobj.SelectToken("resources[0].properties.supportsHttpsTrafficOnly").ToObject<bool>())
+                true
                 "https traffic only should be enabled"
         }
 
@@ -863,8 +863,8 @@ let tests =
             let jobj = jsn |> Newtonsoft.Json.Linq.JObject.Parse
 
             Expect.equal
-                (jobj.SelectToken("resources[0].properties.allowBlobPublicAccess").ToString())
-                "false"
+                (jobj.SelectToken("resources[0].properties.allowBlobPublicAccess").ToObject<bool>())
+                false
                 "blob public access should be disabled"
         }
 
@@ -882,8 +882,8 @@ let tests =
             let jobj = jsn |> Newtonsoft.Json.Linq.JObject.Parse
 
             Expect.equal
-                (jobj.SelectToken("resources[0].properties.allowBlobPublicAccess").ToString())
-                "true"
+                (jobj.SelectToken("resources[0].properties.allowBlobPublicAccess").ToObject<bool>())
+                true
                 "blob public access should be enabled"
         }
 
@@ -900,8 +900,8 @@ let tests =
             let jobj = jsn |> Newtonsoft.Json.Linq.JObject.Parse
 
             Expect.equal
-                (jobj.SelectToken("resources[0].properties.allowSharedKeyAccess").ToString())
-                "false"
+                (jobj.SelectToken("resources[0].properties.allowSharedKeyAccess").ToObject<bool>())
+                false
                 "shared key access should be disabled"
         }
 
@@ -919,8 +919,8 @@ let tests =
             let jobj = jsn |> Newtonsoft.Json.Linq.JObject.Parse
 
             Expect.equal
-                (jobj.SelectToken("resources[0].properties.allowSharedKeyAccess").ToString())
-                "true"
+                (jobj.SelectToken("resources[0].properties.allowSharedKeyAccess").ToObject<bool>())
+                true
                 "shared key access should be enabled"
         }
 
@@ -939,8 +939,8 @@ let tests =
             Expect.equal
                 (jobj
                     .SelectToken("resources[0].properties.defaultToOAuthAuthentication")
-                    .ToString())
-                "true"
+                    .ToObject<bool>())
+                true
                 "default to OAuth should be enabled"
         }
 
@@ -960,8 +960,8 @@ let tests =
             Expect.equal
                 (jobj
                     .SelectToken("resources[0].properties.defaultToOAuthAuthentication")
-                    .ToString())
-                "false"
+                    .ToObject<bool>())
+                false
                 "default to OAuth should be disabled"
         }
     ]

src/Tests/VirtualMachine.fs

@@ -57,7 +57,7 @@ let tests =
 
             Expect.equal
                 resource.DiagnosticsProfile.BootDiagnostics.StorageUri
-                "[reference(resourceId('Microsoft.Storage/storageAccounts', 'isaacsvmstorage'), '2022-05-01').primaryEndpoints.blob]"
+                "[reference(resourceId('Microsoft.Storage/storageAccounts', 'isaacsvmstorage'), '2023-05-01').primaryEndpoints.blob]"
                 "Incorrect diagnostics storage Uri"
         }
 

src/Tests/test-data/diagnostics.json

@@ -5,7 +5,7 @@
   "parameters": {},
   "resources": [
     {
-      "apiVersion": "2022-05-01",
+      "apiVersion": "2023-05-01",
       "dependsOn": [],
       "kind": "StorageV2",
       "location": "northeurope",

src/Tests/test-data/event-grid.json

@@ -5,7 +5,7 @@
   "parameters": {},
   "resources": [
     {
-      "apiVersion": "2022-05-01",
+      "apiVersion": "2023-05-01",
       "dependsOn": [],
       "kind": "StorageV2",
       "location": "northeurope",
@@ -18,7 +18,7 @@
       "type": "Microsoft.Storage/storageAccounts"
     },
     {
-      "apiVersion": "2018-03-01-preview",
+      "apiVersion": "2023-05-01",
       "dependsOn": [
         "[resourceId('Microsoft.Storage/storageAccounts', 'isaacgriddevprac')]"
       ],

src/Tests/test-data/lots-of-resources.json

@@ -83,7 +83,7 @@
       "type": "Microsoft.Sql/servers/elasticPools"
     },
     {
-      "apiVersion": "2022-05-01",
+      "apiVersion": "2023-05-01",
       "dependsOn": [],
       "kind": "StorageV2",
       "location": "northeurope",
@@ -223,7 +223,7 @@
       "type": "Microsoft.Web/serverfarms"
     },
     {
-      "apiVersion": "2022-05-01",
+      "apiVersion": "2023-05-01",
       "dependsOn": [],
       "kind": "StorageV2",
       "location": "northeurope",
@@ -410,12 +410,12 @@
         "isHttpAllowed": true,
         "isHttpsAllowed": true,
         "optimizationType": "GeneralWebDelivery",
-        "originHostHeader": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', 'farmerstorage1979'), '2022-05-01').primaryEndpoints.web, 'https://', ''), '/', '')]",
+        "originHostHeader": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', 'farmerstorage1979'), '2023-05-01').primaryEndpoints.web, 'https://', ''), '/', '')]",
         "origins": [
           {
             "name": "origin",
             "properties": {
-              "hostName": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', 'farmerstorage1979'), '2022-05-01').primaryEndpoints.web, 'https://', ''), '/', '')]"
+              "hostName": "[replace(replace(reference(resourceId('Microsoft.Storage/storageAccounts', 'farmerstorage1979'), '2023-05-01').primaryEndpoints.web, 'https://', ''), '/', '')]"
             }
           }
         ],
@@ -781,7 +781,7 @@
       "type": "Microsoft.Web/serverfarms"
     },
     {
-      "apiVersion": "2022-05-01",
+      "apiVersion": "2023-05-01",
       "dependsOn": [],
       "kind": "StorageV2",
       "location": "northeurope",

src/Tests/test-data/vm.json

@@ -20,7 +20,7 @@
         "diagnosticsProfile": {
           "bootDiagnostics": {
             "enabled": true,
-            "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts', 'isaacsvmstorage'), '2022-05-01').primaryEndpoints.blob]"
+            "storageUri": "[reference(resourceId('Microsoft.Storage/storageAccounts', 'isaacsvmstorage'), '2023-05-01').primaryEndpoints.blob]"
           }
         },
         "hardwareProfile": {
@@ -143,7 +143,7 @@
       "type": "Microsoft.Network/publicIPAddresses"
     },
     {
-      "apiVersion": "2022-05-01",
+      "apiVersion": "2023-05-01",
       "dependsOn": [],
       "kind": "StorageV2",
       "location": "northeurope",