Fix Integration test issues for several tables. Fixes #258 (#259)

turbot · Aug 12, 2021 · f6096b3 · f6096b3
1 parent ab3b1d3
commit f6096b3
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 30 deletions.
diff --git a/azure-test/tests/azure_api_management/variables.tf b/azure-test/tests/azure_api_management/variables.tf
@@ -23,8 +23,9 @@ variable "azure_resource_group" {
   description = "Name of the resource group used throughout the test."
 }
 
-data "azurerm_resource_group" "data_resource_group" {
-  name = var.azure_resource_group
+resource "azurerm_resource_group" "named_test_resource" {
+  name     = var.resource_name
+  location = "West US"
 }
 
 provider "azurerm" {
@@ -44,8 +45,8 @@ data "null_data_source" "resource" {
 
 resource "azurerm_api_management" "named_test_resource" {
   name                = var.resource_name
-  location            = data.azurerm_resource_group.data_resource_group.location
-  resource_group_name = var.azure_resource_group
+  location            = azurerm_resource_group.named_test_resource.location
+  resource_group_name = azurerm_resource_group.named_test_resource.name
   publisher_name      = "TurbotHQ"
   publisher_email     = "[email protected]"
 
@@ -83,7 +84,7 @@ output "resource_id" {
 }
 
 output "location" {
-  value = data.azurerm_resource_group.data_resource_group.location
+  value = azurerm_resource_group.named_test_resource.location
 }
 
 output "subscription_id" {

diff --git a/azure-test/tests/azure_app_service_function_app/test-hydrate-expected.json b/azure-test/tests/azure_app_service_function_app/test-hydrate-expected.json
@@ -6,7 +6,7 @@
     "id": "{{ output.resource_id.value }}",
     "kind": "functionapp",
     "name": "{{resourceName}}",
-    "region": "East US",
+    "region": "east us",
     "resource_group": "{{resourceName}}"
   }
 ]
diff --git a/azure-test/tests/azure_app_service_plan/test-hydrate-expected.json b/azure-test/tests/azure_app_service_plan/test-hydrate-expected.json
@@ -7,7 +7,7 @@
     "kind": "Windows",
     "name": "{{resourceName}}",
     "per_site_scaling": false,
-    "region": "East US",
+    "region": "east us",
     "reserved": false,
     "resource_group": "{{resourceName}}",
     "type": "Microsoft.Web/serverfarms"

diff --git a/azure-test/tests/azure_app_service_web_app/test-get-expected.json b/azure-test/tests/azure_app_service_web_app/test-get-expected.json
@@ -6,13 +6,12 @@
     "id": "{{ output.resource_id.value }}",
     "identity": {
       "PrincipalID": "{{ output.principal_id.value }}",
-      "TenantID": "{{ output.tenant_id.value }}",
-      "Type": "SystemAssigned"
+      "TenantID": "{{ output.tenant_id.value }}"
     },
     "kind": "app",
-    "name": "{{resourceName}}",
+    "name": "{{ resourceName }}",
     "region": "east us",
     "reserved": false,
-    "resource_group": "{{resourceName}}"
+    "resource_group": "{{ resourceName }}"
   }
 ]
diff --git a/azure-test/tests/azure_app_service_web_app/test-hydrate-expected.json b/azure-test/tests/azure_app_service_web_app/test-hydrate-expected.json
@@ -5,8 +5,8 @@
     "https_only": false,
     "id": "{{ output.resource_id.value }}",
     "kind": "app",
-    "name": "{{resourceName}}",
+    "name": "{{ resourceName }}",
     "region": "east us",
-    "resource_group": "{{resourceName}}"
+    "resource_group": "{{ resourceName }}"
   }
 ]
diff --git a/azure-test/tests/azure_app_service_web_app/test-list-expected.json b/azure-test/tests/azure_app_service_web_app/test-list-expected.json
@@ -3,9 +3,8 @@
     "id": "{{ output.resource_id.value }}",
     "identity": {
       "PrincipalID": "{{ output.principal_id.value }}",
-      "TenantID": "{{ output.tenant_id.value }}",
-      "Type": "SystemAssigned"
+      "TenantID": "{{ output.tenant_id.value }}"
     },
-    "name": "{{resourceName}}"
+    "name": "{{ resourceName }}"
   }
 ]
diff --git a/azure-test/tests/azure_app_service_web_app/test-turbot-expected.json b/azure-test/tests/azure_app_service_web_app/test-turbot-expected.json
@@ -4,10 +4,10 @@
       "{{ output.resource_aka.value }}",
       "{{ output.resource_aka_lower.value }}"
     ],
-    "name": "{{resourceName}}",
+    "name": "{{ resourceName }}",
     "tags": {
-      "name": "{{resourceName}}"
+      "name": "{{ resourceName }}"
     },
-    "title": "{{resourceName}}"
+    "title": "{{ resourceName }}"
   }
 ]
