allow malware scanning only for import

microsoft · Nov 9, 2023 · a15a46b · a15a46b
1 parent a0f364b
commit a15a46b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/airlock_processor/BlobCreatedTrigger/__init__.py b/airlock_processor/BlobCreatedTrigger/__init__.py
@@ -32,7 +32,7 @@ def main(msg: func.ServiceBusMessage,
             logging.error("environment variable 'ENABLE_MALWARE_SCANNING' does not exists. Cannot continue.")
             raise
 
-        if enable_malware_scanning:
+        if enable_malware_scanning and constants.STORAGE_ACCOUNT_NAME_IMPORT_INPROGRESS in topic:
             # If malware scanning is enabled, the fact that the blob was created can be dismissed.
             # It will be consumed by the malware scanning service
             logging.info('Malware scanning is enabled. no action to perform.')

diff --git a/airlock_processor/_version.py b/airlock_processor/_version.py
@@ -1 +1 @@
-__version__ = "0.6.2"
+__version__ = "0.6.3"
diff --git a/core/terraform/.terraform.lock.hcl b/core/terraform/.terraform.lock.hcl
diff --git a/core/terraform/airlock/eventgrid_topics.tf b/core/terraform/airlock/eventgrid_topics.tf
@@ -162,11 +162,12 @@ resource "azurerm_private_endpoint" "eg_data_deletion" {
 }
 
 resource "azurerm_eventgrid_topic" "scan_result" {
-  count                         = var.enable_malware_scanning ? 1 : 0
-  name                          = local.scan_result_topic_name
-  location                      = var.location
-  resource_group_name           = var.resource_group_name
-  public_network_access_enabled = var.enable_local_debugging
+  count               = var.enable_malware_scanning ? 1 : 0
+  name                = local.scan_result_topic_name
+  location            = var.location
+  resource_group_name = var.resource_group_name
+  # This is mandatory for the scan result to be published since private networks are not supported yet
+  public_network_access_enabled = true
 
   identity {
     type = "SystemAssigned"

diff --git a/core/version.txt b/core/version.txt
@@ -1 +1 @@
-__version__ = "0.8.9"
+__version__ = "0.8.10"