Merge pull request #1085 from equinor/logicapps-folders

Change folder structure when creating files on StorageAccounts in LA
equinor · Nov 10, 2023 · 90eb94d · 90eb94d
2 parents de38a35 + ef9bb9f
commit 90eb94d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/terraform/infrastructure/s940/prod/logicapps/main.tf b/terraform/infrastructure/s940/prod/logicapps/main.tf
@@ -181,7 +181,7 @@ resource "azurerm_logic_app_action_custom" "create_blob" {
         method = "post",
         path   = "/v2/datasets/@{encodeURIComponent(encodeURIComponent('${each.value["storageaccount"]}'))}/files",
         queries = {
-          folderPath                   = "/archive-log-analytics-${each.value["folder"]}/@{formatDateTime(utcNow(), 'yyyy-MM-dd')}",
+          folderPath                   = "/archive-log-analytics-${each.value["folder"]}/@{formatDateTime(utcNow(), 'yyyy')}/@{formatDateTime(utcNow(), 'MM')}/@{formatDateTime(utcNow(), 'dd')}",
           name                         = "@{subtractFromTime(formatDateTime(utcNow(),'yyyy-MM-ddTHH:00:00'), 1,'Hour')}",
           queryParametersSingleEncoded = true
         }

diff --git a/terraform/infrastructure/s941/dev/logicapps/main.tf b/terraform/infrastructure/s941/dev/logicapps/main.tf
@@ -22,6 +22,7 @@ data "azurerm_user_assigned_identity" "managed_identity" {
   resource_group_name = each.value["rg_name"]
 }
 
+
 resource "azurerm_logic_app_workflow" "logic_app_workflow" {
   for_each            = var.logic_app_workflow
   name                = each.value["name"]
@@ -73,6 +74,7 @@ resource "azurerm_logic_app_workflow" "logic_app_workflow" {
   }
 }
 
+
 resource "azurerm_logic_app_trigger_recurrence" "recurrence" {
   for_each     = var.logic_app_workflow
   name         = "Recurrence"
@@ -181,7 +183,7 @@ resource "azurerm_logic_app_action_custom" "create_blob" {
         method = "post",
         path   = "/v2/datasets/@{encodeURIComponent(encodeURIComponent('${each.value["storageaccount"]}'))}/files",
         queries = {
-          folderPath                   = "/archive-log-analytics-${each.value["folder"]}/@{formatDateTime(utcNow(), 'yyyy-MM-dd')}",
+          folderPath                   = "/archive-log-analytics-${each.value["folder"]}/@{formatDateTime(utcNow(), 'yyyy')}/@{formatDateTime(utcNow(), 'MM')}/@{formatDateTime(utcNow(), 'dd')}",
           name                         = "@{subtractFromTime(formatDateTime(utcNow(),'yyyy-MM-ddTHH:00:00'), 1,'Hour')}",
           queryParametersSingleEncoded = true
         }
@@ -200,4 +202,3 @@ resource "azurerm_logic_app_action_custom" "create_blob" {
     }
   )
 }
-
diff --git a/terraform/radix-zone/radix_zone_dev.tfvars b/terraform/radix-zone/radix_zone_dev.tfvars
@@ -239,7 +239,6 @@ sql_server = {
     name                = "sql-radix-cost-allocation-dev"
     rg_name             = "cost-allocation"
     db_admin            = "radix-cost-allocation-db-admin"
-    minimum_tls_version = "Disabled"
     vault               = "radix-vault-dev"
     tags                = {
       "displayName" = "SqlServer"
@@ -249,7 +248,6 @@ sql_server = {
     name                = "sql-radix-cost-allocation-playground"
     rg_name             = "cost-allocation"
     db_admin            = "radix-cost-allocation-db-admin-playground"
-    minimum_tls_version = "Disabled"
     vault               = "radix-vault-dev"
     tags                = {
       "displayName" = "SqlServer"