Fix tests (#18)

Fix tests
Azure · Nov 24, 2022 · f83bcf5 · f83bcf5
1 parent 8e838a6
commit f83bcf5
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 8 deletions.
diff --git a/.github/workflows/hdinsight-interactive.yml b/.github/workflows/hdinsight-interactive.yml
@@ -72,6 +72,6 @@ jobs:
         GOPATH: "/home/runner/work/azure-labs-modules/azure-labs-modules/${{ env.terraform_workingdir }}"
 
     - name: Unit-test
-      run: go test -v -timeout 90m
+      run: go test -v -timeout 120m
       env:
         GOPATH: "/home/runner/work/azure-labs-modules/azure-labs-modules/${{ env.terraform_workingdir }}"
diff --git a/terraform/event-hubs/event-hubs-namespace/variables.tf b/terraform/event-hubs/event-hubs-namespace/variables.tf
@@ -22,6 +22,7 @@ variable "tags" {
 variable "module_enabled" {
   type        = bool
   description = "Variable to enable or disable the module"
+  default     = true
 }
 
 variable "is_sec_module" {

diff --git a/terraform/hdinsight/hdinsight-interactive/test/providers.tf b/terraform/hdinsight/hdinsight-interactive/test/providers.tf
@@ -16,5 +16,9 @@ terraform {
 }
 
 provider "azurerm" {
-  features {}
+  features {
+    resource_group {
+      prevent_deletion_if_contains_resources = false
+    }
+  }
 }
diff --git a/terraform/machine-learning/machine-learning-compute-instance/test/providers.tf b/terraform/machine-learning/machine-learning-compute-instance/test/providers.tf
@@ -15,5 +15,9 @@ terraform {
 
 }
 provider "azurerm" {
-  features {}
+  features {
+    resource_group {
+      prevent_deletion_if_contains_resources = false
+    }
+  }
 }
diff --git a/...rm/machine-learning/machine-learning-synapse-spark/test/machine_learning_synapse_spark.tf b/...rm/machine-learning/machine-learning-synapse-spark/test/machine_learning_synapse_spark.tf
@@ -39,7 +39,7 @@ module "local_mlw" {
 module "local_storage_account" {
   source = "../../../storage-account"
 
-  basename = random_string.postfix.result
+  basename = "${random_string.postfix.result}aml"
   rg_name  = module.local_rg.name
   location = var.location
 
@@ -117,7 +117,7 @@ module "local_synapse_spark_pool" {
 module "local_storage_account_syn" {
   source = "../../../storage-account"
 
-  basename = random_string.postfix.result
+  basename = "${random_string.postfix.result}syn"
   rg_name  = module.local_rg.name
   location = var.location
 

diff --git a/terraform/storage-account/main.tf b/terraform/storage-account/main.tf
@@ -99,7 +99,7 @@ resource "azurerm_private_endpoint" "st_pe_blob" {
     private_dns_zone_ids = var.private_dns_zone_ids_blob
   }
 
-  count = var.is_sec_module && var.module_enabled && var.private_dns_zone_ids_blob != [] ? 1 : 0
+  count = var.is_sec_module && var.module_enabled && length(var.private_dns_zone_ids_blob) != 0 ? 1 : 0
 
   tags = var.tags
 }
@@ -122,7 +122,7 @@ resource "azurerm_private_endpoint" "st_pe_file" {
     private_dns_zone_ids = var.private_dns_zone_ids_file
   }
 
-  count = var.is_sec_module && var.module_enabled && var.private_dns_zone_ids_file != [] ? 1 : 0
+  count = var.is_sec_module && var.module_enabled && length(var.private_dns_zone_ids_file) != 0 ? 1 : 0
 
   tags = var.tags
 }
@@ -145,7 +145,7 @@ resource "azurerm_private_endpoint" "st_pe_dfs" {
     private_dns_zone_ids = var.private_dns_zone_ids_dfs
   }
 
-  count = var.is_sec_module && var.module_enabled && var.private_dns_zone_ids_dfs != [] ? 1 : 0
+  count = var.is_sec_module && var.module_enabled && length(var.private_dns_zone_ids_dfs) != 0 ? 1 : 0
 
   tags = var.tags
 }
diff --git a/terraform/synapse/synapse-workspace/test/variables.tf b/terraform/synapse/synapse-workspace/test/variables.tf
@@ -17,4 +17,18 @@ variable "synadmin_username" {
 variable "synadmin_password" {
   type    = string
   default = "ThisIsNotVerySecure!"
+}
+
+variable "aad_login" {
+  description = "AAD login"
+  type = object({
+    name      = string
+    object_id = string
+    tenant_id = string
+  })
+  default = {
+    name      = "AzureAD Admin"
+    object_id = "00000000-0000-0000-0000-000000000000"
+    tenant_id = "00000000-0000-0000-0000-000000000000"
+  }
 }