From a497b8e20e31d406185254674668ba30e34a7fe8 Mon Sep 17 00:00:00 2001 From: arcturusZhang Date: Wed, 25 Dec 2019 12:16:18 +0800 Subject: [PATCH] Fix CI failure --- .../services/compute/data_source_disk_encryption_set.go | 5 +---- .../services/compute/resource_arm_disk_encryption_set.go | 2 +- .../compute/tests/resource_arm_disk_encryption_set_test.go | 4 ++-- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/azurerm/internal/services/compute/data_source_disk_encryption_set.go b/azurerm/internal/services/compute/data_source_disk_encryption_set.go index 970aaad765910..449a917b426bb 100644 --- a/azurerm/internal/services/compute/data_source_disk_encryption_set.go +++ b/azurerm/internal/services/compute/data_source_disk_encryption_set.go @@ -18,10 +18,7 @@ func dataSourceArmDiskEncryptionSet() *schema.Resource { Read: dataSourceArmDiskEncryptionSetRead, Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), + Read: schema.DefaultTimeout(5 * time.Minute), }, Schema: map[string]*schema.Schema{ diff --git a/azurerm/internal/services/compute/resource_arm_disk_encryption_set.go b/azurerm/internal/services/compute/resource_arm_disk_encryption_set.go index ee99beabe9780..0df0f2782008a 100644 --- a/azurerm/internal/services/compute/resource_arm_disk_encryption_set.go +++ b/azurerm/internal/services/compute/resource_arm_disk_encryption_set.go @@ -3,7 +3,6 @@ package compute import ( "context" "fmt" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "log" "time" @@ -14,6 +13,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate" + "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/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" diff --git a/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go b/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go index 8382261c95801..8714ee80c38f3 100644 --- a/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go +++ b/azurerm/internal/services/compute/tests/resource_arm_disk_encryption_set_test.go @@ -2,8 +2,6 @@ package tests import ( "fmt" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "log" "testing" @@ -12,6 +10,8 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/terraform" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" + "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/utils" )