From 966b1fe5f40aaf020acca9280eda6ad71f6272be Mon Sep 17 00:00:00 2001 From: Tracy P Holmes <12778804+tracypholmes@users.noreply.github.com> Date: Wed, 22 Apr 2020 02:26:46 -0500 Subject: [PATCH] provider tests: removes the requires import feature flag [L-W] (#6573) --- .../resource_arm_log_analytics_linked_service_test.go | 6 ------ .../tests/resource_arm_log_analytics_solution_test.go | 6 ------ .../resource_arm_log_analytics_workspace_test.go | 6 ------ .../resource_arm_logic_app_action_custom_test.go | 6 ------ .../tests/resource_arm_logic_app_action_http_test.go | 6 ------ .../resource_arm_logic_app_trigger_custom_test.go | 6 ------ ...esource_arm_logic_app_trigger_http_request_test.go | 6 ------ .../resource_arm_logic_app_trigger_recurrence_test.go | 6 ------ .../tests/resource_arm_logic_app_workflow_test.go | 6 ------ .../resource_arm_maintenance_configuration_test.go | 5 ----- .../managed_application_definition_resource_test.go | 6 ------ .../tests/resource_arm_mariadb_database_test.go | 6 ------ .../tests/resource_arm_mariadb_firewall_rule_test.go | 6 ------ .../mariadb/tests/resource_arm_mariadb_server_test.go | 6 ------ .../resource_arm_mariadb_virtual_network_rule_test.go | 6 ------ .../tests/resource_arm_monitor_action_group_test.go | 6 ------ .../resource_arm_monitor_activity_log_alert_test.go | 6 ------ .../resource_arm_monitor_autoscale_setting_test.go | 6 ------ .../resource_arm_monitor_diagnostic_setting_test.go | 6 ------ .../tests/resource_arm_monitor_log_profile_test.go | 6 ------ .../tests/resource_arm_monitor_metric_alert_test.go | 6 ------ .../tests/resource_arm_user_assigned_identity_test.go | 6 ------ .../mssql/tests/resource_arm_mssql_database_test.go | 6 ------ .../tests/resource_arm_mssql_elasticpool_test.go | 6 ------ .../tests/resource_arm_mssql_virtual_machine_test.go | 6 ------ .../mysql/tests/resource_arm_mysql_database_test.go | 6 ------ .../tests/resource_arm_mysql_firewall_rule_test.go | 6 ------ .../mysql/tests/resource_arm_mysql_server_test.go | 11 ----------- .../resource_arm_mysql_virtual_network_rule_test.go | 6 ------ .../netapp/tests/resource_arm_netapp_account_test.go | 6 ------ .../netapp/tests/resource_arm_netapp_pool_test.go | 6 ------ .../netapp/tests/resource_arm_netapp_snapshot_test.go | 6 ------ .../netapp/tests/resource_arm_netapp_volume_test.go | 6 ------ .../network/resource_arm_network_security_group.go | 2 +- ...cation_security_group_association_resource_test.go | 6 ------ ...etwork_security_group_association_resource_test.go | 6 ------ .../tests/resource_arm_application_gateway_test.go | 6 ------ .../resource_arm_application_security_group_test.go | 6 ------ .../network/tests/resource_arm_bastion_host_test.go | 6 ------ ...ce_arm_express_route_circuit_authorization_test.go | 6 ------ ...resource_arm_express_route_circuit_peering_test.go | 6 ------ .../tests/resource_arm_express_route_circuit_test.go | 6 ------ .../tests/resource_arm_express_route_gateway_test.go | 6 ------ ...e_arm_firewall_application_rule_collection_test.go | 6 ------ .../resource_arm_firewall_nat_rule_collection_test.go | 6 ------ ...ource_arm_firewall_network_rule_collection_test.go | 6 ------ .../network/tests/resource_arm_firewall_test.go | 6 ------ ...urce_arm_loadbalancer_backend_address_pool_test.go | 6 ------ .../tests/resource_arm_loadbalancer_nat_pool_test.go | 6 ------ .../tests/resource_arm_loadbalancer_nat_rule_test.go | 6 ------ .../resource_arm_loadbalancer_outbound_rule_test.go | 6 ------ .../tests/resource_arm_loadbalancer_probe_test.go | 6 ------ .../tests/resource_arm_loadbalancer_rule_test.go | 6 ------ .../network/tests/resource_arm_loadbalancer_test.go | 6 ------ .../tests/resource_arm_local_network_gateway_test.go | 6 ------ .../resource_arm_network_connection_monitor_test.go | 6 ------ .../resource_arm_network_ddos_protection_plan_test.go | 6 ------ ..._interface_application_gateway_association_test.go | 6 ------ ...interface_backend_address_pool_association_test.go | 6 ------ ...arm_network_interface_nat_rule_association_test.go | 6 ------ .../tests/resource_arm_network_interface_test.go | 6 ------ .../tests/resource_arm_network_packet_capture_test.go | 6 ------ .../tests/resource_arm_network_profile_test.go | 6 ------ .../tests/resource_arm_network_security_group_test.go | 6 ------ .../tests/resource_arm_network_security_rule_test.go | 6 ------ .../tests/resource_arm_network_watcher_test.go | 6 ------ .../network/tests/resource_arm_packet_capture_test.go | 6 ------ .../resource_arm_point_to_site_vpn_gateway_test.go | 6 ------ .../tests/resource_arm_private_link_service_test.go | 6 ------ .../network/tests/resource_arm_public_ip_test.go | 6 ------ .../network/tests/resource_arm_route_table_test.go | 6 ------ .../services/network/tests/resource_arm_route_test.go | 6 ------ ...esource_arm_subnet_nat_gateway_association_test.go | 6 ------ ..._subnet_network_security_group_association_test.go | 6 ------ ...esource_arm_subnet_route_table_association_test.go | 6 ------ .../network/tests/resource_arm_subnet_test.go | 6 ------ .../tests/resource_arm_virtual_hub_connection_test.go | 6 ------ .../network/tests/resource_arm_virtual_hub_test.go | 6 ------ ...rce_arm_virtual_network_gateway_connection_test.go | 6 ------ .../resource_arm_virtual_network_gateway_test.go | 6 ------ .../resource_arm_virtual_network_peering_test.go | 6 ------ .../tests/resource_arm_virtual_network_test.go | 6 ------ .../network/tests/resource_arm_virtual_wan_test.go | 5 ----- .../network/tests/resource_arm_vpn_gateway_test.go | 6 ------ .../resource_arm_vpn_server_configuration_test.go | 6 ------ ...ce_arm_notification_hub_authorization_rule_test.go | 6 ------ .../resource_arm_notification_hub_namespace_test.go | 6 ------ .../tests/resource_arm_notification_hub_test.go | 6 ------ .../tests/resource_arm_policy_assignment_test.go | 6 ------ .../tests/resource_arm_policy_definition_test.go | 6 ------ .../tests/resource_arm_policy_remediation_test.go | 6 ------ .../tests/resource_arm_postgresql_database_test.go | 6 ------ .../resource_arm_postgresql_firewall_rule_test.go | 6 ------ .../tests/resource_arm_postgresql_server_test.go | 1 + ...source_arm_postgresql_virtual_network_rule_test.go | 6 ------ .../tests/resource_arm_powerbi_embedded_test.go | 6 ------ .../tests/resource_arm_private_dns_a_record_test.go | 6 ------ .../resource_arm_private_dns_aaaa_record_test.go | 6 ------ .../resource_arm_private_dns_cname_record_test.go | 6 ------ .../tests/resource_arm_private_dns_mx_record_test.go | 6 ------ .../tests/resource_arm_private_dns_ptr_record_test.go | 6 ------ .../tests/resource_arm_private_dns_srv_record_test.go | 6 ------ .../tests/resource_arm_private_dns_txt_record_test.go | 6 ------ .../tests/resource_arm_private_dns_zone_test.go | 6 ------ ..._arm_private_dns_zone_virtual_network_link_test.go | 6 ------ .../resource_arm_backup_policy_file_share_test.go | 6 ------ .../tests/resource_arm_backup_policy_vm_test.go | 6 ------ .../resource_arm_backup_protected_file_share_test.go | 6 ------ .../tests/resource_arm_backup_protected_vm_test.go | 6 ------ .../resource_arm_recovery_services_vault_test.go | 6 ------ .../redis/tests/resource_arm_redis_cache_test.go | 6 ------ .../tests/resource_arm_redis_firewall_rule_test.go | 6 ------ .../resource_arm_relay_hybrid_connection_test.go | 6 ------ .../relay/tests/resource_arm_relay_namespace_test.go | 6 ------ .../tests/resource_arm_management_lock_test.go | 6 ------ .../tests/resource_arm_resource_group_test.go | 6 ------ .../tests/resource_arm_template_deployment_test.go | 6 ------ .../search/tests/resource_arm_search_service_test.go | 6 ------ .../resource_arm_advanced_threat_protection_test.go | 6 ------ .../resource_arm_security_center_contact_test.go | 6 ------ .../resource_arm_security_center_workspace_test.go | 6 ------ ...rm_servicebus_namespace_authorization_rule_test.go | 5 ----- .../tests/resource_arm_servicebus_namespace_test.go | 5 ----- ...ce_arm_servicebus_queue_authorization_rule_test.go | 5 ----- .../tests/resource_arm_servicebus_queue_test.go | 6 ------ .../resource_arm_servicebus_subscription_rule_test.go | 5 ----- .../resource_arm_servicebus_subscription_test.go | 5 ----- ...ce_arm_servicebus_topic_authorization_rule_test.go | 5 ----- .../tests/resource_arm_servicebus_topic_test.go | 5 ----- .../tests/resource_arm_service_fabric_cluster_test.go | 5 ----- .../tests/resource_arm_signalr_service_test.go | 5 ----- .../sql/tests/resource_arm_sql_administrator_test.go | 5 ----- .../sql/tests/resource_arm_sql_database_test.go | 5 ----- .../sql/tests/resource_arm_sql_elasticpool_test.go | 5 ----- .../sql/tests/resource_arm_sql_firewall_rule_test.go | 5 ----- .../sql/tests/resource_arm_sql_server_test.go | 5 ----- .../resource_arm_sql_virtual_network_rule_test.go | 5 ----- .../tests/resource_arm_hpc_cache_blob_target_test.go | 6 ------ .../storage/tests/resource_arm_hpc_cache_test.go | 6 ------ .../tests/resource_arm_storage_account_test.go | 5 ----- .../storage/tests/resource_arm_storage_blob_test.go | 5 ----- .../tests/resource_arm_storage_container_test.go | 5 ----- ...urce_arm_storage_data_lake_gen2_filesystem_test.go | 5 ----- .../storage/tests/resource_arm_storage_queue_test.go | 5 ----- .../resource_arm_storage_share_directory_test.go | 5 ----- .../storage/tests/resource_arm_storage_share_test.go | 5 ----- .../tests/resource_arm_storage_table_entity_test.go | 5 ----- .../storage/tests/resource_arm_storage_table_test.go | 5 ----- ...m_stream_analytics_function_javascript_udf_test.go | 6 ------ .../tests/resource_arm_stream_analytics_job_test.go | 6 ------ .../resource_arm_stream_analytics_output_blob_test.go | 6 ------ ...ource_arm_stream_analytics_output_eventhub_test.go | 6 ------ ...resource_arm_stream_analytics_output_mssql_test.go | 6 ------ ...m_stream_analytics_output_servicebus_queue_test.go | 6 ------ ...m_stream_analytics_output_servicebus_topic_test.go | 6 ------ ..._arm_stream_analytics_reference_input_blob_test.go | 6 ------ ...rce_arm_stream_analytics_stream_input_blob_test.go | 6 ------ ...arm_stream_analytics_stream_input_eventhub_test.go | 6 ------ ...e_arm_stream_analytics_stream_input_iothub_test.go | 6 ------ .../resource_arm_traffic_manager_endpoint_test.go | 6 ------ .../resource_arm_traffic_manager_profile_test.go | 6 ------ .../tests/app_service_environment_resource_test.go | 6 ------ ...resource_arm_app_service_certificate_order_test.go | 6 ------ ...ce_arm_app_service_custom_hostname_binding_test.go | 6 ------ .../web/tests/resource_arm_app_service_plan_test.go | 5 ----- .../web/tests/resource_arm_app_service_slot_test.go | 6 ------ .../web/tests/resource_arm_app_service_test.go | 6 ------ .../web/tests/resource_arm_function_app_test.go | 6 ------ 168 files changed, 2 insertions(+), 975 deletions(-) diff --git a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go index 94f2a45745dc..55add86dcd79 100644 --- a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go +++ b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_linked_service_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLogAnalyticsLinkedService_basic(t *testing.T) { @@ -35,11 +34,6 @@ func TestAccAzureRMLogAnalyticsLinkedService_basic(t *testing.T) { } func TestAccAzureRMLogAnalyticsLinkedService_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_log_analytics_linked_service", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_solution_test.go b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_solution_test.go index 3f97ddb70aab..72864d6d23eb 100644 --- a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_solution_test.go +++ b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_solution_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLogAnalyticsSolution_basicContainerMonitoring(t *testing.T) { @@ -31,11 +30,6 @@ func TestAccAzureRMLogAnalyticsSolution_basicContainerMonitoring(t *testing.T) { } func TestAccAzureRMLogAnalyticsSolution_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_log_analytics_solution", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_workspace_test.go b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_workspace_test.go index 28dd8a6080b7..1ae5bdf52974 100644 --- a/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_workspace_test.go +++ b/azurerm/internal/services/loganalytics/tests/resource_arm_log_analytics_workspace_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/loganalytics" ) @@ -75,11 +74,6 @@ func TestAccAzureRMLogAnalyticsWorkspace_basic(t *testing.T) { } func TestAccAzureRMLogAnalyticsWorkspace_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_log_analytics_workspace", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_custom_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_custom_test.go index 9e3f8ac7590d..7e4215dcd237 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_custom_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_custom_test.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLogicAppActionCustom_basic(t *testing.T) { @@ -29,11 +28,6 @@ func TestAccAzureRMLogicAppActionCustom_basic(t *testing.T) { } func TestAccAzureRMLogicAppActionCustom_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_logic_app_action_custom", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_http_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_http_test.go index 4527ac41794c..f2e533b80112 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_http_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_action_http_test.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLogicAppActionHttp_basic(t *testing.T) { @@ -29,11 +28,6 @@ func TestAccAzureRMLogicAppActionHttp_basic(t *testing.T) { } func TestAccAzureRMLogicAppActionHttp_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_logic_app_action_http", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_custom_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_custom_test.go index aa960af30cbf..8597628cc623 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_custom_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_custom_test.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLogicAppTriggerCustom_basic(t *testing.T) { @@ -29,11 +28,6 @@ func TestAccAzureRMLogicAppTriggerCustom_basic(t *testing.T) { } func TestAccAzureRMLogicAppTriggerCustom_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_logic_app_trigger_custom", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_http_request_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_http_request_test.go index 219a59c4fc1e..0f1e6d3ffb34 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_http_request_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_http_request_test.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLogicAppTriggerHttpRequest_basic(t *testing.T) { @@ -30,11 +29,6 @@ func TestAccAzureRMLogicAppTriggerHttpRequest_basic(t *testing.T) { } func TestAccAzureRMLogicAppTriggerHttpRequest_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_logic_app_trigger_http_request", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_recurrence_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_recurrence_test.go index 39286240a3ac..3e8a160dbbc2 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_recurrence_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_trigger_recurrence_test.go @@ -6,7 +6,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLogicAppTriggerRecurrence_month(t *testing.T) { @@ -31,11 +30,6 @@ func TestAccAzureRMLogicAppTriggerRecurrence_month(t *testing.T) { } func TestAccAzureRMLogicAppTriggerRecurrence_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_logic_app_trigger_recurrence", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/logic/tests/resource_arm_logic_app_workflow_test.go b/azurerm/internal/services/logic/tests/resource_arm_logic_app_workflow_test.go index a2cb53160d0c..47aa45c0657d 100644 --- a/azurerm/internal/services/logic/tests/resource_arm_logic_app_workflow_test.go +++ b/azurerm/internal/services/logic/tests/resource_arm_logic_app_workflow_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLogicAppWorkflow_empty(t *testing.T) { @@ -38,11 +37,6 @@ func TestAccAzureRMLogicAppWorkflow_empty(t *testing.T) { } func TestAccAzureRMLogicAppWorkflow_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_logic_app_workflow", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_configuration_test.go b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_configuration_test.go index c326560621ce..130d7489c7c5 100644 --- a/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_configuration_test.go +++ b/azurerm/internal/services/maintenance/tests/resource_arm_maintenance_configuration_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/maintenance/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -35,10 +34,6 @@ func TestAccAzureRMMaintenanceConfiguration_basic(t *testing.T) { } func TestAccAzureRMMaintenanceConfiguration_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_maintenance_configuration", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/managedapplications/tests/managed_application_definition_resource_test.go b/azurerm/internal/services/managedapplications/tests/managed_application_definition_resource_test.go index f0773ef64a89..f102d06ccd12 100644 --- a/azurerm/internal/services/managedapplications/tests/managed_application_definition_resource_test.go +++ b/azurerm/internal/services/managedapplications/tests/managed_application_definition_resource_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/managedapplications/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMManagedApplicationDefinition_basic(t *testing.T) { } func TestAccAzureRMManagedApplicationDefinition_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_managed_application_definition", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_database_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_database_test.go index 0ff784f5b350..743c9f7d23a9 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_database_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_database_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMMariaDbDatabase_basic(t *testing.T) { } func TestAccAzureRMMariaDbDatabase_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mariadb_database", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_firewall_rule_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_firewall_rule_test.go index 17d6875de081..19b0baaf93ae 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_firewall_rule_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_firewall_rule_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMMariaDBFirewallRule_basic(t *testing.T) { } func TestAccAzureRMMariaDBFirewallRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mariadb_firewall_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go index 7ec387b2022e..9dfe8fc61043 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_server_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -35,11 +34,6 @@ func TestAccAzureRMMariaDbServer_basic(t *testing.T) { } func TestAccAzureRMMariaDbServer_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mariadb_server", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go index a84a79dbf277..220e66361f78 100644 --- a/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go +++ b/azurerm/internal/services/mariadb/tests/resource_arm_mariadb_virtual_network_rule_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMMariaDBVirtualNetworkRule_basic(t *testing.T) { } func TestAccAzureRMMariaDBVirtualNetworkRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mariadb_virtual_network_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_action_group_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_action_group_test.go index 35fef307a9ad..60db96d6b8b6 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_action_group_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_action_group_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMMonitorActionGroup_basic(t *testing.T) { @@ -32,11 +31,6 @@ func TestAccAzureRMMonitorActionGroup_basic(t *testing.T) { } func TestAccAzureRMMonitorActionGroup_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_monitor_action_group", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go index d24be72a43dc..8ffcad376106 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_activity_log_alert_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMMonitorActivityLogAlert_basic(t *testing.T) { @@ -37,11 +36,6 @@ func TestAccAzureRMMonitorActivityLogAlert_basic(t *testing.T) { } func TestAccAzureRMMonitorActivityLogAlert_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_monitor_activity_log_alert", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_autoscale_setting_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_autoscale_setting_test.go index 8606ce664966..8f5cc7af8cf2 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_autoscale_setting_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_autoscale_setting_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMMonitorAutoScaleSetting_basic(t *testing.T) { @@ -38,11 +37,6 @@ func TestAccAzureRMMonitorAutoScaleSetting_basic(t *testing.T) { } func TestAccAzureRMMonitorAutoScaleSetting_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_monitor_autoscale_setting", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go index 0c19456e592d..cd3b5e9b8b49 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_diagnostic_setting_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -39,11 +38,6 @@ func TestAccAzureRMMonitorDiagnosticSetting_eventhub(t *testing.T) { } func TestAccAzureRMMonitorDiagnosticSetting_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_monitor_diagnostic_setting", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_log_profile_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_log_profile_test.go index 0d57bcc4d040..707fc1f3f8a6 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_log_profile_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_log_profile_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -67,11 +66,6 @@ func testAccAzureRMMonitorLogProfile_basic(t *testing.T) { } func testAccAzureRMMonitorLogProfile_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_monitor_log_profile", "test") resource.Test(t, resource.TestCase{ diff --git a/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go b/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go index 902081331ac1..8200d8e4198c 100644 --- a/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go +++ b/azurerm/internal/services/monitor/tests/resource_arm_monitor_metric_alert_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMMonitorMetricAlert_basic(t *testing.T) { @@ -41,11 +40,6 @@ func TestAccAzureRMMonitorMetricAlert_basic(t *testing.T) { } func TestAccAzureRMMonitorMetricAlert_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_monitor_metric_alert", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/msi/tests/resource_arm_user_assigned_identity_test.go b/azurerm/internal/services/msi/tests/resource_arm_user_assigned_identity_test.go index 2effea3183df..6fd5ec555770 100644 --- a/azurerm/internal/services/msi/tests/resource_arm_user_assigned_identity_test.go +++ b/azurerm/internal/services/msi/tests/resource_arm_user_assigned_identity_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMUserAssignedIdentity_basic(t *testing.T) { @@ -35,11 +34,6 @@ func TestAccAzureRMUserAssignedIdentity_basic(t *testing.T) { }) } func TestAccAzureRMUserAssignedIdentity_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_user_assigned_identity", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_database_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_database_test.go index c714384e5165..f6b28b315cb7 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_database_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_database_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mssql/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMMsSqlDatabase_basic(t *testing.T) { } func TestAccAzureRMMsSqlDatabase_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mssql_database", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go index d968a6c29281..a88679140b85 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_elasticpool_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) // TODO: add import tests @@ -38,11 +37,6 @@ func TestAccAzureRMMsSqlElasticPool_basic_DTU(t *testing.T) { } func TestAccAzureRMMsSqlElasticPool_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mssql_elasticpool", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mssql/tests/resource_arm_mssql_virtual_machine_test.go b/azurerm/internal/services/mssql/tests/resource_arm_mssql_virtual_machine_test.go index 8f743b83c212..4fd0cbedd06d 100644 --- a/azurerm/internal/services/mssql/tests/resource_arm_mssql_virtual_machine_test.go +++ b/azurerm/internal/services/mssql/tests/resource_arm_mssql_virtual_machine_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/mssql/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -35,11 +34,6 @@ func TestAccAzureRMMsSqlVirtualMachine_basic(t *testing.T) { } func TestAccAzureRMMsSqlVirtualMachine_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mssql_virtual_machine", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go index f22f24f03cb4..e06064f35284 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_database_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMMySQLDatabase_basic(t *testing.T) { } func TestAccAzureRMMySQLDatabase_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mysql_database", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go index 1e419570634c..cdf861629b12 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_firewall_rule_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMMySQLFirewallRule_basic(t *testing.T) { } func TestAccAzureRMMySQLFirewallRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mysql_firewall_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go index d2f84e500487..be8f219b89e4 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_server_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMMySQLServer_basicFiveSix(t *testing.T) { } func TestAccAzureRMMySQLServer_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mysql_server", "test") resource.ParallelTest(t, resource.TestCase{ @@ -59,11 +53,6 @@ func TestAccAzureRMMySQLServer_requiresImport(t *testing.T) { } func TestAccAzureRMMySQLServer_basicFiveSeven(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mysql_server", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go index 20c05f9e578c..67824d6c074d 100644 --- a/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go +++ b/azurerm/internal/services/mysql/tests/resource_arm_mysql_virtual_network_rule_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -52,11 +51,6 @@ func TestAccAzureRMMySqlVirtualNetworkRule_badsubnet(t *testing.T) { } func TestAccAzureRMMySqlVirtualNetworkRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_mysql_virtual_network_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go index 4707d8970028..c1aa2798a20a 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_account_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -59,11 +58,6 @@ func testAccAzureRMNetAppAccount_basic(t *testing.T) { } func testAccAzureRMNetAppAccount_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_netapp_account", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go index ee8497556d50..43172f840756 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_pool_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMNetAppPool_basic(t *testing.T) { } func TestAccAzureRMNetAppPool_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_netapp_pool", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go index 50e1fc277d3f..ea620e3a5e3f 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_snapshot_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMNetAppSnapshot_basic(t *testing.T) { } func TestAccAzureRMNetAppSnapshot_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_netapp_snapshot", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go index ec54c6d4243e..3d25e74f7e90 100644 --- a/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go +++ b/azurerm/internal/services/netapp/tests/resource_arm_netapp_volume_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -54,11 +53,6 @@ func TestAccAzureRMNetAppVolume_nfsv41(t *testing.T) { } func TestAccAzureRMNetAppVolume_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_netapp_volume", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/resource_arm_network_security_group.go b/azurerm/internal/services/network/resource_arm_network_security_group.go index b444ce2037fc..379df4edf9fa 100644 --- a/azurerm/internal/services/network/resource_arm_network_security_group.go +++ b/azurerm/internal/services/network/resource_arm_network_security_group.go @@ -5,7 +5,7 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" - "github.com/hashicorp/go-multierror" + multierror "github.com/hashicorp/go-multierror" "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/hashicorp/terraform-plugin-sdk/helper/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" diff --git a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go index 83743b4ef32d..a9cf8402d792 100644 --- a/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go +++ b/azurerm/internal/services/network/tests/network_interface_application_security_group_association_resource_test.go @@ -10,7 +10,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_basic(t *testing.T) { @@ -52,11 +51,6 @@ func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_multipleI } func TestAccAzureRMNetworkInterfaceApplicationSecurityGroupAssociation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_interface_application_security_group_association", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go b/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go index 464b9356fafd..4ca46df743d4 100644 --- a/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go +++ b/azurerm/internal/services/network/tests/network_interface_network_security_group_association_resource_test.go @@ -10,7 +10,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/azuresdkhacks" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMNetworkInterfaceSecurityGroupAssociation_basic(t *testing.T) } func TestAccAzureRMNetworkInterfaceSecurityGroupAssociation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_interface_security_group_association", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go index 6214bb86039b..5db72587bdb4 100644 --- a/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_application_gateway_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -159,11 +158,6 @@ func TestAccAzureRMApplicationGateway_http2(t *testing.T) { } func TestAccAzureRMApplicationGateway_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_application_gateway", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_application_security_group_test.go b/azurerm/internal/services/network/tests/resource_arm_application_security_group_test.go index 094911c7c36a..b967911648b2 100644 --- a/azurerm/internal/services/network/tests/resource_arm_application_security_group_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_application_security_group_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMApplicationSecurityGroup_basic(t *testing.T) { } func TestAccAzureRMApplicationSecurityGroup_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_application_security_group", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_bastion_host_test.go b/azurerm/internal/services/network/tests/resource_arm_bastion_host_test.go index a3cc414c6962..9508ac1e3461 100644 --- a/azurerm/internal/services/network/tests/resource_arm_bastion_host_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_bastion_host_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -52,11 +51,6 @@ func TestAccAzureRMBastionHost_complete(t *testing.T) { } func TestAccAzureRMBastionHost_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_bastion_host", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_authorization_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_authorization_test.go index ddad0d26b710..e977f57616cd 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_authorization_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_authorization_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func testAccAzureRMExpressRouteCircuitAuthorization_basic(t *testing.T) { } func testAccAzureRMExpressRouteCircuitAuthorization_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_express_route_circuit_authorization", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go index c6f5f3b6e088..e307889e05f4 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_peering_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -35,11 +34,6 @@ func testAccAzureRMExpressRouteCircuitPeering_azurePrivatePeering(t *testing.T) } func testAccAzureRMExpressRouteCircuitPeering_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_express_route_circuit_peering", "test") resource.Test(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_test.go index 700dc98f6a5a..33d9c707fa27 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_circuit_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -78,11 +77,6 @@ func testAccAzureRMExpressRouteCircuit_basicMetered(t *testing.T) { } func testAccAzureRMExpressRouteCircuit_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_express_route_circuit", "test") var erc network.ExpressRouteCircuit diff --git a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go index 32388509d215..40466b29cee2 100644 --- a/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_express_route_gateway_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMExpressRouteGateway_basic(t *testing.T) { } func TestAccAzureRMExpressRouteGateway_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_express_route_gateway", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_firewall_application_rule_collection_test.go b/azurerm/internal/services/network/tests/resource_arm_firewall_application_rule_collection_test.go index d2371d67996c..8e285978f2ee 100644 --- a/azurerm/internal/services/network/tests/resource_arm_firewall_application_rule_collection_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_firewall_application_rule_collection_test.go @@ -6,7 +6,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" @@ -43,11 +42,6 @@ func TestAccAzureRMFirewallApplicationRuleCollection_basic(t *testing.T) { } func TestAccAzureRMFirewallApplicationRuleCollection_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_firewall_application_rule_collection", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_firewall_nat_rule_collection_test.go b/azurerm/internal/services/network/tests/resource_arm_firewall_nat_rule_collection_test.go index e248e73cd343..4ca0c7747b8d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_firewall_nat_rule_collection_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_firewall_nat_rule_collection_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMFirewallNatRuleCollection_basic(t *testing.T) { @@ -32,11 +31,6 @@ func TestAccAzureRMFirewallNatRuleCollection_basic(t *testing.T) { } func TestAccAzureRMFirewallNatRuleCollection_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_firewall_nat_rule_collection", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_firewall_network_rule_collection_test.go b/azurerm/internal/services/network/tests/resource_arm_firewall_network_rule_collection_test.go index bbf799dab135..5612b260981d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_firewall_network_rule_collection_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_firewall_network_rule_collection_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMFirewallNetworkRuleCollection_basic(t *testing.T) { @@ -36,11 +35,6 @@ func TestAccAzureRMFirewallNetworkRuleCollection_basic(t *testing.T) { } func TestAccAzureRMFirewallNetworkRuleCollection_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_firewall_network_rule_collection", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_firewall_test.go b/azurerm/internal/services/network/tests/resource_arm_firewall_test.go index 3e4b5cbd5184..7c0ed37b90f6 100644 --- a/azurerm/internal/services/network/tests/resource_arm_firewall_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_firewall_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -95,11 +94,6 @@ func TestAccAzureRMFirewall_withMultiplePublicIPs(t *testing.T) { } func TestAccAzureRMFirewall_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_firewall", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go index 4e7d0da09b52..7ffa2d813909 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_backend_address_pool_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" ) @@ -49,11 +48,6 @@ func TestAccAzureRMLoadBalancerBackEndAddressPool_basic(t *testing.T) { }) } func TestAccAzureRMLoadBalancerBackEndAddressPool_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_lb_backend_address_pool", "test") var lb network.LoadBalancer diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go index a46e74c65947..883d64723559 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_pool_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" ) @@ -50,11 +49,6 @@ func TestAccAzureRMLoadBalancerNatPool_basic(t *testing.T) { } func TestAccAzureRMLoadBalancerNatPool_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_lb_nat_pool", "test") var lb network.LoadBalancer diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go index d94d22f7b8f8..831cc8fdd1e7 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_nat_rule_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" ) @@ -122,11 +121,6 @@ func TestAccAzureRMLoadBalancerNatRule_update(t *testing.T) { } func TestAccAzureRMLoadBalancerNatRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_lb_nat_rule", "test") var lb network.LoadBalancer diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_outbound_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_outbound_rule_test.go index c7fe563ff46d..61b49e97200c 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_outbound_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_outbound_rule_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" ) @@ -52,11 +51,6 @@ func TestAccAzureRMLoadBalancerOutboundRule_basic(t *testing.T) { } func TestAccAzureRMLoadBalancerOutboundRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_lb_nat_rule", "test") var lb network.LoadBalancer diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go index 083a7e869fff..dc07cc555c88 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_probe_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" ) @@ -46,11 +45,6 @@ func TestAccAzureRMLoadBalancerProbe_basic(t *testing.T) { } func TestAccAzureRMLoadBalancerProbe_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_lb_probe", "test") var lb network.LoadBalancer diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go index 31de2bf302ef..6d9a9eddc592 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_rule_test.go @@ -12,7 +12,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" nw "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network" ) @@ -180,11 +179,6 @@ func TestAccAzureRMLoadBalancerRule_update(t *testing.T) { } func TestAccAzureRMLoadBalancerRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_lb", "test") var lb network.LoadBalancer diff --git a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_test.go b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_test.go index 5742b634d7ea..b8787f870502 100644 --- a/azurerm/internal/services/network/tests/resource_arm_loadbalancer_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_loadbalancer_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMLoadBalancer_basic(t *testing.T) { @@ -38,11 +37,6 @@ func TestAccAzureRMLoadBalancer_basic(t *testing.T) { } func TestAccAzureRMLoadBalancer_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_lb", "test") var lb network.LoadBalancer diff --git a/azurerm/internal/services/network/tests/resource_arm_local_network_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_local_network_gateway_test.go index 1798bf660042..0c66b22f5c92 100644 --- a/azurerm/internal/services/network/tests/resource_arm_local_network_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_local_network_gateway_test.go @@ -10,7 +10,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -36,11 +35,6 @@ func TestAccAzureRMLocalNetworkGateway_basic(t *testing.T) { } func TestAccAzureRMLocalNetworkGateway_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_local_network_gateway", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_network_connection_monitor_test.go b/azurerm/internal/services/network/tests/resource_arm_network_connection_monitor_test.go index dc58451c2391..0da2b740393d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_connection_monitor_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_connection_monitor_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func testAccAzureRMNetworkConnectionMonitor_addressBasic(t *testing.T) { @@ -38,11 +37,6 @@ func testAccAzureRMNetworkConnectionMonitor_addressBasic(t *testing.T) { } func testAccAzureRMNetworkConnectionMonitor_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_connection_monitor", "test") resource.Test(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go b/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go index 39e15faee6e6..62bdb53359a6 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_ddos_protection_plan_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -59,11 +58,6 @@ func testAccAzureRMNetworkDDoSProtectionPlan_basic(t *testing.T) { } func testAccAzureRMNetworkDDoSProtectionPlan_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_ddos_protection_plan", "test") resource.Test(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go index 152914c722c7..5d0efb8bc056 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_application_gateway_association_test.go @@ -10,7 +10,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociati } func TestAccAzureRMNetworkInterfaceApplicationGatewayBackendAddressPoolAssociation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_interface_application_gateway_backend_address_pool_association", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go index 1c5b2058c580..8bae2af9aa38 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_backend_address_pool_association_test.go @@ -10,7 +10,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_basic(t *testin } func TestAccAzureRMNetworkInterfaceBackendAddressPoolAssociation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_interface_backend_address_pool_association", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go index f1f9edaa4e74..d24b481185bd 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_nat_rule_association_test.go @@ -10,7 +10,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMNetworkInterfaceNATRuleAssociation_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMNetworkInterfaceNATRuleAssociation_basic(t *testing.T) { } func TestAccAzureRMNetworkInterfaceNATRuleAssociation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_interface_nat_rule_association", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go index ca083a43dc29..d3c5ba303696 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_interface_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -258,11 +257,6 @@ func TestAccAzureRMNetworkInterface_publicIP(t *testing.T) { } func TestAccAzureRMNetworkInterface_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_interface", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/network/tests/resource_arm_network_packet_capture_test.go b/azurerm/internal/services/network/tests/resource_arm_network_packet_capture_test.go index 8182252c2805..9a7b004467ef 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_packet_capture_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_packet_capture_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func testAccAzureRMNetworkPacketCapture_localDisk(t *testing.T) { @@ -32,11 +31,6 @@ func testAccAzureRMNetworkPacketCapture_localDisk(t *testing.T) { } func testAccAzureRMNetworkPacketCapture_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_packet_capture", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_network_profile_test.go b/azurerm/internal/services/network/tests/resource_arm_network_profile_test.go index be3e006446a2..f15823534287 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_profile_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_profile_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMNetworkProfile_basic(t *testing.T) { } func TestAccAzureRMNetworkProfile_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_profile", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_network_security_group_test.go b/azurerm/internal/services/network/tests/resource_arm_network_security_group_test.go index 3f0674aec578..795fc4bf4374 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_security_group_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_security_group_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMNetworkSecurityGroup_basic(t *testing.T) { } func TestAccAzureRMNetworkSecurityGroup_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_security_group", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go b/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go index f4ccae96b4d8..436e1901beed 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_security_rule_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMNetworkSecurityRule_basic(t *testing.T) { } func TestAccAzureRMNetworkSecurityRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_security_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go b/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go index 4d88fd28255d..d54bc015c381 100644 --- a/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_network_watcher_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -98,11 +97,6 @@ func testAccAzureRMNetworkWatcher_basic(t *testing.T) { } func testAccAzureRMNetworkWatcher_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_network_watcher", "test") resource.Test(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/network/tests/resource_arm_packet_capture_test.go b/azurerm/internal/services/network/tests/resource_arm_packet_capture_test.go index a93af216af20..a3bd0fad6879 100644 --- a/azurerm/internal/services/network/tests/resource_arm_packet_capture_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_packet_capture_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func testAccAzureRMPacketCapture_localDisk(t *testing.T) { @@ -32,11 +31,6 @@ func testAccAzureRMPacketCapture_localDisk(t *testing.T) { } func testAccAzureRMPacketCapture_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_packet_capture", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_point_to_site_vpn_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_point_to_site_vpn_gateway_test.go index b5d779365de7..09702bf3494e 100644 --- a/azurerm/internal/services/network/tests/resource_arm_point_to_site_vpn_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_point_to_site_vpn_gateway_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMPointToSiteVPNGateway_basic(t *testing.T) { } func TestAccAzureRMPointToSiteVPNGateway_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_point_to_site_vpn_gateway", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_private_link_service_test.go b/azurerm/internal/services/network/tests/resource_arm_private_link_service_test.go index dda198ea10da..25b671e623fc 100644 --- a/azurerm/internal/services/network/tests/resource_arm_private_link_service_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_private_link_service_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -35,11 +34,6 @@ func TestAccAzureRMPrivateLinkService_basic(t *testing.T) { } func TestAccAzureRMPrivateLinkService_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_link_service", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go b/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go index b7a726a88f13..8a3f627a91b1 100644 --- a/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_public_ip_test.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPublicIpStatic_basic(t *testing.T) { @@ -37,11 +36,6 @@ func TestAccAzureRMPublicIpStatic_basic(t *testing.T) { } func TestAccAzureRMPublicIpStatic_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_public_ip", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_route_table_test.go b/azurerm/internal/services/network/tests/resource_arm_route_table_test.go index 05f29aef8062..c8274a5181bc 100644 --- a/azurerm/internal/services/network/tests/resource_arm_route_table_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_route_table_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -35,11 +34,6 @@ func TestAccAzureRMRouteTable_basic(t *testing.T) { } func TestAccAzureRMRouteTable_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_route_table", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_route_test.go b/azurerm/internal/services/network/tests/resource_arm_route_test.go index a560ad376c2d..0fe581309c08 100644 --- a/azurerm/internal/services/network/tests/resource_arm_route_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_route_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMRoute_basic(t *testing.T) { } func TestAccAzureRMRoute_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_route", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go index 107fa815a441..ed299daaad85 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_nat_gateway_association_test.go @@ -9,7 +9,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMSubnetNatGatewayAssociation_basic(t *testing.T) { } func TestAccAzureRMSubnetNatGatewayAssociation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_subnet_nat_gateway_association", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go index 48363fa4bee3..c8f7bfdef37e 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_network_security_group_association_test.go @@ -9,7 +9,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMSubnetNetworkSecurityGroupAssociation_basic(t *testing.T) { } func TestAccAzureRMSubnetNetworkSecurityGroupAssociation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_subnet_network_security_group_association", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go index 66f38365b4f8..0fcd36dc143d 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_route_table_association_test.go @@ -9,7 +9,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMSubnetRouteTableAssociation_basic(t *testing.T) { } func TestAccAzureRMSubnetRouteTableAssociation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_subnet_route_table_association", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go index 527dfa9c0e71..ed484a655deb 100644 --- a/azurerm/internal/services/network/tests/resource_arm_subnet_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_subnet_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMSubnet_basic(t *testing.T) { } func TestAccAzureRMSubnet_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_subnet", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_hub_connection_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_hub_connection_test.go index 522c72112ce9..265af4cbfa3c 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_hub_connection_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_hub_connection_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/network/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMVirtualHubConnection_basic(t *testing.T) { } func TestAccAzureRMVirtualHubConnection_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_virtual_hub_connection", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_hub_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_hub_test.go index b3254f5340fd..af20dfd948e6 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_hub_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_hub_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMVirtualHub_basic(t *testing.T) { } func TestAccAzureRMVirtualHub_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_virtual_hub", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_connection_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_connection_test.go index 1273176bf70e..211bc939164a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_connection_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_connection_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMVirtualNetworkGatewayConnection_sitetosite(t *testing.T) { } func TestAccAzureRMVirtualNetworkGatewayConnection_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_virtual_network_gateway_connection", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_test.go index 3a8303fe2fa5..e78b324c6c1c 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_gateway_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMVirtualNetworkGateway_basic(t *testing.T) { } func TestAccAzureRMVirtualNetworkGateway_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_virtual_network_gateway", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_peering_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_peering_test.go index 3ec0418b2a07..937d057bf32a 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_peering_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_peering_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMVirtualNetworkPeering_basic(t *testing.T) { @@ -36,11 +35,6 @@ func TestAccAzureRMVirtualNetworkPeering_basic(t *testing.T) { } func TestAccAzureRMVirtualNetworkPeering_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_virtual_network_peering", "test1") secondResourceName := "azurerm_virtual_network_peering.test2" diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go index 8c55908185e1..6b49f472f1f2 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_network_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMVirtualNetwork_basic(t *testing.T) { @@ -82,11 +81,6 @@ func TestAccAzureRMVirtualNetwork_basicUpdated(t *testing.T) { } func TestAccAzureRMVirtualNetwork_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_virtual_network", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go b/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go index 29879bae5bc0..f7f30bf02a8b 100644 --- a/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_virtual_wan_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,10 +32,6 @@ func TestAccAzureRMVirtualWan_basic(t *testing.T) { } func TestAccAzureRMVirtualWan_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_virtual_wan", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_vpn_gateway_test.go b/azurerm/internal/services/network/tests/resource_arm_vpn_gateway_test.go index 71b1ed8cbbc4..85627701ac09 100644 --- a/azurerm/internal/services/network/tests/resource_arm_vpn_gateway_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_vpn_gateway_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMVPNGateway_basic(t *testing.T) { @@ -32,11 +31,6 @@ func TestAccAzureRMVPNGateway_basic(t *testing.T) { } func TestAccAzureRMVPNGateway_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_vpn_gateway", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/network/tests/resource_arm_vpn_server_configuration_test.go b/azurerm/internal/services/network/tests/resource_arm_vpn_server_configuration_test.go index eb58bb2536be..93b9f2974ca2 100644 --- a/azurerm/internal/services/network/tests/resource_arm_vpn_server_configuration_test.go +++ b/azurerm/internal/services/network/tests/resource_arm_vpn_server_configuration_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -58,11 +57,6 @@ func TestAccAzureRMVPNServerConfiguration_certificate(t *testing.T) { } func TestAccAzureRMVPNServerConfiguration_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_vpn_server_configuration", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_authorization_rule_test.go b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_authorization_rule_test.go index 6777862a3de1..0db7fe750fdb 100644 --- a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_authorization_rule_test.go +++ b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_authorization_rule_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMNotificationHubAuthorizationRule_listen(t *testing.T) { @@ -36,11 +35,6 @@ func TestAccAzureRMNotificationHubAuthorizationRule_listen(t *testing.T) { } func TestAccAzureRMNotificationHubAuthorizationRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_notification_hub_authorization_rule", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_namespace_test.go b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_namespace_test.go index e511870cde39..2bfabaa30772 100644 --- a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_namespace_test.go +++ b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_namespace_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMNotificationHubNamespace_free(t *testing.T) { @@ -31,11 +30,6 @@ func TestAccAzureRMNotificationHubNamespace_free(t *testing.T) { } func TestAccAzureRMNotificationHubNamespace_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_notification_hub_namespace", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_test.go b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_test.go index ab1c71f9f104..a61de8f0c350 100644 --- a/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_test.go +++ b/azurerm/internal/services/notificationhub/tests/resource_arm_notification_hub_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMNotificationHub_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMNotificationHub_basic(t *testing.T) { } func TestAccAzureRMNotificationHub_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_notification_hub", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/policy/tests/resource_arm_policy_assignment_test.go b/azurerm/internal/services/policy/tests/resource_arm_policy_assignment_test.go index 83ab2d9ba8f2..4e541486373a 100644 --- a/azurerm/internal/services/policy/tests/resource_arm_policy_assignment_test.go +++ b/azurerm/internal/services/policy/tests/resource_arm_policy_assignment_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPolicyAssignment_basic(t *testing.T) { @@ -31,11 +30,6 @@ func TestAccAzureRMPolicyAssignment_basic(t *testing.T) { } func TestAccAzureRMPolicyAssignment_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_policy_assignment", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/policy/tests/resource_arm_policy_definition_test.go b/azurerm/internal/services/policy/tests/resource_arm_policy_definition_test.go index 4db75edde983..4758625d44a1 100644 --- a/azurerm/internal/services/policy/tests/resource_arm_policy_definition_test.go +++ b/azurerm/internal/services/policy/tests/resource_arm_policy_definition_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/policy/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMPolicyDefinition_basic(t *testing.T) { } func TestAccAzureRMPolicyDefinition_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_policy_definition", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/policy/tests/resource_arm_policy_remediation_test.go b/azurerm/internal/services/policy/tests/resource_arm_policy_remediation_test.go index ad64d3d43438..d038a7c69a7d 100644 --- a/azurerm/internal/services/policy/tests/resource_arm_policy_remediation_test.go +++ b/azurerm/internal/services/policy/tests/resource_arm_policy_remediation_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/policy" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/policy/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" @@ -148,11 +147,6 @@ func TestAccAzureRMPolicyRemediation_updateLocation(t *testing.T) { } func TestAccAzureRMPolicyRemediation_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_policy_remediation", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_database_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_database_test.go index 83462b6ae8e6..b413a87e0b4f 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_database_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_database_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMPostgreSQLDatabase_basic(t *testing.T) { } func TestAccAzureRMPostgreSQLDatabase_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_postgresql_database", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_firewall_rule_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_firewall_rule_test.go index e15c3858b558..e779789a0253 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_firewall_rule_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_firewall_rule_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMPostgreSQLFirewallRule_basic(t *testing.T) { } func TestAccAzureRMPostgreSQLFirewallRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_postgresql_firewall_rule", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go index 039481108944..f0d93a0a0d0d 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_server_test.go @@ -111,6 +111,7 @@ func TestAccAzureRMPostgreSQLServer_basicEleven(t *testing.T) { func TestAccAzureRMPostgreSQLServer_autogrowOnly(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_postgresql_server", "test") + resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders, diff --git a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go index e67a63cf2511..138eece44b7b 100644 --- a/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go +++ b/azurerm/internal/services/postgres/tests/resource_arm_postgresql_virtual_network_rule_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMPostgreSQLVirtualNetworkRule_basic(t *testing.T) { } func TestAccAzureRMPostgreSQLVirtualNetworkRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_postgresql_virtual_network_rule", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/powerbi/tests/resource_arm_powerbi_embedded_test.go b/azurerm/internal/services/powerbi/tests/resource_arm_powerbi_embedded_test.go index 56f130c1adf9..c92a9415ac75 100644 --- a/azurerm/internal/services/powerbi/tests/resource_arm_powerbi_embedded_test.go +++ b/azurerm/internal/services/powerbi/tests/resource_arm_powerbi_embedded_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMPowerBIEmbedded_basic(t *testing.T) { } func TestAccAzureRMPowerBIEmbedded_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_powerbi_embedded", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go index d322ad0dcc18..bab6ad1ce765 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_a_record_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPrivateDnsARecord_basic(t *testing.T) { @@ -34,11 +33,6 @@ func TestAccAzureRMPrivateDnsARecord_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsARecord_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_a_record", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go index d89bc9bb98c5..eeafc879740a 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_aaaa_record_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPrivateDnsAaaaRecord_basic(t *testing.T) { @@ -34,11 +33,6 @@ func TestAccAzureRMPrivateDnsAaaaRecord_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsAaaaRecord_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_aaaa_record", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go index 84b8beb9525d..45a284e6d886 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_cname_record_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPrivateDnsCNameRecord_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMPrivateDnsCNameRecord_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsCNameRecord_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_cname_record", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go index 204320495b42..4880e385b2bb 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_mx_record_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPrivateDnsMxRecord_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMPrivateDnsMxRecord_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsMxRecord_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_mx_record", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go index 482b8b67ce8e..251156aade37 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_ptr_record_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPrivateDnsPtrRecord_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMPrivateDnsPtrRecord_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsPtrRecord_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_ptr_record", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go index ca3561faeff6..c83d745391f5 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_srv_record_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPrivateDnsSrvRecord_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMPrivateDnsSrvRecord_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsSrvRecord_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_srv_record", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_txt_record_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_txt_record_test.go index e62c9330f603..b96326ba0302 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_txt_record_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_txt_record_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPrivateDnsTxtRecord_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMPrivateDnsTxtRecord_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsTxtRecord_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_txt_record", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_test.go index dca6e005e30e..236637b05cd7 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMPrivateDnsZone_basic(t *testing.T) { @@ -31,11 +30,6 @@ func TestAccAzureRMPrivateDnsZone_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsZone_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_zone", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_virtual_network_link_test.go b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_virtual_network_link_test.go index 7e918a835f13..5527780404c1 100644 --- a/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_virtual_network_link_test.go +++ b/azurerm/internal/services/privatedns/tests/resource_arm_private_dns_zone_virtual_network_link_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,11 +31,6 @@ func TestAccAzureRMPrivateDnsZoneVirtualNetworkLink_basic(t *testing.T) { } func TestAccAzureRMPrivateDnsZoneVirtualNetworkLink_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_private_dns_zone_virtual_network_link", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go index 99176f1101f8..4c25608070d5 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_file_share_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -30,11 +29,6 @@ func TestAccAzureRMBackupProtectionPolicyFileShare_basicDaily(t *testing.T) { } func TestAccAzureRMBackupProtectionPolicyFileShare_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_backup_policy_file_share", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_vm_test.go index 275073ee70df..a13fa5b0478e 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_policy_vm_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -35,11 +34,6 @@ func TestAccAzureRMBackupProtectionPolicyVM_basicDaily(t *testing.T) { } func TestAccAzureRMBackupProtectionPolicyVM_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_backup_policy_vm", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go index 92f947048090..d73a318881a1 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_file_share_test.go @@ -9,7 +9,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -39,11 +38,6 @@ func TestAccAzureRMBackupProtectedFileShare_basic(t *testing.T) { } func TestAccAzureRMBackupProtectedFileShare_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_backup_protected_file_share", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go index 75ae8963ec9e..d2ba87369cec 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_backup_protected_vm_test.go @@ -9,7 +9,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -38,11 +37,6 @@ func TestAccAzureRMBackupProtectedVm_basic(t *testing.T) { } func TestAccAzureRMBackupProtectedVm_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_backup_protected_vm", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_vault_test.go b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_vault_test.go index 00e17957a59d..3fc5641d0f08 100644 --- a/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_vault_test.go +++ b/azurerm/internal/services/recoveryservices/tests/resource_arm_recovery_services_vault_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -84,11 +83,6 @@ func TestAccAzureRMRecoveryServicesVault_update(t *testing.T) { } func TestAccAzureRMRecoveryServicesVault_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_recovery_services_vault", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/redis/tests/resource_arm_redis_cache_test.go b/azurerm/internal/services/redis/tests/resource_arm_redis_cache_test.go index f9b62fe5633b..c6a8dd1bdaff 100644 --- a/azurerm/internal/services/redis/tests/resource_arm_redis_cache_test.go +++ b/azurerm/internal/services/redis/tests/resource_arm_redis_cache_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMRedisCache_basic(t *testing.T) { @@ -35,11 +34,6 @@ func TestAccAzureRMRedisCache_basic(t *testing.T) { } func TestAccAzureRMRedisCache_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_redis_cache", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/redis/tests/resource_arm_redis_firewall_rule_test.go b/azurerm/internal/services/redis/tests/resource_arm_redis_firewall_rule_test.go index 10e937c56609..497f8cf0668d 100644 --- a/azurerm/internal/services/redis/tests/resource_arm_redis_firewall_rule_test.go +++ b/azurerm/internal/services/redis/tests/resource_arm_redis_firewall_rule_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -59,11 +58,6 @@ func TestAccAzureRMRedisFirewallRule_multi(t *testing.T) { } func TestAccAzureRMRedisFirewallRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_redis_firewall_rule", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/relay/tests/resource_arm_relay_hybrid_connection_test.go b/azurerm/internal/services/relay/tests/resource_arm_relay_hybrid_connection_test.go index 5496e5d7cc4a..1cad9e445efc 100644 --- a/azurerm/internal/services/relay/tests/resource_arm_relay_hybrid_connection_test.go +++ b/azurerm/internal/services/relay/tests/resource_arm_relay_hybrid_connection_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMRelayHybridConnection_basic(t *testing.T) { @@ -80,11 +79,6 @@ func TestAccAzureRMRelayHybridConnection_update(t *testing.T) { } func TestAccAzureRMRelayHybridConnection_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_relay_hybrid_connection", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/relay/tests/resource_arm_relay_namespace_test.go b/azurerm/internal/services/relay/tests/resource_arm_relay_namespace_test.go index 98fcdd4d7437..0e2e493af8ca 100644 --- a/azurerm/internal/services/relay/tests/resource_arm_relay_namespace_test.go +++ b/azurerm/internal/services/relay/tests/resource_arm_relay_namespace_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMRelayNamespace_basic(t *testing.T) { @@ -38,11 +37,6 @@ func TestAccAzureRMRelayNamespace_basic(t *testing.T) { } func TestAccAzureRMRelayNamespace_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_relay_namespace", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/resource/tests/resource_arm_management_lock_test.go b/azurerm/internal/services/resource/tests/resource_arm_management_lock_test.go index f5f447bce339..cf6990b2f2c5 100644 --- a/azurerm/internal/services/resource/tests/resource_arm_management_lock_test.go +++ b/azurerm/internal/services/resource/tests/resource_arm_management_lock_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMManagementLock_resourceGroupReadOnlyBasic(t *testing.T) { } func TestAccAzureRMManagementLock_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_management_lock", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/resource/tests/resource_arm_resource_group_test.go b/azurerm/internal/services/resource/tests/resource_arm_resource_group_test.go index ad03a2fcd256..07c54d3e8f1e 100644 --- a/azurerm/internal/services/resource/tests/resource_arm_resource_group_test.go +++ b/azurerm/internal/services/resource/tests/resource_arm_resource_group_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMResourceGroup_basic(t *testing.T) { @@ -32,11 +31,6 @@ func TestAccAzureRMResourceGroup_basic(t *testing.T) { } func TestAccAzureRMResourceGroup_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_resource_group", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/resource/tests/resource_arm_template_deployment_test.go b/azurerm/internal/services/resource/tests/resource_arm_template_deployment_test.go index 26831307f44b..ffddac31e569 100644 --- a/azurerm/internal/services/resource/tests/resource_arm_template_deployment_test.go +++ b/azurerm/internal/services/resource/tests/resource_arm_template_deployment_test.go @@ -13,7 +13,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -36,11 +35,6 @@ func TestAccAzureRMTemplateDeployment_basic(t *testing.T) { } func TestAccAzureRMTemplateDeployment_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_template_deployment", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/search/tests/resource_arm_search_service_test.go b/azurerm/internal/services/search/tests/resource_arm_search_service_test.go index 094ad11ff37d..2a0802e536da 100644 --- a/azurerm/internal/services/search/tests/resource_arm_search_service_test.go +++ b/azurerm/internal/services/search/tests/resource_arm_search_service_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/search/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMSearchService_basic(t *testing.T) { } func TestAccAzureRMSearchService_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_search_service", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go index ca06d18dc4f0..16bfe80ca8f6 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_advanced_threat_protection_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMAdvancedThreatProtection_storageAccount(t *testing.T) { @@ -86,11 +85,6 @@ func TestAccAzureRMAdvancedThreatProtection_cosmosAccount(t *testing.T) { } func TestAccAzureRMAdvancedThreatProtection_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_advanced_threat_protection", "import") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go index 2f15eefa6878..2bcb69b41fc1 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_contact_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -60,11 +59,6 @@ func testAccAzureRMSecurityCenterContact_basic(t *testing.T) { } func testAccAzureRMSecurityCenterContact_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_security_center_contact", "test") resource.Test(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go index c79e500d6ae2..c49b5950c546 100644 --- a/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go +++ b/azurerm/internal/services/securitycenter/tests/resource_arm_security_center_workspace_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -40,11 +39,6 @@ func testAccAzureRMSecurityCenterWorkspace_basic(t *testing.T) { } func testAccAzureRMSecurityCenterWorkspace_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_security_center_workspace", "test") scope := fmt.Sprintf("/subscriptions/%s", os.Getenv("ARM_SUBSCRIPTION_ID")) diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_authorization_rule_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_authorization_rule_test.go index f94ad070d819..b7005d0369a2 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_authorization_rule_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_authorization_rule_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -95,10 +94,6 @@ func TestAccAzureRMServiceBusNamespaceAuthorizationRule_rightsUpdate(t *testing. }) } func TestAccAzureRMServiceBusNamespaceAuthorizationRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace_authorization_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_test.go index f051e1e6f2d4..4251764579d2 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_namespace_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMServiceBusNamespace_basic(t *testing.T) { @@ -31,10 +30,6 @@ func TestAccAzureRMServiceBusNamespace_basic(t *testing.T) { }) } func TestAccAzureRMServiceBusNamespace_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_servicebus_namespace", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_authorization_rule_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_authorization_rule_test.go index de508d7436ac..e726f659d55b 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_authorization_rule_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_authorization_rule_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -95,10 +94,6 @@ func TestAccAzureRMServiceBusQueueAuthorizationRule_rightsUpdate(t *testing.T) { }) } func TestAccAzureRMServiceBusQueueAuthorizationRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_servicebus_queue_authorization_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_test.go index 9eb9e11f10d1..e1a8723308f2 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_queue_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,11 +32,6 @@ func TestAccAzureRMServiceBusQueue_basic(t *testing.T) { }) } func TestAccAzureRMServiceBusQueue_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_servicebus_queue", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_rule_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_rule_test.go index bf450bd16a62..8d03b1b1bd27 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_rule_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_rule_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -30,10 +29,6 @@ func TestAccAzureRMServiceBusSubscriptionRule_basicSqlFilter(t *testing.T) { }) } func TestAccAzureRMServiceBusSubscriptionRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_servicebus_subscription_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_test.go index a76d65b64923..92fcb118e2fe 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_subscription_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,10 +32,6 @@ func TestAccAzureRMServiceBusSubscription_basic(t *testing.T) { } func TestAccAzureRMServiceBusSubscription_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_servicebus_subscription", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_authorization_rule_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_authorization_rule_test.go index b1b13e6b9768..70f97df62bc5 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_authorization_rule_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_authorization_rule_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -58,10 +57,6 @@ func testAccAzureRMServiceBusTopicAuthorizationRule(t *testing.T, listen, send, } func TestAccAzureRMServiceBusTopicAuthorizationRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_servicebus_topic_authorization_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_test.go b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_test.go index 5969f9896f74..140c96eb80cf 100644 --- a/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_test.go +++ b/azurerm/internal/services/servicebus/tests/resource_arm_servicebus_topic_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -32,10 +31,6 @@ func TestAccAzureRMServiceBusTopic_basic(t *testing.T) { }) } func TestAccAzureRMServiceBusTopic_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_servicebus_topic", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/servicefabric/tests/resource_arm_service_fabric_cluster_test.go b/azurerm/internal/services/servicefabric/tests/resource_arm_service_fabric_cluster_test.go index 552d16ffa6ff..ff4c44dd2b7e 100644 --- a/azurerm/internal/services/servicefabric/tests/resource_arm_service_fabric_cluster_test.go +++ b/azurerm/internal/services/servicefabric/tests/resource_arm_service_fabric_cluster_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/servicefabric/parse" ) @@ -89,10 +88,6 @@ func TestAccAzureRMServiceFabricCluster_basicNodeTypeUpdate(t *testing.T) { } func TestAccAzureRMServiceFabricCluster_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_service_fabric_cluster", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go b/azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go index f1d9da80dd4d..617111e2db25 100644 --- a/azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go +++ b/azurerm/internal/services/signalr/tests/resource_arm_signalr_service_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/signalr/parse" ) @@ -43,10 +42,6 @@ func TestAccAzureRMSignalRService_basic(t *testing.T) { } func TestAccAzureRMSignalRService_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_signalr_service", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_administrator_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_administrator_test.go index 8b699311b621..8d62199ebcff 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_administrator_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_administrator_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -39,10 +38,6 @@ func TestAccAzureRMSqlAdministrator_basic(t *testing.T) { }) } func TestAccAzureRMSqlAdministrator_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_sql_active_directory_administrator", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_database_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_database_test.go index 3ba62ef2bde3..11ff51d0f7a7 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_database_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_database_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -37,10 +36,6 @@ func TestAccAzureRMSqlDatabase_basic(t *testing.T) { }) } func TestAccAzureRMSqlDatabase_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_sql_database", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_elasticpool_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_elasticpool_test.go index 1c754e9a334a..6d6796fb3ade 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_elasticpool_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_elasticpool_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMSqlElasticPool_basic(t *testing.T) { @@ -31,10 +30,6 @@ func TestAccAzureRMSqlElasticPool_basic(t *testing.T) { }) } func TestAccAzureRMSqlElasticPool_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_sql_elasticpool", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_firewall_rule_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_firewall_rule_test.go index afeb59ede74f..0c61b44b0f5e 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_firewall_rule_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_firewall_rule_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -41,10 +40,6 @@ func TestAccAzureRMSqlFirewallRule_basic(t *testing.T) { }) } func TestAccAzureRMSqlFirewallRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_sql_firewall_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_server_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_server_test.go index fce99e68a152..454118c4731b 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_server_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_server_test.go @@ -9,7 +9,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -37,10 +36,6 @@ func TestAccAzureRMSqlServer_basic(t *testing.T) { }) } func TestAccAzureRMSqlServer_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_sql_server", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/sql/tests/resource_arm_sql_virtual_network_rule_test.go b/azurerm/internal/services/sql/tests/resource_arm_sql_virtual_network_rule_test.go index 73af388e886a..2f3f0e37197b 100644 --- a/azurerm/internal/services/sql/tests/resource_arm_sql_virtual_network_rule_test.go +++ b/azurerm/internal/services/sql/tests/resource_arm_sql_virtual_network_rule_test.go @@ -13,7 +13,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -50,10 +49,6 @@ func TestAccAzureRMSqlVirtualNetworkRule_basic(t *testing.T) { } func TestAccAzureRMSqlVirtualNetworkRule_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_sql_virtual_network_rule", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_blob_target_test.go b/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_blob_target_test.go index a43ce1c55911..d93f0ef9f83f 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_blob_target_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_blob_target_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -60,11 +59,6 @@ func TestAccAzureRMHPCCacheBlobTarget_update(t *testing.T) { } func TestAccAzureRMHPCCacheBlobTarget_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_hpc_cache_blob_target", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_test.go b/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_test.go index 52ebb2d45bea..1ea780e2641f 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_hpc_cache_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMHPCCache_basic(t *testing.T) { @@ -33,11 +32,6 @@ func TestAccAzureRMHPCCache_basic(t *testing.T) { } func TestAccAzureRMHPCCache_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_hpc_cache", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go index 201bfced4582..760e180e1457 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_account_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -73,10 +72,6 @@ func TestAccAzureRMStorageAccount_basic(t *testing.T) { } func TestAccAzureRMStorageAccount_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_account", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go index 51339286fbed..a6b6639af9eb 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_blob_test.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/blob/blobs" ) @@ -514,10 +513,6 @@ func TestAccAzureRMStorageBlob_pageFromLocalFile(t *testing.T) { } func TestAccAzureRMStorageBlob_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_blob", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go index fa0f16071db1..eba09c032ebc 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_container_test.go @@ -10,7 +10,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -53,10 +52,6 @@ func TestAccAzureRMStorageContainer_basicAzureADAuth(t *testing.T) { } func TestAccAzureRMStorageContainer_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_container", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go index 71b3f75152c3..68939b83ffcf 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_data_lake_gen2_filesystem_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/storage/parsers" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -33,10 +32,6 @@ func TestAccAzureRMStorageDataLakeGen2FileSystem_basic(t *testing.T) { } func TestAccAzureRMStorageDataLakeGen2FileSystem_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_data_lake_gen2_filesystem", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go index 349c500329b6..7f15ce810aa7 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_queue_test.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -94,10 +93,6 @@ func TestAccAzureRMStorageQueue_basicAzureADAuth(t *testing.T) { } func TestAccAzureRMStorageQueue_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_queue", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_share_directory_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_share_directory_test.go index 6792afb73b81..1dbf902e6e0a 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_share_directory_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_share_directory_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStorageShareDirectory_basic(t *testing.T) { @@ -51,10 +50,6 @@ func TestAccAzureRMStorageShareDirectory_uppercase(t *testing.T) { } func TestAccAzureRMStorageShareDirectory_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_share_directory", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_share_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_share_test.go index ac83398c00b4..ad2e4a6cfa2a 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_share_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_share_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStorageShare_basic(t *testing.T) { @@ -31,10 +30,6 @@ func TestAccAzureRMStorageShare_basic(t *testing.T) { } func TestAccAzureRMStorageShare_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_share", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go index 7916e19d2bfb..519dcd0fa9cd 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_table_entity_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/tombuildsstuff/giovanni/storage/2018-11-09/table/entities" ) @@ -33,10 +32,6 @@ func TestAccAzureRMTableEntity_basic(t *testing.T) { } func TestAccAzureRMTableEntity_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_table_entity", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go b/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go index 85b7676121f1..d8e537d188a0 100644 --- a/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go +++ b/azurerm/internal/services/storage/tests/resource_arm_storage_table_test.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -35,10 +34,6 @@ func TestAccAzureRMStorageTable_basic(t *testing.T) { } func TestAccAzureRMStorageTable_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_storage_table", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_function_javascript_udf_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_function_javascript_udf_test.go index 6af0374977de..d283c84fd47d 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_function_javascript_udf_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_function_javascript_udf_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsFunctionJavaScriptUDF_basic(t *testing.T) { @@ -32,11 +31,6 @@ func TestAccAzureRMStreamAnalyticsFunctionJavaScriptUDF_basic(t *testing.T) { } func TestAccAzureRMStreamAnalyticsFunctionJavaScriptUDF_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_function_javascript_udf", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_job_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_job_test.go index 12b1d652a475..e5b0544a3573 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_job_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_job_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsJob_basic(t *testing.T) { @@ -55,11 +54,6 @@ func TestAccAzureRMStreamAnalyticsJob_complete(t *testing.T) { } func TestAccAzureRMStreamAnalyticsJob_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_job", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go index 4c3cf2823256..2b8c37bf0ac3 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_blob_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsOutputBlob_avro(t *testing.T) { @@ -94,11 +93,6 @@ func TestAccAzureRMStreamAnalyticsOutputBlob_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsOutputBlob_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_output_blob", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_eventhub_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_eventhub_test.go index 53a99b821cae..c84c2625f075 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_eventhub_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_eventhub_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsOutputEventHub_avro(t *testing.T) { @@ -123,11 +122,6 @@ func TestAccAzureRMStreamAnalyticsOutputEventHub_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsOutputEventHub_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_output_eventhub", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_mssql_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_mssql_test.go index d6aa4cb9fcb9..8c0df720f684 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_mssql_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_mssql_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsOutputSql_basic(t *testing.T) { @@ -56,11 +55,6 @@ func TestAccAzureRMStreamAnalyticsOutputSql_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsOutputSql_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_output_mssql", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_queue_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_queue_test.go index 8715f344304a..d03989220ff8 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_queue_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_queue_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsOutputServiceBusQueue_avro(t *testing.T) { @@ -95,11 +94,6 @@ func TestAccAzureRMStreamAnalyticsOutputServiceBusQueue_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsOutputServiceBusQueue_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_output_servicebus_queue", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_topic_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_topic_test.go index 0f777bb977f2..cc02c09eff9b 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_topic_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_output_servicebus_topic_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsOutputServiceBusTopic_avro(t *testing.T) { @@ -95,11 +94,6 @@ func TestAccAzureRMStreamAnalyticsOutputServiceBusTopic_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsOutputServiceBusTopic_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_output_servicebus_topic", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go index 2293d5309e24..46ac4fba9cd3 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_reference_input_blob_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsReferenceInputBlob_avro(t *testing.T) { @@ -95,11 +94,6 @@ func TestAccAzureRMStreamAnalyticsReferenceInputBlob_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsReferenceInputBlob_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_reference_input_blob", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_blob_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_blob_test.go index b42ad7e367a3..3d7ae3141e69 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_blob_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_blob_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsStreamInputBlob_avro(t *testing.T) { @@ -95,11 +94,6 @@ func TestAccAzureRMStreamAnalyticsStreamInputBlob_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsStreamInputBlob_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_stream_input_blob", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_eventhub_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_eventhub_test.go index 2a4333b87fa3..f705b5fc965b 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_eventhub_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_eventhub_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsStreamInputEventHub_avro(t *testing.T) { @@ -95,11 +94,6 @@ func TestAccAzureRMStreamAnalyticsStreamInputEventHub_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsStreamInputEventHub_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_stream_input_eventhub", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_iothub_test.go b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_iothub_test.go index 0b9c4298c480..f3149ec10990 100644 --- a/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_iothub_test.go +++ b/azurerm/internal/services/streamanalytics/tests/resource_arm_stream_analytics_stream_input_iothub_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMStreamAnalyticsStreamInputIoTHub_avro(t *testing.T) { @@ -95,11 +94,6 @@ func TestAccAzureRMStreamAnalyticsStreamInputIoTHub_update(t *testing.T) { } func TestAccAzureRMStreamAnalyticsStreamInputIoTHub_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_stream_analytics_stream_input_iothub", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_endpoint_test.go b/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_endpoint_test.go index 59f5d813b46a..a19fb0a77c51 100644 --- a/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_endpoint_test.go +++ b/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_endpoint_test.go @@ -10,7 +10,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMTrafficManagerEndpoint_basic(t *testing.T) { @@ -36,11 +35,6 @@ func TestAccAzureRMTrafficManagerEndpoint_basic(t *testing.T) { }) } func TestAccAzureRMTrafficManagerEndpoint_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_traffic_manager_endpoint", "testAzure") externalResourceName := "azurerm_traffic_manager_endpoint.testExternal" diff --git a/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_profile_test.go b/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_profile_test.go index aa0e6679d450..00230584c174 100644 --- a/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_profile_test.go +++ b/azurerm/internal/services/trafficmanager/tests/resource_arm_traffic_manager_profile_test.go @@ -11,7 +11,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" ) func TestAccAzureRMTrafficManagerProfile_basic(t *testing.T) { @@ -81,11 +80,6 @@ func TestAccAzureRMTrafficManagerProfile_update(t *testing.T) { } func TestAccAzureRMTrafficManagerProfile_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_traffic_manager_profile", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/web/tests/app_service_environment_resource_test.go b/azurerm/internal/services/web/tests/app_service_environment_resource_test.go index dc730a342110..e338f201084f 100644 --- a/azurerm/internal/services/web/tests/app_service_environment_resource_test.go +++ b/azurerm/internal/services/web/tests/app_service_environment_resource_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMAppServiceEnvironment_basic(t *testing.T) { } func TestAccAzureRMAppServiceEnvironment_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_app_service_environment", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_order_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_order_test.go index ecd4ead2639c..ed5155639789 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_order_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_certificate_order_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -69,11 +68,6 @@ func TestAccAzureRMAppServiceCertificateOrder_wildcard(t *testing.T) { } func TestAccAzureRMAppServiceCertificateOrder_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - if os.Getenv("ARM_RUN_TEST_APP_SERVICE_CERTIFICATE") == "" { t.Skip("Skipping as ARM_RUN_TEST_APP_SERVICE_CERTIFICATE is not specified") return diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_custom_hostname_binding_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_custom_hostname_binding_test.go index dc82b2701352..944b74a52cfc 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_custom_hostname_binding_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_custom_hostname_binding_test.go @@ -9,7 +9,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -70,11 +69,6 @@ func testAccAzureRMAppServiceCustomHostnameBinding_basic(t *testing.T, appServic } func testAccAzureRMAppServiceCustomHostnameBinding_requiresImport(t *testing.T, appServiceEnv, domainEnv string) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_app_service_custom_hostname_binding", "test") resource.Test(t, resource.TestCase{ diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_plan_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_plan_test.go index 03f43e3f6748..30cfb3d52bbb 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_plan_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_plan_test.go @@ -8,7 +8,6 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -63,10 +62,6 @@ func TestAccAzureRMAppServicePlan_basicLinux(t *testing.T) { } func TestAccAzureRMAppServicePlan_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } data := acceptance.BuildTestData(t, "azurerm_app_service_plan", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_slot_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_slot_test.go index cf02ada394e9..777493cc5075 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_slot_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_slot_test.go @@ -11,7 +11,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -34,11 +33,6 @@ func TestAccAzureRMAppServiceSlot_basic(t *testing.T) { } func TestAccAzureRMAppServiceSlot_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_app_service_slot", "test") resource.ParallelTest(t, resource.TestCase{ diff --git a/azurerm/internal/services/web/tests/resource_arm_app_service_test.go b/azurerm/internal/services/web/tests/resource_arm_app_service_test.go index b99b41c215bc..5acb93cc831c 100644 --- a/azurerm/internal/services/web/tests/resource_arm_app_service_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_app_service_test.go @@ -12,7 +12,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -38,11 +37,6 @@ func TestAccAzureRMAppService_basic(t *testing.T) { } func TestAccAzureRMAppService_requiresImport(t *testing.T) { - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - data := acceptance.BuildTestData(t, "azurerm_app_service", "test") resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, diff --git a/azurerm/internal/services/web/tests/resource_arm_function_app_test.go b/azurerm/internal/services/web/tests/resource_arm_function_app_test.go index 22465ea3938a..205a0af9a642 100644 --- a/azurerm/internal/services/web/tests/resource_arm_function_app_test.go +++ b/azurerm/internal/services/web/tests/resource_arm_function_app_test.go @@ -9,7 +9,6 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/features" "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" @@ -41,11 +40,6 @@ func TestAccAzureRMFunctionApp_basic(t *testing.T) { func TestAccAzureRMFunctionApp_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_function_app", "test") - if !features.ShouldResourcesBeImported() { - t.Skip("Skipping since resources aren't required to be imported") - return - } - resource.ParallelTest(t, resource.TestCase{ PreCheck: func() { acceptance.PreCheck(t) }, Providers: acceptance.SupportedProviders,