Format file

Author: moritzkoerber

.azuredevops/deploy-azure-function.yaml

@@ -19,7 +19,7 @@ variables:
     functionAppPath: "v1"
 
   ${{ if eq(parameters.azureFunctionProgrammingModel, 'v2') }}:
-    functionAppName: "af-dev9d"
+    functionAppName: "af-v2-dev9d"
     functionAppPath: "v2"
 
 jobs:

ops/stack.tf

@@ -8,6 +8,7 @@ resource "azurerm_resource_group" "af-rg" {
   name     = "af-rg-${var.env}"
   location = var.region
 }
+
 resource "azurerm_storage_account" "main-sa" {
   name                              = "mainsa${var.env}${random_id.unique-id.hex}"
   resource_group_name               = azurerm_resource_group.af-rg.name
@@ -73,10 +74,10 @@ resource "azurerm_application_insights" "af-appi" {
 }
 
 ############################################
-# AF V2
+# AF V1
 ############################################
-resource "azurerm_storage_account" "af-sa" {
-  name                              = "afsa${var.env}${random_id.unique-id.hex}"
+resource "azurerm_storage_account" "af-sa-v1" {
+  name                              = "afsav1${var.env}${random_id.unique-id.hex}"
   resource_group_name               = azurerm_resource_group.af-rg.name
   location                          = azurerm_resource_group.af-rg.location
   account_tier                      = "Standard"
@@ -99,13 +100,13 @@ resource "azurerm_storage_account" "af-sa" {
   }
 }
 
-resource "azurerm_linux_function_app" "af" {
-  name                = "af-${var.env}${random_id.unique-id.hex}"
+resource "azurerm_linux_function_app" "af-v1" {
+  name                = "af-v1-${var.env}${random_id.unique-id.hex}"
   resource_group_name = azurerm_resource_group.af-rg.name
   location            = azurerm_resource_group.af-rg.location
 
-  storage_account_name          = azurerm_storage_account.af-sa.name
-  storage_account_access_key    = azurerm_storage_account.af-sa.primary_access_key
+  storage_account_name          = azurerm_storage_account.af-sa-v1.name
+  storage_account_access_key    = azurerm_storage_account.af-sa-v1.primary_access_key
   service_plan_id               = azurerm_service_plan.af-splan.id
   functions_extension_version   = var.function_version
   public_network_access_enabled = false
@@ -124,17 +125,17 @@ resource "azurerm_linux_function_app" "af" {
 }
 
 
-resource "azurerm_role_assignment" "function_storage_access" {
-  scope                = azurerm_storage_account.af-sa.id
+resource "azurerm_role_assignment" "function_storage_access-v1" {
+  scope                = azurerm_storage_account.af-sa-v1.id
   role_definition_name = "Storage Blob Data Contributor"
-  principal_id         = azurerm_linux_function_app.af.identity[0].principal_id
+  principal_id         = azurerm_linux_function_app.af-v1.identity[0].principal_id
 }
 
 ############################################
-# AF V1
+# AF V2
 ############################################
-resource "azurerm_storage_account" "af-sa-v1" {
-  name                              = "afsav1${var.env}${random_id.unique-id.hex}"
+resource "azurerm_storage_account" "af-sa-v2" {
+  name                              = "afsav2${var.env}${random_id.unique-id.hex}"
   resource_group_name               = azurerm_resource_group.af-rg.name
   location                          = azurerm_resource_group.af-rg.location
   account_tier                      = "Standard"
@@ -157,13 +158,13 @@ resource "azurerm_storage_account" "af-sa-v1" {
   }
 }
 
-resource "azurerm_linux_function_app" "af-v1" {
-  name                = "af-v1-${var.env}${random_id.unique-id.hex}"
+resource "azurerm_linux_function_app" "af-v2" {
+  name                = "af-v2-${var.env}${random_id.unique-id.hex}"
   resource_group_name = azurerm_resource_group.af-rg.name
   location            = azurerm_resource_group.af-rg.location
 
-  storage_account_name          = azurerm_storage_account.af-sa-v1.name
-  storage_account_access_key    = azurerm_storage_account.af-sa-v1.primary_access_key
+  storage_account_name          = azurerm_storage_account.af-sa-v2.name
+  storage_account_access_key    = azurerm_storage_account.af-sa-v2.primary_access_key
   service_plan_id               = azurerm_service_plan.af-splan.id
   functions_extension_version   = var.function_version
   public_network_access_enabled = false
@@ -181,9 +182,8 @@ resource "azurerm_linux_function_app" "af-v1" {
   }
 }
 
-
-resource "azurerm_role_assignment" "function_storage_access-v1" {
-  scope                = azurerm_storage_account.af-sa-v1.id
+resource "azurerm_role_assignment" "function_storage_access" {
+  scope                = azurerm_storage_account.af-sa-v2.id
   role_definition_name = "Storage Blob Data Contributor"
-  principal_id         = azurerm_linux_function_app.af.identity[0].principal_id
+  principal_id         = azurerm_linux_function_app.af-v2.identity[0].principal_id
 }