diff --git a/azure-test/tests/azure_compute_disk_encryption_set/test-get-expected.json b/azure-test/tests/azure_compute_disk_encryption_set/test-get-expected.json
@@ -2,13 +2,13 @@
   {
     "active_key_source_vault_id": "{{ output.vault_id.value }}",
     "active_key_url": "{{ output.key_id.value }}",
-    "encryption_tpe": "EncryptionAtRestWithCustomerKey",
+    "encryption_type": "EncryptionAtRestWithCustomerKey",
     "id": "{{ output.resource_id.value }}",
     "identity_tenant_id": "cdffd708-7da0-4cea-abeb-0a4c334d7f64",
     "identity_type": "SystemAssigned",
-    "name": "{{resourceName}}",
+    "name": "{{ resourceName }}",
     "region": "eastus",
-    "resource_group": "{{resourceName}}",
+    "resource_group": "{{ resourceName }}",
     "subscription_id": "{{ output.subscription_id.value }}",
     "type": "Microsoft.Compute/diskEncryptionSets"
   }

diff --git a/azure-test/tests/azure_compute_disk_encryption_set/test-get-query.sql b/azure-test/tests/azure_compute_disk_encryption_set/test-get-query.sql
@@ -1,3 +1,3 @@
-select name, id, type, active_key_source_vault_id, active_key_url, encryption_tpe, identity_tenant_id, identity_type, region, resource_group, subscription_id
+select name, id, type, active_key_source_vault_id, active_key_url, encryption_type, identity_tenant_id, identity_type, region, resource_group, subscription_id
 from azure.azure_compute_disk_encryption_set
 where name = '{{resourceName}}' and resource_group = '{{resourceName}}'
diff --git a/azure-test/tests/azure_compute_disk_encryption_set/test-hydrate-expected.json b/azure-test/tests/azure_compute_disk_encryption_set/test-hydrate-expected.json
@@ -2,13 +2,13 @@
   {
     "active_key_source_vault_id": "{{ output.vault_id.value }}",
     "active_key_url": "{{ output.key_id.value }}",
-    "encryption_tpe": "EncryptionAtRestWithCustomerKey",
+    "encryption_type": "EncryptionAtRestWithCustomerKey",
     "id": "{{ output.resource_id.value }}",
     "identity_tenant_id": "cdffd708-7da0-4cea-abeb-0a4c334d7f64",
     "identity_type": "SystemAssigned",
-    "name": "{{resourceName}}",
+    "name": "{{ resourceName }}",
     "region": "eastus",
-    "resource_group": "{{resourceName}}",
+    "resource_group": "{{ resourceName }}",
     "subscription_id": "{{ output.subscription_id.value }}",
     "type": "Microsoft.Compute/diskEncryptionSets"
   }

diff --git a/azure-test/tests/azure_compute_disk_encryption_set/test-hydrate-query.sql b/azure-test/tests/azure_compute_disk_encryption_set/test-hydrate-query.sql
@@ -1,3 +1,3 @@
-select name, id, type, active_key_source_vault_id, active_key_url, encryption_tpe, identity_tenant_id, identity_type, region, resource_group, subscription_id
+select name, id, type, active_key_source_vault_id, active_key_url, encryption_type, identity_tenant_id, identity_type, region, resource_group, subscription_id
 from azure.azure_compute_disk_encryption_set
 where name = '{{resourceName}}' and resource_group = '{{resourceName}}'
diff --git a/azure-test/tests/azure_compute_disk_encryption_set/variables.tf b/azure-test/tests/azure_compute_disk_encryption_set/variables.tf
@@ -46,7 +46,7 @@ resource "azurerm_key_vault" "named_test_resource" {
   enabled_for_disk_encryption = true
   soft_delete_enabled         = true
   soft_delete_retention_days  = 7
-  purge_protection_enabled    = false
+  purge_protection_enabled    = true
   sku_name                    = "standard"
 }
 

diff --git a/azure-test/tests/azure_virtual_network/test-get-expected.json b/azure-test/tests/azure_virtual_network/test-get-expected.json
@@ -4,7 +4,7 @@
       "10.1.2.0/24"
     ],
     "enable_ddos_protection": false,
-    "enable_vm_protection": false,
+    "enable_vm_protection": null,
     "id": "{{ output.resource_id.value }}",
     "name": "{{resourceName}}",
     "region": "eastus",

diff --git a/azure/table_azure_data_factory_dataset.go b/azure/table_azure_data_factory_dataset.go
@@ -155,7 +155,7 @@ func getDataFactoryDataset(ctx context.Context, d *plugin.QueryData, _ *plugin.H
 		return nil, nil
 	}
 
-	op, err := datasetClient.Get(ctx, resourceGroup, factoryName, datasetName, "*")
+	op, err := datasetClient.Get(ctx, resourceGroup, factoryName, datasetName, "")
 	if err != nil {
 		return nil, err
 	}