From 628d44078ce2568813ecfc83ecc3349b7b559271 Mon Sep 17 00:00:00 2001 From: Cody Bruno Date: Fri, 25 Oct 2024 12:20:30 -0400 Subject: [PATCH] Remove tests for removed azure_ad_* tables --- .../tests/azure_ad_group/dependencies.txt | 0 .../azure_ad_group/test-get-expected.json | 9 ---- .../tests/azure_ad_group/test-get-query.sql | 3 -- .../azure_ad_group/test-hydrate-expected.json | 10 ---- .../azure_ad_group/test-hydrate-query.sql | 3 -- .../azure_ad_group/test-list-expected.json | 6 --- .../tests/azure_ad_group/test-list-query.sql | 3 -- .../tests/azure_ad_group/variables.json | 1 - azure-test/tests/azure_ad_group/variables.tf | 44 --------------- .../dependencies.txt | 0 .../test-get-expected.json | 9 ---- .../test-get-query.sql | 3 -- .../test-hydrate-expected.json | 6 --- .../test-hydrate-query.sql | 3 -- .../test-list-expected.json | 6 --- .../test-list-query.sql | 3 -- .../test-not-found-expected.json | 1 - .../test-not-found-query.sql | 3 -- .../test-turbot-expected.json | 9 ---- .../test-turbot-query.sql | 3 -- .../azure_ad_service_principal/variables.json | 1 - .../azure_ad_service_principal/variables.tf | 53 ------------------- .../tests/azure_ad_user/dependencies.txt | 0 .../azure_ad_user/test-get-expected.json | 12 ----- .../tests/azure_ad_user/test-get-query.sql | 3 -- .../azure_ad_user/test-hydrate-expected.json | 11 ---- .../azure_ad_user/test-hydrate-query.sql | 3 -- .../azure_ad_user/test-list-expected.json | 6 --- .../tests/azure_ad_user/test-list-query.sql | 3 -- azure-test/tests/azure_ad_user/variables.json | 1 - azure-test/tests/azure_ad_user/variables.tf | 47 ---------------- 31 files changed, 265 deletions(-) delete mode 100644 azure-test/tests/azure_ad_group/dependencies.txt delete mode 100644 azure-test/tests/azure_ad_group/test-get-expected.json delete mode 100644 azure-test/tests/azure_ad_group/test-get-query.sql delete mode 100644 azure-test/tests/azure_ad_group/test-hydrate-expected.json delete mode 100644 azure-test/tests/azure_ad_group/test-hydrate-query.sql delete mode 100644 azure-test/tests/azure_ad_group/test-list-expected.json delete mode 100644 azure-test/tests/azure_ad_group/test-list-query.sql delete mode 100644 azure-test/tests/azure_ad_group/variables.json delete mode 100644 azure-test/tests/azure_ad_group/variables.tf delete mode 100644 azure-test/tests/azure_ad_service_principal/dependencies.txt delete mode 100644 azure-test/tests/azure_ad_service_principal/test-get-expected.json delete mode 100644 azure-test/tests/azure_ad_service_principal/test-get-query.sql delete mode 100644 azure-test/tests/azure_ad_service_principal/test-hydrate-expected.json delete mode 100644 azure-test/tests/azure_ad_service_principal/test-hydrate-query.sql delete mode 100644 azure-test/tests/azure_ad_service_principal/test-list-expected.json delete mode 100644 azure-test/tests/azure_ad_service_principal/test-list-query.sql delete mode 100644 azure-test/tests/azure_ad_service_principal/test-not-found-expected.json delete mode 100644 azure-test/tests/azure_ad_service_principal/test-not-found-query.sql delete mode 100644 azure-test/tests/azure_ad_service_principal/test-turbot-expected.json delete mode 100644 azure-test/tests/azure_ad_service_principal/test-turbot-query.sql delete mode 100644 azure-test/tests/azure_ad_service_principal/variables.json delete mode 100644 azure-test/tests/azure_ad_service_principal/variables.tf delete mode 100644 azure-test/tests/azure_ad_user/dependencies.txt delete mode 100644 azure-test/tests/azure_ad_user/test-get-expected.json delete mode 100644 azure-test/tests/azure_ad_user/test-get-query.sql delete mode 100644 azure-test/tests/azure_ad_user/test-hydrate-expected.json delete mode 100644 azure-test/tests/azure_ad_user/test-hydrate-query.sql delete mode 100644 azure-test/tests/azure_ad_user/test-list-expected.json delete mode 100644 azure-test/tests/azure_ad_user/test-list-query.sql delete mode 100644 azure-test/tests/azure_ad_user/variables.json delete mode 100644 azure-test/tests/azure_ad_user/variables.tf diff --git a/azure-test/tests/azure_ad_group/dependencies.txt b/azure-test/tests/azure_ad_group/dependencies.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/azure-test/tests/azure_ad_group/test-get-expected.json b/azure-test/tests/azure_ad_group/test-get-expected.json deleted file mode 100644 index 21a7a0f4..00000000 --- a/azure-test/tests/azure_ad_group/test-get-expected.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "display_name": "{{resourceName}}", - "mail_enabled": false, - "object_id": "{{ output.object_id.value }}", - "object_type": "Group", - "security_enabled": true - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_group/test-get-query.sql b/azure-test/tests/azure_ad_group/test-get-query.sql deleted file mode 100644 index b05bc3f1..00000000 --- a/azure-test/tests/azure_ad_group/test-get-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, object_type, display_name, mail_enabled, security_enabled -from azure.azure_ad_group -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_group/test-hydrate-expected.json b/azure-test/tests/azure_ad_group/test-hydrate-expected.json deleted file mode 100644 index 07a367ea..00000000 --- a/azure-test/tests/azure_ad_group/test-hydrate-expected.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "akas": [ - "{{ output.resource_aka.value }}" - ], - "object_id": "{{ output.object_id.value }}", - "object_type": "Group", - "title": "{{resourceName}}" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_group/test-hydrate-query.sql b/azure-test/tests/azure_ad_group/test-hydrate-query.sql deleted file mode 100644 index f2c33af9..00000000 --- a/azure-test/tests/azure_ad_group/test-hydrate-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, object_type, akas, title -from azure.azure_ad_group -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_group/test-list-expected.json b/azure-test/tests/azure_ad_group/test-list-expected.json deleted file mode 100644 index b5917324..00000000 --- a/azure-test/tests/azure_ad_group/test-list-expected.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "display_name": "{{resourceName}}", - "object_id": "{{ output.object_id.value }}" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_group/test-list-query.sql b/azure-test/tests/azure_ad_group/test-list-query.sql deleted file mode 100644 index 9c747663..00000000 --- a/azure-test/tests/azure_ad_group/test-list-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, display_name -from azure.azure_ad_group -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_group/variables.json b/azure-test/tests/azure_ad_group/variables.json deleted file mode 100644 index 0967ef42..00000000 --- a/azure-test/tests/azure_ad_group/variables.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/azure-test/tests/azure_ad_group/variables.tf b/azure-test/tests/azure_ad_group/variables.tf deleted file mode 100644 index d123f723..00000000 --- a/azure-test/tests/azure_ad_group/variables.tf +++ /dev/null @@ -1,44 +0,0 @@ -variable "resource_name" { - type = string - default = "turbot-test-20200125-create-update" - description = "Name of the resource used throughout the test." -} - -variable "azure_environment" { - type = string - default = "public" - description = "Azure environment used for the test." -} - -variable "azure_subscription" { - type = string - default = "3510ae4d-530b-497d-8f30-53b9616fc6c1" - description = "Azure environment used for the test." -} - -provider "azuread" { - # Cannot be passed as a variable - version = "=0.10.0" - environment = var.azure_environment - subscription_id = var.azure_subscription -} - -data "azuread_client_config" "current" {} - -resource "azuread_group" "named_test_resource" { - name = var.resource_name - description = "For testing tbt cli" -} - -output "resource_aka" { - depends_on = [azuread_group.named_test_resource] - value = "azure:///group/${azuread_group.named_test_resource.id}" -} - -output "resource_name" { - value = var.resource_name -} - -output "object_id" { - value = azuread_group.named_test_resource.id -} diff --git a/azure-test/tests/azure_ad_service_principal/dependencies.txt b/azure-test/tests/azure_ad_service_principal/dependencies.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/azure-test/tests/azure_ad_service_principal/test-get-expected.json b/azure-test/tests/azure_ad_service_principal/test-get-expected.json deleted file mode 100644 index 4af860b2..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-get-expected.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "account_enabled": true, - "app_role_assignment_required": false, - "display_name": "{{resourceName}}", - "object_id": "{{ output.object_id.value }}", - "object_type": "ServicePrincipal" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_service_principal/test-get-query.sql b/azure-test/tests/azure_ad_service_principal/test-get-query.sql deleted file mode 100644 index 2d1588f6..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-get-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, account_enabled, display_name, object_type, app_role_assignment_required -from azure.azure_ad_service_principal -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_service_principal/test-hydrate-expected.json b/azure-test/tests/azure_ad_service_principal/test-hydrate-expected.json deleted file mode 100644 index 48d93983..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-hydrate-expected.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "object_id": "{{ output.object_id.value }}", - "object_type": "ServicePrincipal" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_service_principal/test-hydrate-query.sql b/azure-test/tests/azure_ad_service_principal/test-hydrate-query.sql deleted file mode 100644 index b68807aa..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-hydrate-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, object_type -from azure.azure_ad_service_principal -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_service_principal/test-list-expected.json b/azure-test/tests/azure_ad_service_principal/test-list-expected.json deleted file mode 100644 index b5917324..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-list-expected.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "display_name": "{{resourceName}}", - "object_id": "{{ output.object_id.value }}" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_service_principal/test-list-query.sql b/azure-test/tests/azure_ad_service_principal/test-list-query.sql deleted file mode 100644 index 195f6ea3..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-list-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, display_name -from azure.azure_ad_service_principal -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_service_principal/test-not-found-expected.json b/azure-test/tests/azure_ad_service_principal/test-not-found-expected.json deleted file mode 100644 index 0637a088..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-not-found-expected.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_service_principal/test-not-found-query.sql b/azure-test/tests/azure_ad_service_principal/test-not-found-query.sql deleted file mode 100644 index 7f1a43ff..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-not-found-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, account_enabled, display_name, object_type, app_role_assignment_required -from azure.azure_ad_service_principal -where object_id = 'test-service-principal12234455352412' diff --git a/azure-test/tests/azure_ad_service_principal/test-turbot-expected.json b/azure-test/tests/azure_ad_service_principal/test-turbot-expected.json deleted file mode 100644 index 2db81dfe..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-turbot-expected.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "akas": [ - "{{ output.resource_aka.value }}" - ], - "object_id": "{{ output.object_id.value }}", - "title": "{{resourceName}}" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_service_principal/test-turbot-query.sql b/azure-test/tests/azure_ad_service_principal/test-turbot-query.sql deleted file mode 100644 index 5a8d42d4..00000000 --- a/azure-test/tests/azure_ad_service_principal/test-turbot-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, akas, title -from azure.azure_ad_service_principal -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_service_principal/variables.json b/azure-test/tests/azure_ad_service_principal/variables.json deleted file mode 100644 index 0967ef42..00000000 --- a/azure-test/tests/azure_ad_service_principal/variables.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/azure-test/tests/azure_ad_service_principal/variables.tf b/azure-test/tests/azure_ad_service_principal/variables.tf deleted file mode 100644 index b1447494..00000000 --- a/azure-test/tests/azure_ad_service_principal/variables.tf +++ /dev/null @@ -1,53 +0,0 @@ -variable "resource_name" { - type = string - default = "turbot-test-20200125-create-update" - description = "Name of the resource used throughout the test." -} - -variable "azure_environment" { - type = string - default = "public" - description = "Azure environment used for the test." -} - -variable "azure_subscription" { - type = string - default = "3510ae4d-530b-497d-8f30-53b9616fc6c1" - description = "Azure environment used for the test." -} - -provider "azuread" { - # Cannot be passed as a variable - version = "=0.10.0" - environment = var.azure_environment - subscription_id = var.azure_subscription -} - -data "azuread_client_config" "current" {} - -resource "azuread_application" "named_test_resource" { - name = var.resource_name - homepage = "http://homepage" - identifier_uris = ["http://${var.resource_name}"] - reply_urls = ["http://replyurl"] - available_to_other_tenants = false - oauth2_allow_implicit_flow = true -} - -resource "azuread_service_principal" "named_test_resource" { - application_id = azuread_application.named_test_resource.application_id - app_role_assignment_required = false -} - -output "resource_aka" { - depends_on = [azuread_service_principal.named_test_resource] - value = "azure:///serviceprincipal/${azuread_service_principal.named_test_resource.id}" -} - -output "resource_name" { - value = azuread_service_principal.named_test_resource.display_name -} - -output "object_id" { - value = azuread_service_principal.named_test_resource.id -} diff --git a/azure-test/tests/azure_ad_user/dependencies.txt b/azure-test/tests/azure_ad_user/dependencies.txt deleted file mode 100644 index e69de29b..00000000 diff --git a/azure-test/tests/azure_ad_user/test-get-expected.json b/azure-test/tests/azure_ad_user/test-get-expected.json deleted file mode 100644 index 71405e74..00000000 --- a/azure-test/tests/azure_ad_user/test-get-expected.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "account_enabled": false, - "display_name": "{{resourceName}}", - "given_name": "{{resourceName}}", - "mail_nickname": "jdoe", - "object_id": "{{ output.object_id.value }}", - "object_type": "User", - "user_principal_name": "{{resourceName}}@turbotad.onmicrosoft.com", - "user_type": "Member" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_user/test-get-query.sql b/azure-test/tests/azure_ad_user/test-get-query.sql deleted file mode 100644 index b03d92f5..00000000 --- a/azure-test/tests/azure_ad_user/test-get-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, user_principal_name, display_name, object_type, user_type, account_enabled, mail_nickname, given_name -from azure.azure_ad_user -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_user/test-hydrate-expected.json b/azure-test/tests/azure_ad_user/test-hydrate-expected.json deleted file mode 100644 index 3ae68212..00000000 --- a/azure-test/tests/azure_ad_user/test-hydrate-expected.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "akas": [ - "{{ output.resource_aka.value }}" - ], - "object_id": "{{ output.object_id.value }}", - "object_type": "User", - "title": "{{resourceName}}", - "user_type": "Member" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_user/test-hydrate-query.sql b/azure-test/tests/azure_ad_user/test-hydrate-query.sql deleted file mode 100644 index 538a21b2..00000000 --- a/azure-test/tests/azure_ad_user/test-hydrate-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, object_type, user_type, akas, title -from azure.azure_ad_user -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_user/test-list-expected.json b/azure-test/tests/azure_ad_user/test-list-expected.json deleted file mode 100644 index b5917324..00000000 --- a/azure-test/tests/azure_ad_user/test-list-expected.json +++ /dev/null @@ -1,6 +0,0 @@ -[ - { - "display_name": "{{resourceName}}", - "object_id": "{{ output.object_id.value }}" - } -] \ No newline at end of file diff --git a/azure-test/tests/azure_ad_user/test-list-query.sql b/azure-test/tests/azure_ad_user/test-list-query.sql deleted file mode 100644 index 3b0771a4..00000000 --- a/azure-test/tests/azure_ad_user/test-list-query.sql +++ /dev/null @@ -1,3 +0,0 @@ -select object_id, display_name -from azure.azure_ad_user -where object_id = '{{ output.object_id.value }}' diff --git a/azure-test/tests/azure_ad_user/variables.json b/azure-test/tests/azure_ad_user/variables.json deleted file mode 100644 index 0967ef42..00000000 --- a/azure-test/tests/azure_ad_user/variables.json +++ /dev/null @@ -1 +0,0 @@ -{} diff --git a/azure-test/tests/azure_ad_user/variables.tf b/azure-test/tests/azure_ad_user/variables.tf deleted file mode 100644 index 4242d0b5..00000000 --- a/azure-test/tests/azure_ad_user/variables.tf +++ /dev/null @@ -1,47 +0,0 @@ -variable "resource_name" { - type = string - default = "turbot-test-20200125-create-update" - description = "Name of the resource used throughout the test." -} - -variable "azure_environment" { - type = string - default = "public" - description = "Azure environment used for the test." -} - -variable "azure_subscription" { - type = string - default = "3510ae4d-530b-497d-8f30-53b9616fc6c1" - description = "Azure environment used for the test." -} - -provider "azuread" { - # Cannot be passed as a variable - version = "=1.2.2" - environment = var.azure_environment -} - -data "azuread_client_config" "current" {} - -resource "azuread_user" "named_test_resource" { - user_principal_name = "${var.resource_name}@turbotad.onmicrosoft.com" - display_name = var.resource_name - given_name = var.resource_name - mail_nickname = "jdoe" - password = "SecretP@sswd99!" - account_enabled = false -} - -output "resource_aka" { - depends_on = [azuread_user.named_test_resource] - value = "azure:///user/${azuread_user.named_test_resource.id}" -} - -output "resource_name" { - value = azuread_user.named_test_resource.display_name -} - -output "object_id" { - value = azuread_user.named_test_resource.id -}