Merge pull request #15899 from ms-henglu/branch-220321-fix-synapse-aa…

…d-admin-testcases fix failed testcases in Synapse
hashicorp · Mar 22, 2022 · 8b2016a · 8b2016a
2 parents a697da7 + 1928693
commit 8b2016a
Show file tree

Hide file tree

Showing 21 changed files with 66 additions and 296 deletions.
diff --git a/internal/services/synapse/synapse_firewall_rule_resource_test.go b/internal/services/synapse/synapse_firewall_rule_resource_test.go
@@ -158,6 +158,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomInteger, data.RandomInteger)
 }
diff --git a/internal/services/synapse/synapse_integration_runtime_azure_resource_test.go b/internal/services/synapse/synapse_integration_runtime_azure_resource_test.go
@@ -180,6 +180,9 @@ resource "azurerm_synapse_workspace" "test" {
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
   managed_virtual_network_enabled      = true
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_firewall_rule" "test" {

diff --git a/internal/services/synapse/synapse_integration_runtime_self_hosted_resource_test.go b/internal/services/synapse/synapse_integration_runtime_self_hosted_resource_test.go
@@ -95,6 +95,9 @@ resource "azurerm_synapse_workspace" "test" {
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
   managed_virtual_network_enabled      = true
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_firewall_rule" "test" {

diff --git a/internal/services/synapse/synapse_linked_service_resource_test.go b/internal/services/synapse/synapse_linked_service_resource_test.go
@@ -298,6 +298,9 @@ resource "azurerm_synapse_workspace" "test" {
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
   managed_virtual_network_enabled      = true
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_firewall_rule" "test" {

diff --git a/internal/services/synapse/synapse_managed_private_endpoint_resource_test.go b/internal/services/synapse/synapse_managed_private_endpoint_resource_test.go
@@ -139,6 +139,9 @@ resource "azurerm_synapse_workspace" "test" {
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
   managed_virtual_network_enabled      = true
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_firewall_rule" "test" {

diff --git a/internal/services/synapse/synapse_role_assignment_resource_test.go b/internal/services/synapse/synapse_role_assignment_resource_test.go
@@ -206,6 +206,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_firewall_rule" "test" {

diff --git a/internal/services/synapse/synapse_spark_pool_resource_test.go b/internal/services/synapse/synapse_spark_pool_resource_test.go
@@ -295,6 +295,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 `, data.RandomInteger, location, data.RandomString, data.RandomInteger, data.RandomInteger)
 }
diff --git a/internal/services/synapse/synapse_sql_pool_extended_auditing_policy_resource_test.go b/internal/services/synapse/synapse_sql_pool_extended_auditing_policy_resource_test.go
@@ -211,6 +211,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_sql_pool" "test" {
@@ -310,8 +313,7 @@ resource "azurerm_subnet" "test" {
 }
 
 resource "azurerm_storage_account_network_rules" "test" {
-  resource_group_name        = azurerm_resource_group.test.name
-  storage_account_name       = azurerm_storage_account.test.name
+  storage_account_id         = azurerm_storage_account.test.id
   default_action             = "Deny"
   ip_rules                   = ["127.0.0.1"]
   virtual_network_subnet_ids = [azurerm_subnet.test.id]

diff --git a/internal/services/synapse/synapse_sql_pool_resource_test.go b/internal/services/synapse/synapse_sql_pool_resource_test.go
@@ -223,6 +223,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomInteger, data.RandomInteger)
 }
diff --git a/internal/services/synapse/synapse_sql_pool_security_alert_policy_resource_test.go b/internal/services/synapse/synapse_sql_pool_security_alert_policy_resource_test.go
@@ -133,6 +133,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_sql_pool" "test" {

diff --git a/...rnal/services/synapse/synapse_sql_pool_vulnerability_assessment_baseline_resource_test.go b/...rnal/services/synapse/synapse_sql_pool_vulnerability_assessment_baseline_resource_test.go
@@ -181,6 +181,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_sql_pool" "test" {

diff --git a/internal/services/synapse/synapse_sql_pool_vulnerability_assessment_resource_test.go b/internal/services/synapse/synapse_sql_pool_vulnerability_assessment_resource_test.go
@@ -134,6 +134,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_sql_pool" "test" {

diff --git a/internal/services/synapse/synapse_sql_pool_workload_classifier_resource_test.go b/internal/services/synapse/synapse_sql_pool_workload_classifier_resource_test.go
@@ -184,6 +184,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_sql_pool" "test" {

diff --git a/internal/services/synapse/synapse_sql_pool_workload_group_resource_test.go b/internal/services/synapse/synapse_sql_pool_workload_group_resource_test.go
@@ -186,6 +186,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_synapse_sql_pool" "test" {

diff --git a/internal/services/synapse/synapse_workspace_aad_admin_resource_test.go b/internal/services/synapse/synapse_workspace_aad_admin_resource_test.go
@@ -99,6 +99,10 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+
+  identity {
+    type = "SystemAssigned"
+  }
 }
 `, data.RandomInteger, data.Locations.Primary, data.RandomString, data.RandomInteger, data.RandomInteger)
 }
diff --git a/internal/services/synapse/synapse_workspace_extended_auditing_policy_resource_test.go b/internal/services/synapse/synapse_workspace_extended_auditing_policy_resource_test.go
@@ -211,6 +211,9 @@ resource "azurerm_synapse_workspace" "test" {
   storage_data_lake_gen2_filesystem_id = azurerm_storage_data_lake_gen2_filesystem.test.id
   sql_administrator_login              = "sqladminuser"
   sql_administrator_login_password     = "H@Sh1CoR3!"
+  identity {
+    type = "SystemAssigned"
+  }
 }
 
 resource "azurerm_storage_account" "test" {
@@ -303,8 +306,7 @@ resource "azurerm_subnet" "test" {
 }
 
 resource "azurerm_storage_account_network_rules" "test" {
-  resource_group_name        = azurerm_resource_group.test.name
-  storage_account_name       = azurerm_storage_account.test.name
+  storage_account_id         = azurerm_storage_account.test.id
   default_action             = "Deny"
   ip_rules                   = ["127.0.0.1"]
   virtual_network_subnet_ids = [azurerm_subnet.test.id]

diff --git a/internal/services/synapse/synapse_workspace_key_resource_test.go b/internal/services/synapse/synapse_workspace_key_resource_test.go
@@ -100,7 +100,9 @@ resource "azurerm_synapse_workspace" "test" {
     key_name           = "test_key"
 
   }
-
+  identity {
+    type = "SystemAssigned"
+  }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -100,7 +100,9 @@ resource "azurerm_synapse_workspace" "test" { @@
         key_name           = "test_key"
       }
+      identity {
+        type = "SystemAssigned"
+      }
     }
@@ Expand Down @@