Merge pull request #79 from Metaswitch/issue/78/flexconsumption

Switch to FlexConsumption plan for Function App

Author: maxdymond

.flake8

@@ -1,3 +1,4 @@
+# Copyright (c) Alianza, Inc. All rights reserved.
 name: Lint
 
 on: [push]

.github/workflows/ci.yml

@@ -17,12 +17,18 @@ Status: Available for use
 
 ### Fixed
 
+## [1.0.0] - 2025-10-02
+
+### Breaking Changes
+- Switch to using FlexConsumption as Consumption apps are being deprecated.
+
 ## [0.1.0] - 2024-05-16
 
 ### Added
 - Initial release
 
 ### Changed
 
-[unreleased]: https://github.com/microsoft/apt-package-function/compare/0.1.0...HEAD
-[0.1.0]: https://github.com/microsoft/apt-package-function/tree/0.1.0
+[unreleased]: https://github.com/Metaswitch/apt-package-function/compare/1.0.0...HEAD
+[1.0.0]: https://github.com/Metaswitch/apt-package-function/compare/0.1.0...1.0.0
+[0.1.0]: https://github.com/Metaswitch/apt-package-function/tree/0.1.0

CHANGELOG.md

@@ -2,7 +2,7 @@
 
 Functionality to create a Debian package repository in Azure Blob Storage with
 an Azure Function App to keep it up to date. For use with
-[apt-transport-blob](https://github.com/microsoft/apt-transport-blob).
+[apt-transport-blob](https://github.com/Metaswitch/apt-transport-blob).
 
 # Getting Started
 

README.md

@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Alianza, Inc. All rights reserved.
 # Licensed under the MIT License.
 """A function app to manage a Debian repository in Azure Blob Storage."""
 
@@ -9,7 +9,7 @@
 import os
 import tempfile
 from pathlib import Path
-from typing import Generator
+from typing import Generator, Optional
 
 import azure.functions as func
 import pydpkg
@@ -32,12 +32,14 @@
 @contextlib.contextmanager
 def temporary_filename() -> Generator[str, None, None]:
     """Create a temporary file and return the filename."""
+    temporary_name: Optional[str] = None
     try:
         with tempfile.NamedTemporaryFile(delete=False) as f:
             temporary_name = f.name
         yield temporary_name
     finally:
-        os.unlink(temporary_name)
+        if temporary_name:
+            os.unlink(temporary_name)
 
 
 class PackageBlob:

function_app.py

@@ -1,8 +1,10 @@
+# Copyright (c) Alianza, Inc. All rights reserved.
+# Highly Confidential Material
 [project]
 name = "apt-package-function"
 description = "Functionality to create a Debian package repository in Azure Blob Storage"
 license = "MIT"
-version = "0.1.0"
+version = "1.0.0"
 readme = "README.md"
 authors = [{name = "Max Dymond", email = "[email protected]"}]
 requires-python = '>=3.9.2,<4.0.0'

pyproject.toml

@@ -63,7 +63,7 @@ resource packageContainer 'Microsoft.Storage/storageAccounts/blobServices/contai
   properties: {
   }
 }
-resource pythonContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2025-01-01' = if (!use_shared_keys) {
+resource pythonContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2025-01-01' = {
   parent: defBlobServices
   name: python_container_name
   properties: {
@@ -122,14 +122,14 @@ az storage blob upload --auth-mode login -f Packages -c "${AZURE_BLOB_CONTAINER}
   }
 }
 
-// Create the function app directly, if shared key support is enabled
-module funcapp 'rg_funcapp.bicep' = if (use_shared_keys) {
+// Create the function app directly
+module funcapp 'rg_funcapp.bicep' = {
   name: 'funcapp${suffix}'
   params: {
     location: location
     storage_account_name: storageAccount.name
     appName: appName
-    use_shared_keys: true
+    use_shared_keys: use_shared_keys
     suffix: suffix
   }
 }
@@ -139,4 +139,4 @@ output apt_sources string = 'deb [trusted=yes] blob://${storageAccount.name}.blo
 output function_app_name string = appName
 output storage_account string = storageAccount.name
 output package_container string = packageContainer.name
-output python_container string = use_shared_keys ? '' : pythonContainer.name
+output python_container string = pythonContainer.name

rg.bicep

@@ -27,6 +27,8 @@ var package_container_name = 'packages'
 // Create a container for the Python code
 var python_container_name = 'python'
 
+var storage_connection_string = 'DefaultEndpointsProtocol=https;AccountName=${storageAccount.name};EndpointSuffix=${environment().suffixes.storage};AccountKey=${storageAccount.listKeys().keys[0].value}'
+
 // The version of Python to run with
 var python_version = '3.11'
 
@@ -50,7 +52,7 @@ resource packageContainer 'Microsoft.Storage/storageAccounts/blobServices/contai
   parent: defBlobServices
   name: package_container_name
 }
-resource pythonContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2025-01-01' existing = if (!use_shared_keys) {
+resource pythonContainer 'Microsoft.Storage/storageAccounts/blobServices/containers@2025-01-01' existing = {
   parent: defBlobServices
   name: python_container_name
 }
