Allow deployment slot settings

Farmer.sln

@@ -45,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{C399
 		samples\scripts\storage.fsx = samples\scripts\storage.fsx
 		samples\scripts\template.json = samples\scripts\template.json
 		samples\scripts\vm.fsx = samples\scripts\vm.fsx
+		samples\scripts\vm-spot-instance.fsx = samples\scripts\vm-spot-instance.fsx
 		samples\scripts\vnet-gateway.fsx = samples\scripts\vnet-gateway.fsx
 		samples\scripts\vnet-hub-and-spoke.fsx = samples\scripts\vnet-hub-and-spoke.fsx
 		samples\scripts\vnet.fsx = samples\scripts\vnet.fsx

RELEASE_NOTES.md

@@ -1,7 +1,33 @@
 Release Notes
 =============
+## vNext
+* WebApp/Functions: Support for deployment slot settings with `slot_setting` and `slot_settings`
+
+## 1.6.31
+* AzureFirewall: Supports availability zones
+* WebApps/Functions: Add support for vnet integration
+
+## 1.6.30
+* WebApps/Functions: Specify connection string types
+* WebApps/Functions: Allow adding IP restriction string with CIDR
+* Application Insights: Support for Workspace-enabled instances.
+* VMs: Priority and Spot Instance Settings
+
+## 1.6.29
+* CLI: include `--only-show-error` option when executing Azure CLI commands.
+
+## 1.6.28
+* ServicePlan/WebApp: Support for enabling ZoneRedundant
+
+## 1.6.27
+* Functions: Make `connection_string` available for Azure Functions in addition to WebApps.
+* WebApps/Functions: Add support for ip-restriction rules
+* WebApps/Functions: Don't turn on Logging Extension for Linux App Service.
+* WebApps: Allow multiple custom domains
+* WebApps: Support custom port for docker container with `docker_port`
+
 ## 1.6.26
-* WebApp/Functions: Fix .NET on Linux deployments
+* WebApps/Functions: Fix .NET 5/6 on Linux deployments.
 
 ## 1.6.25
 * CosmosDb: Add support for serverless capacity mode.

docs/content/api-overview/resources/app-insights.md

@@ -10,13 +10,16 @@ The App Insights builder is used to create Application Insights accounts. Use th
 
 * Application Insights (`Microsoft.Insights/components`)
 
+> This builder supports both "Classic" (standalone) and "Workspace Enabled" (Log Analytics-backed) instances of App Insights. See the `log_analytics_workspace` keyword to see how to create the latter type of instance.
+
 #### Builder Keywords
 
 | Keyword | Purpose |
 |-|-|
 | name | Sets the name of the App Insights instance. |
 | disable_ip_masking | Disable IP masking. |
 | sampling_percentage | Define sampling percentage (0-100) |
+| log_analytics_workspace | Use a Log Analytics workspace as the backing store for this AI instance. You can supply either a Farmer-generate Log Analytics`WorkspaceConfig` instance that exists in the same resource group, or a fully-qualified Resource ID path to that instance. This will also switch the AI instance over to creating a "workspace enabled" AI instance. |
 
 #### Configuration Members
 
@@ -32,5 +35,6 @@ open Farmer.Builders
 
 let ai = appInsights {
     name "myAI"
+    log_analytics_workspace myWorkspace // use to activate workspace-enabled AI instances.
 }
 ```

docs/content/api-overview/resources/container-apps.md

@@ -11,6 +11,11 @@ The Container Apps builder is used to create Azure Container Apps.
 * Container Environment (`Microsoft.Web/kubeEnvironments`)
 * Container App (`Microsoft.Web/containerApps`)
 
+### Turn on Resource Provider
+Before you deploy your container app, you need to turn on the Container Apps resource provider in your Azure subscription.
+
+Get sure you have the following providers registered: `Microsoft.Kubernetes` and `Microsoft.ContainerService`.
+
 #### Container Environment Builder
 The Container Environment builder (`containerEnvironment`) defines settings for the Kubernetes envirionment that hosts the container apps.
 

docs/content/api-overview/resources/functions.md

@@ -35,6 +35,8 @@ The Functions builder is used to create Azure Functions accounts. It abstracts t
 | setting | Sets an app setting of the web app in the form "key" "value". |
 | secret_setting | Sets a "secret" app setting of the function. You must supply the "key", whilst the value will be supplied as a secure parameter or an ARM expression. |
 | settings | Sets a list of app setting of the web app as tuples in the form of ("key", "value"). |
+| connection_string | Creates a connection string whose value is supplied as secret parameter, or as an ARM expression in the tupled form of ("key", expr). |
+| connection_strings | Creates a set of connection strings whose values will be supplied as secret parameters. |
 | depends_on | [Sets dependencies for the web app.](../../dependencies/) |
 | enable_cors | Enables CORS support for the app. Either specify AllOrigins or a list of valid URIs. |
 | enable_cors_credentials | Allows CORS requests with credentials. |
@@ -45,8 +47,13 @@ The Functions builder is used to create Azure Functions accounts. It abstracts t
 | publish_as | Specifies whether to publish function as code or as a docker container. |
 | add_slot | Adds a deployment slot to the app |
 | add_slots | Adds multiple deployment slots to the app |
+| slot_setting | Sets a deployment slot setting of the function in the form "key" "value". |
+| slot_settings | Sets a list of deployment slot setting of the function as tuples in the form of ("key", "value"). |
 | health_check_path | Sets the path to your functions health check endpoint, which Azure load balancers will ping to determine which instances are healthy.|
-
+| add_allowed_ip_restriction | Adds an 'allow' rule for an ip |
+| add_denied_ip_restriction | Adds an 'deny' rule for an ip |
+| link_to_vnet | Enable the VNET integration feature in azure where all outbound traffic from the function with be sent via the specified subnet. Use this operator when the given VNET is in the same deployment |
+| link_to_unmanaged_vnet | Enable the VNET integration feature in azure where all outbound traffic from the function with be sent via the specified subnet. Use this operator when the given VNET is *not* in the same deployment |
 #### Post-deployment Builder Keywords
 The Functions builder contains special commands that are executed *after* the ARM deployment is completed.
 

docs/content/api-overview/resources/virtual-machine.md

@@ -1,6 +1,6 @@
 ---
 title: "Virtual Machine"
-date: 2020-02-05T08:53:46+01:00
+date: 2022-03-17T09:33:27+05:00
 chapter: false
 weight: 21
 ---
@@ -24,6 +24,8 @@ In addition, every VM you create will add a SecureString parameter to the ARM te
 |diagnostics_support|Turns on diagnostics support using an automatically created created storage account.|
 |diagnostics_support_external|Turns on diagnostics support using an existing storage account.|
 |vm_size|Sets the size of the VM.|
+|priority|Sets the VM Priority. Only one `spot_instance` or `priority` setting is allowed per VM.|
+|spot_instance|Makes the VM a spot instance. Shorthand for `priority (Spot (<EvictionPolicy>, <maxPrice>)`. Only one `spot_instance` or `priority` setting is allowed per VM.|
 |username|Sets the admin username of the VM (note: the password is supplied as a securestring parameter to the generated ARM template).|
 |password_parameter|Sets the name of the parameter which contains the admin password for this VM. defaults to "password-for-<VM-name>"|
 |operating_system|Sets the operating system of the VM. A set of samples is provided in the `CommonImages` module.|

docs/content/api-overview/resources/web-app.md

@@ -28,7 +28,7 @@ The Web App builder is used to create Azure App Service accounts. It abstracts t
 | Web App | setting | Sets an app setting of the web app in the form "key" "value". |
 | Web App | secret_setting | Sets a "secret" app setting of the web app. You must supply the "key", whilst the value will be supplied as a secure parameter. |
 | Web App | settings | Sets a list of app setting of the web app as tuples in the form of ("key", "value"). |
-| Web App | connection_string | Creates a connection string whose value is supplied as secret parameter, or as an ARM expression in the tupled form of ("key", expr). |
+| Web App | connection_string | Creates a connection string whose value is supplied as secret parameter, or as an ARM expression in the tupled form of ("key", expr), or with the connection string type ("key", expr, SQLAzure). |
 | Web App | connection_strings | Creates a set of connection strings of the web app whose values will be supplied as secret parameters. |
 | Web App | ftp_state | Allows to enable or disable FTP and FTPS. |
 | Web App | https_only | Disables http for this webapp so that only HTTPS is used. |
@@ -55,14 +55,22 @@ The Web App builder is used to create Azure App Service accounts. It abstracts t
 | Web App | add_private_endpoints | Adds private endpoints for this Webapp to the given subnets |
 | Web App | add_slot | Adds a deployment slot to the app |
 | Web App | add_slots | Adds multiple deployment slots to the app |
+| Web App | add_slot_setting | Sets a deployment slot setting of the web app in the form "key" "value". |
+| Web App | add_slot_settings | Sets a list of deployment slot setting of the web app as tuples in the form of ("key", "value"). |
 | Web App | health_check_path | Sets the path to your functions health check endpoint, which Azure load balancers will ping to determine which instances are healthy.|
-| Web App | custom_domain | Adds custom domain to the app, containing an app service managed certificate |
+| Web App | custom_domain | Adds a custom domain to the app.  By default this will produce an AppService-managed SSL certificate for your domain as well. Through the overloads of this operator, you can provide a custom certificate thumbprint or choose not to use SSL. You can use this operator multiple times to add multiple custom domains.  |
+| Web App | add_allowed_ip_restriction | Adds an 'allow' rule for an ip |
+| Web App | add_denied_ip_restriction | Adds an 'deny' rule for an ip |
+| Web App | docker_port | Adds `WEBSITES_PORT` setting to map custom docker port to app service port 80 |
+| Web App | link_to_vnet | Enable the VNET integration feature in azure where all outbound traffic from the web app with be sent via the specified subnet. Use this operator when the given VNET is in the same deployment |
+| Web App | link_to_unmanaged_vnet | Enable the VNET integration feature in azure where all outbound traffic from the web app with be sent via the specified subnet. Use this operator when the given VNET is *not* in the same deployment |
 | Service Plan | service_plan_name | Sets the name of the service plan. If not set, uses the name of the web app postfixed with "-plan". |
 | Service Plan | runtime_stack | Sets the runtime stack. |
 | Service Plan | operating_system | Sets the operating system. If Linux, App Insights configuration settings will be omitted as they are not supported by Azure App Service. |
 | Service Plan | sku | Sets the sku of the service plan. |
 | Service Plan | worker_size | Sets the size of the service plan worker. |
 | Service Plan | number_of_workers | Sets the number of instances on the service plan. |
+| Service Plan | zone_redundant | Enables ZoneRedundant on the service plan. |
 
 > **Farmer also comes with a dedicated Service Plan builder** that contains all of the above keywords that apply to a Service Plan.
 >

samples/scripts/appinsights-loganalytics.fsx

@@ -0,0 +1,26 @@
+#r @"nuget:Farmer"
+
+open Farmer
+open Farmer.Builders
+
+let workspace = logAnalytics {
+    name "loganalytics-workspace"
+}
+
+let myAppInsights = appInsights {
+    name "appInsights"
+    log_analytics_workspace workspace
+}
+
+let myFunctions = functions {
+    name "functions-app"
+    link_to_app_insights myAppInsights.Name
+}
+
+let template = arm {
+    location Location.NorthEurope
+    add_resources [ workspace; myAppInsights; myFunctions ]
+}
+
+template
+|> Deploy.execute "deleteme" Deploy.NoParameters

samples/scripts/container-app.fsx

@@ -30,8 +30,8 @@ let env =
                     container {
                         name "queuereaderapp"
                         public_docker_image "mcr.microsoft.com/azuredocs/containerapps-queuereader" ""
-                        cpu_cores 1.0<VCores>
-                        memory 1.0<Gb>
+                        cpu_cores 0.25<VCores>
+                        memory 0.5<Gb>
                     }
                 ]
                 replicas 1 10

samples/scripts/vm-spot-instance.fsx

@@ -0,0 +1,26 @@
+#r "nuget:Farmer"
+
+open Farmer
+open Farmer.Builders
+open Farmer.Vm
+
+let myVm = vm {
+    name "isaacsVM"
+    username "isaac"
+    spot_instance Deallocate
+    vm_size Standard_A2
+    operating_system WindowsServer_2012Datacenter
+    os_disk 128 StandardSSD_LRS
+    add_ssd_disk 128
+    add_slow_disk 512
+    diagnostics_support
+    system_identity
+}
+
+let deployment = arm {
+    location Location.NorthEurope
+    add_resource myVm
+}
+
+deployment
+|> Deploy.execute "my-resource-group-name" Deploy.NoParameters

samples/scripts/webapp-storage.fsx

@@ -15,6 +15,8 @@ let myWebApp = webApp {
     sku WebApp.Sku.S1
     app_insights_off
     setting "storage_key" myStorage.Key
+    add_allowed_ip_restriction "allow everything" "0.0.0.0/0"
+    add_denied_ip_restriction "deny" "1.2.3.4/31"
 }
 
 let deployment = arm {

src/Farmer/Aliases.fs

@@ -1,4 +1,19 @@
 [<AutoOpen>]
 module Farmer.Aliases
 
+[<AutoOpen>]
+module BuilderExtensions = 
+    open Farmer.Builders
+    open Farmer.Arm.Network
+    type IPrivateEndpoints<'TConfig> with
+    member this.AddPrivateEndpoint(state:'TConfig, subnetId:LinkedResource) = this.AddPrivateEndpoint (state, SubnetReference.create subnetId)
+    member this.AddPrivateEndpoint(state:'TConfig, subnet:SubnetConfig) = this.AddPrivateEndpoint (state, SubnetReference.create subnet)
+    member this.AddPrivateEndpoint(state, (subnetRef:LinkedResource,epName)) = this.AddPrivateEndpoint (state, (SubnetReference.create subnetRef, epName))
+    member this.AddPrivateEndpoint(state:'TConfig, (vnetRef, subnetName):LinkedResource * ResourceName) = this.AddPrivateEndpoint (state, SubnetReference.create (vnetRef,subnetName))
+    member this.AddPrivateEndpoint(state, (vnetRef,subnetName,epName):LinkedResource * ResourceName * string) = this.AddPrivateEndpoint (state, ((SubnetReference.create (vnetRef, subnetName)), epName))
+    member this.AddPrivateEndpoint(state:'TConfig, (vnet, subnetName):VirtualNetworkConfig * ResourceName) = this.AddPrivateEndpoint (state, SubnetReference.create (vnet,subnetName))
+
+    member this.AddPrivateEndpoints(state:'TConfig, subnetIds:LinkedResource list) = this.AddPrivateEndpoints (state, subnetIds |> List.map SubnetReference.create |> Set)
+    member this.AddPrivateEndpoints(state:'TConfig, subnets:SubnetConfig list) = this.AddPrivateEndpoints (state, subnets |> List.map SubnetReference.create |> Set)
+
 let arm = Farmer.Builders.ResourceGroup.DeploymentBuilder ()

src/Farmer/Arm/AzureFirewall.fs

@@ -40,6 +40,7 @@ type AzureFirewall =
       FirewallPolicy : ResourceId option
       VirtualHub : ResourceId option
       HubIPAddresses : HubIPAddresses option
+      AvailabilityZones : string list
       Sku : Sku }
     interface IArmResource with
         member this.ResourceId = azureFirewalls.resourceId this.Name
@@ -50,5 +51,6 @@ type AzureFirewall =
                      virtualHub = this.VirtualHub |>  Option.map (fun resId -> box {| id = resId.ArmExpression.Eval() |}) |> Option.defaultValue null
                      firewallPolicy = this.FirewallPolicy |>  Option.map (fun resId -> box {| id = resId.ArmExpression.Eval() |}) |> Option.defaultValue null
                      hubIPAddresses = this.HubIPAddresses |> Option.map (fun x -> box x.JsonModel) |> Option.defaultValue null |}
+                zones = if this.AvailabilityZones.IsEmpty then null else this.AvailabilityZones |> box
             |}
 

src/Farmer/Arm/Compute.fs

@@ -7,7 +7,7 @@ open Farmer.Vm
 open System
 open System.Text
 
-let virtualMachines = ResourceType ("Microsoft.Compute/virtualMachines", "2018-10-01")
+let virtualMachines = ResourceType ("Microsoft.Compute/virtualMachines", "2019-03-01")
 let extensions = ResourceType ("Microsoft.Compute/virtualMachines/extensions", "2019-12-01")
 
 type CustomScriptExtension =
@@ -70,6 +70,7 @@ type VirtualMachine =
       Location : Location
       StorageAccount : ResourceName option
       Size : VMSize
+      Priority : Priority
       Credentials : {| Username : string; Password : SecureParameter |}
       CustomData : string option
       DisablePasswordAuthentication: bool option
@@ -93,12 +94,9 @@ type VirtualMachine =
                 networkInterfaces.resourceId this.NetworkInterfaceName
                 yield! this.StorageAccount |> Option.mapList storageAccounts.resourceId
             ]
-            {| virtualMachines.Create(this.Name, this.Location, dependsOn, this.Tags) with
-                identity =
-                    if this.Identity = ManagedIdentity.Empty then Unchecked.defaultof<_>
-                    else this.Identity.ToArmJson
-                properties =
-                 {| hardwareProfile = {| vmSize = this.Size.ArmValue |}
+            let properties =
+                 {| priority = this.Priority.ArmValue
+                    hardwareProfile = {| vmSize = this.Size.ArmValue |}
                     osProfile =
                      {| computerName = this.Name.Value
                         adminUsername = this.Credentials.Username
@@ -161,4 +159,17 @@ type VirtualMachine =
                         | None ->
                             box {| bootDiagnostics = {| enabled = false |} |}
                 |}
+
+            {| virtualMachines.Create(this.Name, this.Location, dependsOn, this.Tags) with
+                identity =
+                    if this.Identity = ManagedIdentity.Empty then Unchecked.defaultof<_>
+                    else this.Identity.ToArmJson
+                properties =
+                    match this.Priority with
+                    | Low | Regular -> box properties
+                    | Spot (evictionPolicy, maxPrice) ->
+                        {| properties with
+                            evictionPolicy = evictionPolicy.ArmValue
+                            billingProfile = {| maxPrice = maxPrice |}
+                        |}
             |}