Deployed storage accounts should be zrs, not lrs (#1754)

* Deployed storage accounts should be zrs, not lrs

* Fix code that didnt make sense anymore

* Fixed structure logging

---------

Co-authored-by: Ceredron <roar.mjelde@digdir.no>

Author: Ceredron

src/Altinn.Correspondence.Application/Helpers/AttachmentHelper.cs

@@ -111,25 +111,16 @@ private bool ShouldBypassMalwareScan(AttachmentEntity attachment)
 
         public async Task<StorageProviderEntity> GetStorageProvider(AttachmentEntity attachment, bool bypassMalwareScan, CancellationToken cancellationToken)
         {
-            ServiceOwnerEntity? serviceOwnerEntity = null;
-            if (bypassMalwareScan)
+            var serviceOwnerOrgCode = await resourceRegistryService.GetServiceOwnerOrgCode(attachment.ResourceId, cancellationToken);
+            if (serviceOwnerOrgCode is null)
             {
-                var serviceOwnerShortHand = attachment.ResourceId.Split('-')[0];
-                serviceOwnerEntity = await serviceOwnerRepository.GetServiceOwnerByOrgCode(serviceOwnerShortHand.ToLower(), cancellationToken);
+                logger.LogError("Could not find service owner for resource {resourceId}", attachment.ResourceId);
+                return null;
             }
-            else
-            {
-                var serviceOwnerOrgCode = await resourceRegistryService.GetServiceOwnerOrgCode(attachment.ResourceId, cancellationToken);
-                if (serviceOwnerOrgCode is null)
-                {
-                    logger.LogError("Could not find service owner for resource {resourceId}", attachment.ResourceId);
-                    return null;
-                }
-                serviceOwnerEntity = await serviceOwnerRepository.GetServiceOwnerByOrgCode(serviceOwnerOrgCode, cancellationToken);
-            }
-            if (serviceOwnerEntity == null)
+            var serviceOwnerEntity = await serviceOwnerRepository.GetServiceOwnerByOrgCode(serviceOwnerOrgCode, cancellationToken);
+            if (serviceOwnerEntity is null)
             {
-                logger.LogError($"Could not find service owner entity for {attachment.ResourceId} in database");
+                logger.LogError("Could not find service owner entity for {resourceId} in database", attachment.ResourceId);
                 //return AttachmentErrors.ServiceOwnerNotFound; // Future PR will add service owner registry as requirement when we have ensured that existing service owners have been provisioned
             }
             return serviceOwnerEntity?.GetStorageProvider(bypassMalwareScan: bypassMalwareScan);

src/Altinn.Correspondence.Integrations/Azure/AzureResourceManagerService.cs

@@ -103,7 +103,7 @@ public async Task DeployStorageAccount(ServiceOwnerEntity serviceOwnerEntity, bo
         var resourceGroup = await resourceGroupCollection.CreateOrUpdateAsync(WaitUntil.Completed, resourceGroupName, resourceGroupData, cancellationToken);
 
         // Create or get the storage account
-        var storageAccountData = new StorageAccountCreateOrUpdateContent(new StorageSku(StorageSkuName.StandardLrs), StorageKind.StorageV2, new AzureLocation(_resourceManagerOptions.Location));
+        var storageAccountData = new StorageAccountCreateOrUpdateContent(new StorageSku(StorageSkuName.StandardZrs), StorageKind.StorageV2, new AzureLocation(_resourceManagerOptions.Location));
         storageAccountData.MinimumTlsVersion = "TLS1_2";
         storageAccountData.AllowSharedKeyAccess = false;
         foreach (var tag in GetServiceOwnerResourceGroupTags(serviceOwnerEntity))