@@ -65,12 +67,14 @@ resource storageBlobDataContributorRoleAssignment 'Microsoft.Authorization/roleA
 }
 
 // Create a hosting plan for the function app
+// Using Flex Consumption plan for serverless hosting with enhanced features
+// Reference: https://learn.microsoft.com/en-us/azure/azure-functions/flex-consumption-plan
 resource hostingPlan 'Microsoft.Web/serverfarms@2024-11-01' = {
   name: hostingPlanName
   location: location
   sku: {
-    name: 'Y1'
-    tier: 'Dynamic'
+    name: 'FC1'
+    tier: 'FlexConsumption'
   }
   properties: {
     reserved: true
@@ -90,18 +94,10 @@ resource applicationInsights 'Microsoft.Insights/components@2020-02-02' = {
 
 // Construct the app settings
 var common_settings = [
-  {
-    name: 'FUNCTIONS_EXTENSION_VERSION'
-    value: '~4'
-  }
   {
     name: 'APPINSIGHTS_INSTRUMENTATIONKEY'
     value: applicationInsights.properties.InstrumentationKey
   }
-  {
-    name: 'FUNCTIONS_WORKER_RUNTIME'
-    value: 'python'
-  }
   // Pass the blob container name to the function app - this is the
   // container which is monitored for new packages.
   {
@@ -114,32 +110,56 @@ var common_settings = [
 var app_settings = use_shared_keys ? concat(common_settings, [
   {
     name: 'AzureWebJobsStorage'
-    value: 'DefaultEndpointsProtocol=https;AccountName=${storageAccount.name};EndpointSuffix=${environment().suffixes.storage};AccountKey=${storageAccount.listKeys().keys[0].value}'
+    value: storage_connection_string
   }
   {
-    name: 'WEBSITE_CONTENTAZUREFILECONNECTIONSTRING'
-    value: 'DefaultEndpointsProtocol=https;AccountName=${storageAccount.name};EndpointSuffix=${environment().suffixes.storage};AccountKey=${storageAccount.listKeys().keys[0].value}'
-  }
-  {
-    name: 'WEBSITE_CONTENTSHARE'
-    value: toLower(functionAppName)
+    name: 'DEPLOYMENT_STORAGE_CONNECTION_STRING'
+    value: storage_connection_string
   }
 ]) : concat(common_settings, [
   {
     name: 'AzureWebJobsStorage__accountName'
     value: storageAccount.name
   }
-  {
-    name: 'WEBSITE_RUN_FROM_PACKAGE'
-    value: 'https://${storageAccount.name}.blob.${environment().suffixes.storage}/${pythonContainer.name}/function_app.zip'
-  }
-  // Pass the container URL to the function app for the `from_container_url` call.
   {
     name: 'BLOB_CONTAINER_URL'
       value: 'https://${storageAccount.name}.blob.${environment().suffixes.storage}/${packageContainer.name}/'
   }
 ])
 
+var function_runtime = {
+  name: 'python'
+  version: python_version
+}
+
+var deployment_storage_value = 'https://${storageAccount.name}.blob.${environment().suffixes.storage}/${pythonContainer.name}'
+
+var deployment_authentication = use_shared_keys ? {
+  type: 'StorageAccountConnectionString'
+  storageAccountConnectionStringName: 'DEPLOYMENT_STORAGE_CONNECTION_STRING'
+} : {
+  type: 'SystemAssignedIdentity'
+}
+
+var flex_deployment_configuration = {
+  storage: {
+    type: 'blobContainer'
+    value: deployment_storage_value
+    authentication: deployment_authentication
+  }
+}
+
+var flex_scale_and_concurrency = {
+  maximumInstanceCount: 100
+  instanceMemoryMB: 2048
+}
+
+var function_app_config = {
+  runtime: function_runtime
+  scaleAndConcurrency: flex_scale_and_concurrency
+  deployment: flex_deployment_configuration
+}
+
 // Create the function app.
 resource functionApp 'Microsoft.Web/sites@2024-11-01' = {
   name: functionAppName
@@ -152,13 +172,12 @@ resource functionApp 'Microsoft.Web/sites@2024-11-01' = {
   properties: {
     serverFarmId: hostingPlan.id
     siteConfig: {
-      linuxFxVersion: 'Python|${python_version}'
-      pythonVersion: python_version
       appSettings: app_settings
       ftpsState: 'FtpsOnly'
       minTlsVersion: '1.2'
     }
     httpsOnly: true
+    functionAppConfig: function_app_config
   }
 }
 

rg_funcapp.bicep

@@ -1,3 +1,4 @@
+# Copyright (c) Alianza, Inc. All rights reserved.
 exclude = [
     ".venv",
     "__pycache__",
@@ -56,4 +57,4 @@ indent-style = "space"
 skip-magic-trailing-comma = false
 
 # Like Black, automatically detect the appropriate line ending.
-line-ending = "auto"
+line-ending = "auto"

ruff.toml

@@ -1,4 +1,4 @@
-# Copyright (c) Microsoft Corporation.
+# Copyright (c) Alianza, Inc. All rights reserved.
 # Licensed under the MIT License.
 """Tooling for creating apt repositories in Azure."""