From f989e9b2fb2ea42a09726061f045fb0e279d848f Mon Sep 17 00:00:00 2001 From: kt Date: Tue, 25 May 2021 12:56:58 -0700 Subject: [PATCH] sdkv2 shim - apimanagement (#11864) --- .../api_management_api_data_source.go | 56 ++-- .../api_management_api_data_source_test.go | 9 +- .../api_management_api_diagnostic_resource.go | 61 ++-- ...management_api_diagnostic_resource_test.go | 23 +- ...anagement_api_operation_policy_resource.go | 29 +- ...ment_api_operation_policy_resource_test.go | 23 +- .../api_management_api_operation_resource.go | 51 ++-- ..._management_api_operation_resource_test.go | 33 +-- .../api_management_api_policy_resource.go | 29 +- ...api_management_api_policy_resource_test.go | 23 +- .../api_management_api_resource.go | 115 ++++---- .../api_management_api_resource_test.go | 65 ++--- .../api_management_api_schema_resource.go | 31 +- ...api_management_api_schema_resource_test.go | 27 +- ..._management_api_version_set_data_source.go | 24 +- ...gement_api_version_set_data_source_test.go | 5 +- ...api_management_api_version_set_resource.go | 35 ++- ...anagement_api_version_set_resource_test.go | 27 +- ...anagement_authorization_server_resource.go | 99 ++++--- ...ment_authorization_server_resource_test.go | 27 +- .../api_management_backend_resource.go | 133 +++++---- .../api_management_backend_resource_test.go | 37 ++- .../api_management_certificate_resource.go | 41 ++- ...pi_management_certificate_resource_test.go | 27 +- .../api_management_custom_domain_resource.go | 60 ++-- ..._management_custom_domain_resource_test.go | 21 +- .../api_management_data_source.go | 126 ++++---- .../api_management_data_source_test.go | 17 +- .../api_management_diagnostic_resource.go | 41 ++- ...api_management_diagnostic_resource_test.go | 23 +- .../api_management_email_template_resource.go | 35 ++- ...management_email_template_resource_test.go | 19 +- .../api_management_group_data_source.go | 22 +- .../api_management_group_data_source_test.go | 5 +- .../api_management_group_resource.go | 35 ++- .../api_management_group_resource_test.go | 25 +- .../api_management_group_user_resource.go | 25 +- ...api_management_group_user_resource_test.go | 13 +- ...nagement_identity_provider_aad_resource.go | 39 ++- ...ent_identity_provider_aad_resource_test.go | 19 +- ...ement_identity_provider_aadb2c_resource.go | 48 ++- ..._identity_provider_aadb2c_resource_test.go | 13 +- ...ent_identity_provider_facebook_resource.go | 31 +- ...dentity_provider_facebook_resource_test.go | 19 +- ...ement_identity_provider_google_resource.go | 31 +- ..._identity_provider_google_resource_test.go | 19 +- ...nt_identity_provider_microsoft_resource.go | 31 +- ...entity_provider_microsoft_resource_test.go | 19 +- ...ment_identity_provider_twitter_resource.go | 31 +- ...identity_provider_twitter_resource_test.go | 19 +- .../api_management_logger_resource.go | 53 ++-- .../api_management_logger_resource_test.go | 35 ++- .../api_management_named_value_resource.go | 39 ++- ...pi_management_named_value_resource_test.go | 15 +- ...gement_openid_connect_provider_resource.go | 37 ++- ...t_openid_connect_provider_resource_test.go | 23 +- .../api_management_policy_resource.go | 31 +- .../api_management_policy_resource_test.go | 19 +- .../api_management_product_api_resource.go | 25 +- ...pi_management_product_api_resource_test.go | 13 +- .../api_management_product_data_source.go | 28 +- ...api_management_product_data_source_test.go | 5 +- .../api_management_product_group_resource.go | 25 +- ..._management_product_group_resource_test.go | 13 +- .../api_management_product_policy_resource.go | 29 +- ...management_product_policy_resource_test.go | 19 +- .../api_management_product_resource.go | 41 ++- .../api_management_product_resource_test.go | 31 +- .../api_management_property_resource.go | 41 ++- .../api_management_property_resource_test.go | 15 +- .../apimanagement/api_management_resource.go | 276 +++++++++--------- .../api_management_resource_test.go | 151 +++++----- .../api_management_subscription_resource.go | 41 ++- ...i_management_subscription_resource_test.go | 33 +-- .../api_management_user_data_source.go | 24 +- .../api_management_user_data_source_test.go | 5 +- .../api_management_user_resource.go | 41 ++- .../api_management_user_resource_test.go | 37 ++- .../services/apimanagement/diff_suppress.go | 4 +- .../migration/api_version_set.go | 20 +- .../apimanagement/migration/property.go | 21 +- .../services/apimanagement/registration.go | 10 +- .../internal/services/apimanagement/schema.go | 24 +- .../apimanagement/schemaz/api_management.go | 94 +++--- .../validate/api_management_sku.go | 6 +- 85 files changed, 1530 insertions(+), 1610 deletions(-) diff --git a/azurerm/internal/services/apimanagement/api_management_api_data_source.go b/azurerm/internal/services/apimanagement/api_management_api_data_source.go index acd72605acf6..3ecedc1b417c 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_data_source.go +++ b/azurerm/internal/services/apimanagement/api_management_api_data_source.go @@ -5,27 +5,27 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceApiManagementApi() *schema.Resource { - return &schema.Resource{ +func dataSourceApiManagementApi() *pluginsdk.Resource { + return &pluginsdk.Resource{ Read: dataSourceApiManagementApiRead, - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), + Timeouts: &pluginsdk.ResourceTimeout{ + Read: pluginsdk.DefaultTimeout(5 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.ApiManagementApiName, }, @@ -35,65 +35,65 @@ func dataSourceApiManagementApi() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), "revision": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "is_current": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "is_online": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "path": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "protocols": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, "service_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "soap_pass_through": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "subscription_key_parameter_names": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "header": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "query": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, }, @@ -101,24 +101,24 @@ func dataSourceApiManagementApi() *schema.Resource { }, "subscription_required": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "version": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "version_set_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, }, } } -func dataSourceApiManagementApiRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceApiManagementApiRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_api_data_source_test.go b/azurerm/internal/services/apimanagement/api_management_api_data_source_test.go index 434cb1737dce..1270ae70e140 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_data_source_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_data_source_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "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/acceptance/check" ) @@ -16,10 +15,10 @@ func TestAccDataSourceAzureRMApiManagementApi_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management_api", "test") r := ApiManagementApiDataSourceResource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("display_name").HasValue("api1"), check.That(data.ResourceName).Key("path").HasValue("api1"), check.That(data.ResourceName).Key("protocols.#").HasValue("1"), @@ -37,10 +36,10 @@ func TestAccDataSourceAzureRMApiManagementApi_complete(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management_api", "test") r := ApiManagementApiDataSourceResource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("display_name").HasValue("Butter Parser"), check.That(data.ResourceName).Key("path").HasValue("butter-parser"), check.That(data.ResourceName).Key("protocols.#").HasValue("2"), diff --git a/azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource.go b/azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource.go index 323c51f5f736..8a89fc0e39be 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource.go @@ -6,8 +6,6 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -16,12 +14,13 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/set" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementApiDiagnostic() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementApiDiagnostic() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementApiDiagnosticCreateUpdate, Read: resourceApiManagementApiDiagnosticRead, Update: resourceApiManagementApiDiagnosticCreateUpdate, @@ -32,16 +31,16 @@ func resourceApiManagementApiDiagnostic() *schema.Resource { return err }), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "identifier": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ @@ -57,26 +56,26 @@ func resourceApiManagementApiDiagnostic() *schema.Resource { "api_name": schemaz.SchemaApiManagementApiName(), "api_management_logger_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.LoggerID, }, "sampling_percentage": { - Type: schema.TypeFloat, + Type: pluginsdk.TypeFloat, Optional: true, Computed: true, ValidateFunc: validation.FloatBetween(0.0, 100.0), }, "always_log_errors": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Computed: true, }, "verbosity": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ValidateFunc: validation.StringInSlice([]string{ @@ -87,13 +86,13 @@ func resourceApiManagementApiDiagnostic() *schema.Resource { }, "log_client_ip": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Computed: true, }, "http_correlation_protocol": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ValidateFunc: validation.StringInSlice([]string{ @@ -114,34 +113,34 @@ func resourceApiManagementApiDiagnostic() *schema.Resource { } } -func resourceApiManagementApiDiagnosticAdditionalContentSchema() *schema.Schema { +func resourceApiManagementApiDiagnosticAdditionalContentSchema() *pluginsdk.Schema { //lintignore:XS003 - return &schema.Schema{ - Type: schema.TypeList, + return &pluginsdk.Schema{ + Type: pluginsdk.TypeList, MaxItems: 1, Optional: true, Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "body_bytes": { - Type: schema.TypeInt, + Type: pluginsdk.TypeInt, Optional: true, ValidateFunc: validation.IntBetween(0, 8192), }, "headers_to_log": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, - Set: schema.HashString, + Set: pluginsdk.HashString, }, }, }, } } -func resourceApiManagementApiDiagnosticCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiDiagnosticCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiDiagnosticClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -235,7 +234,7 @@ func resourceApiManagementApiDiagnosticCreateUpdate(d *schema.ResourceData, meta return resourceApiManagementApiDiagnosticRead(d, meta) } -func resourceApiManagementApiDiagnosticRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiDiagnosticRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiDiagnosticClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -288,7 +287,7 @@ func resourceApiManagementApiDiagnosticRead(d *schema.ResourceData, meta interfa return nil } -func resourceApiManagementApiDiagnosticDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiDiagnosticDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiDiagnosticClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() @@ -322,7 +321,7 @@ func expandApiManagementApiDiagnosticHTTPMessageDiagnostic(input []interface{}) result.Body.Bytes = utils.Int32(int32(bodyBytes.(int))) } if headersSetRaw, ok := v["headers_to_log"]; ok { - headersSet := headersSetRaw.(*schema.Set).List() + headersSet := headersSetRaw.(*pluginsdk.Set).List() headers := []string{} for _, header := range headersSet { headers = append(headers, header.(string)) diff --git a/azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource_test.go b/azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource_test.go index addb400c6aee..3baaba870917 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_diagnostic_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementApiDiagnostic_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_diagnostic", "test") r := ApiManagementApiDiagnosticResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,17 +35,17 @@ func TestAccApiManagementApiDiagnostic_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_diagnostic", "test") r := ApiManagementApiDiagnosticResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -58,10 +57,10 @@ func TestAccApiManagementApiDiagnostic_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_diagnostic", "test") r := ApiManagementApiDiagnosticResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -73,10 +72,10 @@ func TestAccApiManagementApiDiagnostic_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_diagnostic", "test") r := ApiManagementApiDiagnosticResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -84,7 +83,7 @@ func TestAccApiManagementApiDiagnostic_complete(t *testing.T) { }) } -func (ApiManagementApiDiagnosticResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementApiDiagnosticResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.ApiDiagnosticID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource.go b/azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource.go index bae4430258b8..e15d699e982a 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource.go @@ -8,19 +8,18 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "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/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementApiOperationPolicy() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementApiOperationPolicy() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementAPIOperationPolicyCreateUpdate, Read: resourceApiManagementAPIOperationPolicyRead, Update: resourceApiManagementAPIOperationPolicyCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementApiOperationPolicy() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), @@ -45,7 +44,7 @@ func resourceApiManagementApiOperationPolicy() *schema.Resource { "operation_id": schemaz.SchemaApiManagementChildName(), "xml_content": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ConflictsWith: []string{"xml_link"}, @@ -53,7 +52,7 @@ func resourceApiManagementApiOperationPolicy() *schema.Resource { }, "xml_link": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ConflictsWith: []string{"xml_content"}, }, @@ -61,7 +60,7 @@ func resourceApiManagementApiOperationPolicy() *schema.Resource { } } -func resourceApiManagementAPIOperationPolicyCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAPIOperationPolicyCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiOperationPoliciesClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -123,7 +122,7 @@ func resourceApiManagementAPIOperationPolicyCreateUpdate(d *schema.ResourceData, return resourceApiManagementAPIOperationPolicyRead(d, meta) } -func resourceApiManagementAPIOperationPolicyRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAPIOperationPolicyRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiOperationPoliciesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -162,7 +161,7 @@ func resourceApiManagementAPIOperationPolicyRead(d *schema.ResourceData, meta in return nil } -func resourceApiManagementAPIOperationPolicyDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAPIOperationPolicyDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiOperationPoliciesClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource_test.go b/azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource_test.go index 7b6ecc91fd64..2879fb605a51 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_operation_policy_resource_test.go @@ -6,12 +6,11 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,10 +21,10 @@ func TestAccApiManagementAPIOperationPolicy_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation_policy", "test") r := ApiManagementApiOperationPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -42,10 +41,10 @@ func TestAccApiManagementAPIOperationPolicy_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation_policy", "test") r := ApiManagementApiOperationPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -57,16 +56,16 @@ func TestAccApiManagementAPIOperationPolicy_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation_policy", "test") r := ApiManagementApiOperationPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, { Config: r.updated(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -83,10 +82,10 @@ func TestAccApiManagementAPIOperationPolicy_rawXml(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation_policy", "test") r := ApiManagementApiOperationPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.rawXml(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -94,7 +93,7 @@ func TestAccApiManagementAPIOperationPolicy_rawXml(t *testing.T) { }) } -func (ApiManagementApiOperationPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementApiOperationPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_api_operation_resource.go b/azurerm/internal/services/apimanagement/api_management_api_operation_resource.go index 01cf62c13359..a934c744686b 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_operation_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_api_operation_resource.go @@ -7,19 +7,18 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "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/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementApiOperation() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementApiOperation() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementApiOperationCreateUpdate, Read: resourceApiManagementApiOperationRead, Update: resourceApiManagementApiOperationCreateUpdate, @@ -27,14 +26,14 @@ func resourceApiManagementApiOperation() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "operation_id": schemaz.SchemaApiManagementChildName(), "api_name": schemaz.SchemaApiManagementApiName(), @@ -44,34 +43,34 @@ func resourceApiManagementApiOperation() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "method": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "url_template": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "request": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, @@ -85,17 +84,17 @@ func resourceApiManagementApiOperation() *schema.Resource { }, "response": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "status_code": { - Type: schema.TypeInt, + Type: pluginsdk.TypeInt, Required: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, @@ -111,7 +110,7 @@ func resourceApiManagementApiOperation() *schema.Resource { } } -func resourceApiManagementApiOperationCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiOperationCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiOperationsClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -180,7 +179,7 @@ func resourceApiManagementApiOperationCreateUpdate(d *schema.ResourceData, meta return resourceApiManagementApiOperationRead(d, meta) } -func resourceApiManagementApiOperationRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiOperationRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiOperationsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -236,7 +235,7 @@ func resourceApiManagementApiOperationRead(d *schema.ResourceData, meta interfac return nil } -func resourceApiManagementApiOperationDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiOperationDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiOperationsClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_api_operation_resource_test.go b/azurerm/internal/services/apimanagement/api_management_api_operation_resource_test.go index 57bc4d153161..756de16e1849 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_operation_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_operation_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementApiOperation_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation", "test") r := ApiManagementApiOperationResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagementApiOperation_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation", "test") r := ApiManagementApiOperationResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -51,10 +50,10 @@ func TestAccApiManagementApiOperation_customMethod(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation", "test") r := ApiManagementApiOperationResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.customMethod(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("method").HasValue("HAMMERTIME"), ), @@ -67,10 +66,10 @@ func TestAccApiManagementApiOperation_headers(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation", "test") r := ApiManagementApiOperationResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.headers(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -82,17 +81,17 @@ func TestAccApiManagementApiOperation_requestRepresentations(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation", "test") r := ApiManagementApiOperationResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.requestRepresentation(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.requestRepresentationUpdated(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -105,17 +104,17 @@ func TestAccApiManagementApiOperation_representations(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_operation", "test") r := ApiManagementApiOperationResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.representation(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.representationUpdated(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -123,7 +122,7 @@ func TestAccApiManagementApiOperation_representations(t *testing.T) { }) } -func (ApiManagementApiOperationResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementApiOperationResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_api_policy_resource.go b/azurerm/internal/services/apimanagement/api_management_api_policy_resource.go index 19ee83b12b92..1f510653bcc6 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_policy_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_api_policy_resource.go @@ -8,19 +8,18 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "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/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementApiPolicy() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementApiPolicy() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementAPIPolicyCreateUpdate, Read: resourceApiManagementAPIPolicyRead, Update: resourceApiManagementAPIPolicyCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementApiPolicy() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), @@ -43,7 +42,7 @@ func resourceApiManagementApiPolicy() *schema.Resource { "api_name": schemaz.SchemaApiManagementApiName(), "xml_content": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ConflictsWith: []string{"xml_link"}, @@ -51,7 +50,7 @@ func resourceApiManagementApiPolicy() *schema.Resource { }, "xml_link": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ConflictsWith: []string{"xml_content"}, }, @@ -59,7 +58,7 @@ func resourceApiManagementApiPolicy() *schema.Resource { } } -func resourceApiManagementAPIPolicyCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAPIPolicyCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiPoliciesClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -125,7 +124,7 @@ func resourceApiManagementAPIPolicyCreateUpdate(d *schema.ResourceData, meta int return resourceApiManagementAPIPolicyRead(d, meta) } -func resourceApiManagementAPIPolicyRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAPIPolicyRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiPoliciesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -167,7 +166,7 @@ func resourceApiManagementAPIPolicyRead(d *schema.ResourceData, meta interface{} return nil } -func resourceApiManagementAPIPolicyDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAPIPolicyDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiPoliciesClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_api_policy_resource_test.go b/azurerm/internal/services/apimanagement/api_management_api_policy_resource_test.go index 58eb12f352ba..2a5a64e8c732 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_policy_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_policy_resource_test.go @@ -6,12 +6,11 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,10 +21,10 @@ func TestAccApiManagementAPIPolicy_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_policy", "test") r := ApiManagementApiPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -42,10 +41,10 @@ func TestAccApiManagementAPIPolicy_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_policy", "test") r := ApiManagementApiPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -57,16 +56,16 @@ func TestAccApiManagementAPIPolicy_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_policy", "test") r := ApiManagementApiPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, { Config: r.customPolicy(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -83,10 +82,10 @@ func TestAccApiManagementAPIPolicy_customPolicy(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_policy", "test") r := ApiManagementApiPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.customPolicy(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -99,7 +98,7 @@ func TestAccApiManagementAPIPolicy_customPolicy(t *testing.T) { }) } -func (ApiManagementApiPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementApiPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_api_resource.go b/azurerm/internal/services/apimanagement/api_management_api_resource.go index 78ada848ed87..758db383c68d 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_api_resource.go @@ -9,20 +9,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementApi() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementApi() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementApiCreateUpdate, Read: resourceApiManagementApiRead, Update: resourceApiManagementApiCreateUpdate, @@ -30,14 +29,14 @@ func resourceApiManagementApi() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementApiName(), "api_management_name": schemaz.SchemaApiManagementName(), @@ -45,22 +44,22 @@ func resourceApiManagementApi() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "path": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.ApiManagementApiPath, }, "protocols": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.ProtocolHTTP), string(apimanagement.ProtocolHTTPS), @@ -69,7 +68,7 @@ func resourceApiManagementApi() *schema.Resource { }, "revision": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validation.StringIsNotEmpty, @@ -77,24 +76,24 @@ func resourceApiManagementApi() *schema.Resource { // Optional "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "import": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "content_value": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "content_format": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.Openapi), @@ -111,19 +110,19 @@ func resourceApiManagementApi() *schema.Resource { }, "wsdl_selector": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "service_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "endpoint_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, @@ -135,25 +134,25 @@ func resourceApiManagementApi() *schema.Resource { }, "service_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, }, "subscription_key_parameter_names": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "header": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "query": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, @@ -162,30 +161,30 @@ func resourceApiManagementApi() *schema.Resource { }, "subscription_required": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: true, }, "soap_pass_through": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "oauth2_authorization": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "authorization_server_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.ApiManagementChildName, }, "scope": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, // There is currently no validation, as any length and characters can be used in the field }, @@ -194,21 +193,21 @@ func resourceApiManagementApi() *schema.Resource { }, "openid_authentication": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "openid_provider_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.ApiManagementChildName, }, "bearer_token_sending_methods": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.BearerTokenSendingMethodsAuthorizationHeader), string(apimanagement.BearerTokenSendingMethodsQuery), @@ -221,23 +220,23 @@ func resourceApiManagementApi() *schema.Resource { // Computed "is_current": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "is_online": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "version": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, Optional: true, }, "version_set_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, Optional: true, }, @@ -245,7 +244,7 @@ func resourceApiManagementApi() *schema.Resource { } } -func resourceApiManagementApiCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -344,7 +343,7 @@ func resourceApiManagementApiCreateUpdate(d *schema.ResourceData, meta interface serviceUrl := d.Get("service_url").(string) subscriptionRequired := d.Get("subscription_required").(bool) - protocolsRaw := d.Get("protocols").(*schema.Set).List() + protocolsRaw := d.Get("protocols").(*pluginsdk.Set).List() protocols := expandApiManagementApiProtocols(protocolsRaw) subscriptionKeyParameterNamesRaw := d.Get("subscription_key_parameter_names").([]interface{}) @@ -402,7 +401,7 @@ func resourceApiManagementApiCreateUpdate(d *schema.ResourceData, meta interface return resourceApiManagementApiRead(d, meta) } -func resourceApiManagementApiRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -471,7 +470,7 @@ func resourceApiManagementApiRead(d *schema.ResourceData, meta interface{}) erro return nil } -func resourceApiManagementApiDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() @@ -597,7 +596,7 @@ func expandApiManagementOpenIDAuthenticationSettingsContract(input []interface{} openIDAuthorizationV := input[0].(map[string]interface{}) return &apimanagement.OpenIDAuthenticationSettingsContract{ OpenidProviderID: utils.String(openIDAuthorizationV["openid_provider_name"].(string)), - BearerTokenSendingMethods: expandApiManagementOpenIDAuthenticationSettingsBearerTokenSendingMethods(openIDAuthorizationV["bearer_token_sending_methods"].(*schema.Set).List()), + BearerTokenSendingMethods: expandApiManagementOpenIDAuthenticationSettingsBearerTokenSendingMethods(openIDAuthorizationV["bearer_token_sending_methods"].(*pluginsdk.Set).List()), } } @@ -633,7 +632,7 @@ func flattenApiManagementOpenIDAuthentication(input *apimanagement.OpenIDAuthent bearerTokenSendingMethods = append(bearerTokenSendingMethods, string(v)) } } - result["bearer_token_sending_methods"] = schema.NewSet(schema.HashString, bearerTokenSendingMethods) + result["bearer_token_sending_methods"] = pluginsdk.NewSet(pluginsdk.HashString, bearerTokenSendingMethods) return []interface{}{result} } diff --git a/azurerm/internal/services/apimanagement/api_management_api_resource_test.go b/azurerm/internal/services/apimanagement/api_management_api_resource_test.go index f2770d39f2e3..30853c59a314 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementApi_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("soap_pass_through").HasValue("false"), check.That(data.ResourceName).Key("is_current").HasValue("true"), @@ -40,10 +39,10 @@ func TestAccApiManagementApi_wordRevision(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.wordRevision(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("revision").HasValue("one-point-oh"), ), @@ -56,10 +55,10 @@ func TestAccApiManagementApi_blankPath(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.blankPath(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("soap_pass_through").HasValue("false"), check.That(data.ResourceName).Key("is_current").HasValue("true"), @@ -75,10 +74,10 @@ func TestAccApiManagementApi_version(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.versionSet(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("version").HasValue("v1"), ), @@ -91,10 +90,10 @@ func TestAccApiManagementApi_oauth2Authorization(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.oauth2Authorization(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -106,10 +105,10 @@ func TestAccApiManagementApi_openidAuthentication(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.openidAuthentication(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -121,10 +120,10 @@ func TestAccApiManagementApi_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -136,10 +135,10 @@ func TestAccApiManagementApi_soapPassthrough(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.soapPassthrough(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -151,10 +150,10 @@ func TestAccApiManagementApi_subscriptionRequired(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.subscriptionRequired(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("subscription_required").HasValue("false"), ), @@ -167,10 +166,10 @@ func TestAccApiManagementApi_importSwagger(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.importSwagger(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -190,10 +189,10 @@ func TestAccApiManagementApi_importWsdl(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.importWsdl(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -213,10 +212,10 @@ func TestAccApiManagementApi_importUpdate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.importWsdl(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -231,7 +230,7 @@ func TestAccApiManagementApi_importUpdate(t *testing.T) { }, { Config: r.importSwagger(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -251,10 +250,10 @@ func TestAccApiManagementApi_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api", "test") r := ApiManagementApiResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -262,7 +261,7 @@ func TestAccApiManagementApi_complete(t *testing.T) { }) } -func (ApiManagementApiResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementApiResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err @@ -483,9 +482,9 @@ resource "azurerm_api_management_authorization_server" "test" { resource_group_name = azurerm_resource_group.test.name api_management_name = azurerm_api_management.test.name display_name = "Test Group" - authorization_endpoint = "https://azacctest.hashicorptest.com/client/authorize" + authorization_endpoint = "https://azacceptance.hashicorptest.com/client/authorize" client_id = "42424242-4242-4242-4242-424242424242" - client_registration_endpoint = "https://azacctest.hashicorptest.com/client/register" + client_registration_endpoint = "https://azacceptance.hashicorptest.com/client/register" grant_types = [ "implicit", @@ -523,7 +522,7 @@ resource "azurerm_api_management_openid_connect_provider" "test" { client_id = "00001111-2222-3333-%d" client_secret = "%d-cwdavsxbacsaxZX-%d" display_name = "Initial Name" - metadata_endpoint = "https://azacctest.hashicorptest.com/example/foo" + metadata_endpoint = "https://azacceptance.hashicorptest.com/example/foo" } resource "azurerm_api_management_api" "test" { diff --git a/azurerm/internal/services/apimanagement/api_management_api_schema_resource.go b/azurerm/internal/services/apimanagement/api_management_api_schema_resource.go index 7d3818d74b11..b03bf8ff6850 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_schema_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_api_schema_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementApiSchema() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementApiSchema() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementApiSchemaCreateUpdate, Read: resourceApiManagementApiSchemaRead, Update: resourceApiManagementApiSchemaCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementApiSchema() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "schema_id": schemaz.SchemaApiManagementChildName(), "api_name": schemaz.SchemaApiManagementApiName(), @@ -45,13 +44,13 @@ func resourceApiManagementApiSchema() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "content_type": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "value": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, @@ -59,7 +58,7 @@ func resourceApiManagementApiSchema() *schema.Resource { } } -func resourceApiManagementApiSchemaCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiSchemaCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiSchemasClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -109,7 +108,7 @@ func resourceApiManagementApiSchemaCreateUpdate(d *schema.ResourceData, meta int return resourceApiManagementApiSchemaRead(d, meta) } -func resourceApiManagementApiSchemaRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiSchemaRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiSchemasClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -149,7 +148,7 @@ func resourceApiManagementApiSchemaRead(d *schema.ResourceData, meta interface{} return nil } -func resourceApiManagementApiSchemaDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiSchemaDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiSchemasClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_api_schema_resource_test.go b/azurerm/internal/services/apimanagement/api_management_api_schema_resource_test.go index 9d6d779b4321..97ac96b100d0 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_schema_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_schema_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementApiSchema_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_schema", "test") r := ApiManagementApiSchemaResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagementApiSchema_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_schema", "test") r := ApiManagementApiSchemaResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -47,7 +46,7 @@ func TestAccApiManagementApiSchema_requiresImport(t *testing.T) { }) } -func (ApiManagementApiSchemaResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementApiSchemaResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err @@ -75,7 +74,7 @@ resource "azurerm_api_management_api_schema" "test" { resource_group_name = azurerm_api_management_api.test.resource_group_name schema_id = "acctestSchema%d" content_type = "application/vnd.ms-azure-apim.xsd+xml" - value = file("testdata/api_management_api_schema.xml") + value = file("testdata/api_management_api_pluginsdk.xml") } `, r.template(data), data.RandomInteger) } @@ -85,12 +84,12 @@ func (r ApiManagementApiSchemaResource) requiresImport(data acceptance.TestData) %s resource "azurerm_api_management_api_schema" "import" { - api_name = azurerm_api_management_api_schema.test.api_name - api_management_name = azurerm_api_management_api_schema.test.api_management_name - resource_group_name = azurerm_api_management_api_schema.test.resource_group_name - schema_id = azurerm_api_management_api_schema.test.schema_id - content_type = azurerm_api_management_api_schema.test.content_type - value = azurerm_api_management_api_schema.test.value + api_name = azurerm_api_management_api_pluginsdk.test.api_name + api_management_name = azurerm_api_management_api_pluginsdk.test.api_management_name + resource_group_name = azurerm_api_management_api_pluginsdk.test.resource_group_name + schema_id = azurerm_api_management_api_pluginsdk.test.schema_id + content_type = azurerm_api_management_api_pluginsdk.test.content_type + value = azurerm_api_management_api_pluginsdk.test.value } `, r.basic(data)) } diff --git a/azurerm/internal/services/apimanagement/api_management_api_version_set_data_source.go b/azurerm/internal/services/apimanagement/api_management_api_version_set_data_source.go index 0b462f22a9de..e8f191135271 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_version_set_data_source.go +++ b/azurerm/internal/services/apimanagement/api_management_api_version_set_data_source.go @@ -7,22 +7,22 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceApiManagementApiVersionSet() *schema.Resource { - return &schema.Resource{ +func dataSourceApiManagementApiVersionSet() *pluginsdk.Resource { + return &pluginsdk.Resource{ Read: dataSourceApiManagementApiVersionSetRead, - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), + Timeouts: &pluginsdk.ResourceTimeout{ + Read: pluginsdk.DefaultTimeout(5 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildDataSourceName(), "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), @@ -30,34 +30,34 @@ func dataSourceApiManagementApiVersionSet() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementDataSourceName(), "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "versioning_scheme": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "version_header_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "version_query_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, }, } } -func dataSourceApiManagementApiVersionSetRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceApiManagementApiVersionSetRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiVersionSetClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_api_version_set_data_source_test.go b/azurerm/internal/services/apimanagement/api_management_api_version_set_data_source_test.go index 0b9e47398b17..509b18c727fb 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_version_set_data_source_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_version_set_data_source_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "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/acceptance/check" ) @@ -16,10 +15,10 @@ func TestAccDataSourceApiManagementApiVersionSet_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management_api_version_set", "test") r := ApiManagementApiVersionSetDataSource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("name").Exists(), check.That(data.ResourceName).Key("resource_group_name").Exists(), check.That(data.ResourceName).Key("api_management_name").Exists(), diff --git a/azurerm/internal/services/apimanagement/api_management_api_version_set_resource.go b/azurerm/internal/services/apimanagement/api_management_api_version_set_resource.go index a805f0ce9d36..d43fd6a0bd07 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_version_set_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_api_version_set_resource.go @@ -6,8 +6,6 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -15,12 +13,13 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementApiVersionSet() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementApiVersionSet() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementApiVersionSetCreateUpdate, Read: resourceApiManagementApiVersionSetRead, Update: resourceApiManagementApiVersionSetCreateUpdate, @@ -28,11 +27,11 @@ func resourceApiManagementApiVersionSet() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, SchemaVersion: 1, @@ -40,7 +39,7 @@ func resourceApiManagementApiVersionSet() *schema.Resource { 0: migration.ApiVersionSetV0ToV1{}, }), - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildName(), "resource_group_name": azure.SchemaResourceGroupName(), @@ -48,13 +47,13 @@ func resourceApiManagementApiVersionSet() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "versioning_scheme": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.VersioningSchemeHeader), @@ -64,20 +63,20 @@ func resourceApiManagementApiVersionSet() *schema.Resource { }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, }, "version_header_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, ConflictsWith: []string{"version_query_name"}, }, "version_query_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, ConflictsWith: []string{"version_header_name"}, @@ -86,7 +85,7 @@ func resourceApiManagementApiVersionSet() *schema.Resource { } } -func resourceApiManagementApiVersionSetCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiVersionSetCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiVersionSetClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -169,7 +168,7 @@ func resourceApiManagementApiVersionSetCreateUpdate(d *schema.ResourceData, meta return resourceApiManagementApiVersionSetRead(d, meta) } -func resourceApiManagementApiVersionSetRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiVersionSetRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiVersionSetClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -205,7 +204,7 @@ func resourceApiManagementApiVersionSetRead(d *schema.ResourceData, meta interfa return nil } -func resourceApiManagementApiVersionSetDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementApiVersionSetDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ApiVersionSetClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_api_version_set_resource_test.go b/azurerm/internal/services/apimanagement/api_management_api_version_set_resource_test.go index 49d604d91d69..58f3b11b34cb 100644 --- a/azurerm/internal/services/apimanagement/api_management_api_version_set_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_api_version_set_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementApiVersionSet_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_version_set", "test") r := ApiManagementApiVersionSetResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagementApiVersionSet_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_version_set", "test") r := ApiManagementApiVersionSetResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -51,10 +50,10 @@ func TestAccApiManagementApiVersionSet_header(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_version_set", "test") r := ApiManagementApiVersionSetResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.header(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -66,10 +65,10 @@ func TestAccApiManagementApiVersionSet_query(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_version_set", "test") r := ApiManagementApiVersionSetResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.query(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -81,10 +80,10 @@ func TestAccApiManagementApiVersionSet_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_api_version_set", "test") r := ApiManagementApiVersionSetResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("description").HasValue("TestDescription1"), check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("TestApiVersionSet1%d", data.RandomInteger)), @@ -92,7 +91,7 @@ func TestAccApiManagementApiVersionSet_update(t *testing.T) { }, { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("description").HasValue("TestDescription2"), check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("TestApiVersionSet2%d", data.RandomInteger)), @@ -102,7 +101,7 @@ func TestAccApiManagementApiVersionSet_update(t *testing.T) { }) } -func (ApiManagementApiVersionSetResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementApiVersionSetResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.ApiVersionSetID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_authorization_server_resource.go b/azurerm/internal/services/apimanagement/api_management_authorization_server_resource.go index 6012ef924dca..52a85fc563e3 100644 --- a/azurerm/internal/services/apimanagement/api_management_authorization_server_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_authorization_server_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementAuthorizationServer() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementAuthorizationServer() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementAuthorizationServerCreateUpdate, Read: resourceApiManagementAuthorizationServerRead, Update: resourceApiManagementAuthorizationServerCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementAuthorizationServer() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildName(), "api_management_name": schemaz.SchemaApiManagementName(), @@ -43,16 +42,16 @@ func resourceApiManagementAuthorizationServer() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "authorization_endpoint": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "authorization_methods": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.DELETE), string(apimanagement.GET), @@ -64,32 +63,32 @@ func resourceApiManagementAuthorizationServer() *schema.Resource { string(apimanagement.TRACE), }, false), }, - Set: schema.HashString, + Set: pluginsdk.HashString, }, "client_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "client_registration_endpoint": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "grant_types": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.AuthorizationCode), string(apimanagement.ClientCredentials), @@ -97,80 +96,80 @@ func resourceApiManagementAuthorizationServer() *schema.Resource { string(apimanagement.ResourceOwnerPassword), }, false), }, - Set: schema.HashString, + Set: pluginsdk.HashString, }, // Optional "bearer_token_sending_methods": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.AuthorizationHeader), string(apimanagement.Query), }, false), }, - Set: schema.HashString, + Set: pluginsdk.HashString, }, "client_authentication_method": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.Basic), string(apimanagement.Body), }, false), }, - Set: schema.HashString, + Set: pluginsdk.HashString, }, "client_secret": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, }, "default_scope": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "resource_owner_username": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "resource_owner_password": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, }, "support_state": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, }, "token_body_parameter": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "value": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, @@ -179,14 +178,14 @@ func resourceApiManagementAuthorizationServer() *schema.Resource { }, "token_endpoint": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, }, } } -func resourceApiManagementAuthorizationServerCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAuthorizationServerCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.AuthorizationServersClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -212,10 +211,10 @@ func resourceApiManagementAuthorizationServerCreateUpdate(d *schema.ResourceData clientId := d.Get("client_id").(string) clientRegistrationEndpoint := d.Get("client_registration_endpoint").(string) displayName := d.Get("display_name").(string) - grantTypesRaw := d.Get("grant_types").(*schema.Set).List() + grantTypesRaw := d.Get("grant_types").(*pluginsdk.Set).List() grantTypes := expandApiManagementAuthorizationServerGrantTypes(grantTypesRaw) - clientAuthenticationMethodsRaw := d.Get("client_authentication_method").(*schema.Set).List() + clientAuthenticationMethodsRaw := d.Get("client_authentication_method").(*pluginsdk.Set).List() clientAuthenticationMethods := expandApiManagementAuthorizationServerClientAuthenticationMethods(clientAuthenticationMethodsRaw) clientSecret := d.Get("client_secret").(string) defaultScope := d.Get("default_scope").(string) @@ -247,13 +246,13 @@ func resourceApiManagementAuthorizationServerCreateUpdate(d *schema.ResourceData }, } - authorizationMethodsRaw := d.Get("authorization_methods").(*schema.Set).List() + authorizationMethodsRaw := d.Get("authorization_methods").(*pluginsdk.Set).List() if len(authorizationMethodsRaw) > 0 { authorizationMethods := expandApiManagementAuthorizationServerAuthorizationMethods(authorizationMethodsRaw) params.AuthorizationServerContractProperties.AuthorizationMethods = authorizationMethods } - bearerTokenSendingMethodsRaw := d.Get("bearer_token_sending_methods").(*schema.Set).List() + bearerTokenSendingMethodsRaw := d.Get("bearer_token_sending_methods").(*pluginsdk.Set).List() if len(bearerTokenSendingMethodsRaw) > 0 { bearerTokenSendingMethods := expandApiManagementAuthorizationServerBearerTokenSendingMethods(bearerTokenSendingMethodsRaw) params.AuthorizationServerContractProperties.BearerTokenSendingMethods = bearerTokenSendingMethods @@ -280,7 +279,7 @@ func resourceApiManagementAuthorizationServerCreateUpdate(d *schema.ResourceData return resourceApiManagementAuthorizationServerRead(d, meta) } -func resourceApiManagementAuthorizationServerRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAuthorizationServerRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.AuthorizationServersClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -347,7 +346,7 @@ func resourceApiManagementAuthorizationServerRead(d *schema.ResourceData, meta i return nil } -func resourceApiManagementAuthorizationServerDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementAuthorizationServerDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.AuthorizationServersClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_authorization_server_resource_test.go b/azurerm/internal/services/apimanagement/api_management_authorization_server_resource_test.go index 7f0968b1b148..bfb197aca6d5 100644 --- a/azurerm/internal/services/apimanagement/api_management_authorization_server_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_authorization_server_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementAuthorizationServer_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_authorization_server", "test") r := ApiManagementAuthorizationServerResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagementAuthorizationServer_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_authorization_server", "test") r := ApiManagementAuthorizationServerResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -51,10 +50,10 @@ func TestAccApiManagementAuthorizationServer_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_authorization_server", "test") r := ApiManagementAuthorizationServerResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -62,7 +61,7 @@ func TestAccApiManagementAuthorizationServer_complete(t *testing.T) { }) } -func (ApiManagementAuthorizationServerResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementAuthorizationServerResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err @@ -89,9 +88,9 @@ resource "azurerm_api_management_authorization_server" "test" { resource_group_name = azurerm_resource_group.test.name api_management_name = azurerm_api_management.test.name display_name = "Test Group" - authorization_endpoint = "https://azacctest.hashicorptest.com/client/authorize" + authorization_endpoint = "https://azacceptance.hashicorptest.com/client/authorize" client_id = "42424242-4242-4242-4242-424242424242" - client_registration_endpoint = "https://azacctest.hashicorptest.com/client/register" + client_registration_endpoint = "https://azacceptance.hashicorptest.com/client/register" grant_types = [ "implicit", @@ -134,9 +133,9 @@ resource "azurerm_api_management_authorization_server" "test" { resource_group_name = azurerm_resource_group.test.name api_management_name = azurerm_api_management.test.name display_name = "Test Group" - authorization_endpoint = "https://azacctest.hashicorptest.com/client/authorize" + authorization_endpoint = "https://azacceptance.hashicorptest.com/client/authorize" client_id = "42424242-4242-4242-4242-424242424242" - client_registration_endpoint = "https://azacctest.hashicorptest.com/client/register" + client_registration_endpoint = "https://azacceptance.hashicorptest.com/client/register" grant_types = [ "authorizationCode", @@ -153,7 +152,7 @@ resource "azurerm_api_management_authorization_server" "test" { client_secret = "n1n3-m0re-s3a5on5-m0r1y" default_scope = "read write" - token_endpoint = "https://azacctest.hashicorptest.com/client/token" + token_endpoint = "https://azacceptance.hashicorptest.com/client/token" resource_owner_username = "rick" resource_owner_password = "C-193P" support_state = true diff --git a/azurerm/internal/services/apimanagement/api_management_backend_resource.go b/azurerm/internal/services/apimanagement/api_management_backend_resource.go index dfd1099f1fe9..fd12605070d0 100644 --- a/azurerm/internal/services/apimanagement/api_management_backend_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_backend_resource.go @@ -9,20 +9,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/validate" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementBackend() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementBackend() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementBackendCreateUpdate, Read: resourceApiManagementBackendRead, Update: resourceApiManagementBackendCreateUpdate, @@ -30,16 +29,16 @@ func resourceApiManagementBackend() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validate.ApiManagementBackendName, @@ -50,25 +49,25 @@ func resourceApiManagementBackend() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "credentials": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "authorization": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "parameter": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, AtLeastOneOf: []string{"credentials.0.authorization.0.parameter", "credentials.0.authorization.0.scheme"}, }, "scheme": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, AtLeastOneOf: []string{"credentials.0.authorization.0.parameter", "credentials.0.authorization.0.scheme"}, @@ -78,28 +77,28 @@ func resourceApiManagementBackend() *schema.Resource { AtLeastOneOf: []string{"credentials.0.authorization", "credentials.0.certificate", "credentials.0.header", "credentials.0.query"}, }, "certificate": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringIsNotEmpty, }, AtLeastOneOf: []string{"credentials.0.authorization", "credentials.0.certificate", "credentials.0.header", "credentials.0.query"}, }, "header": { - Type: schema.TypeMap, + Type: pluginsdk.TypeMap, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringIsNotEmpty, }, AtLeastOneOf: []string{"credentials.0.authorization", "credentials.0.certificate", "credentials.0.header", "credentials.0.query"}, }, "query": { - Type: schema.TypeMap, + Type: pluginsdk.TypeMap, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringIsNotEmpty, }, AtLeastOneOf: []string{"credentials.0.authorization", "credentials.0.certificate", "credentials.0.header", "credentials.0.query"}, @@ -109,13 +108,13 @@ func resourceApiManagementBackend() *schema.Resource { }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringLenBetween(1, 2000), }, "protocol": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.BackendProtocolHTTP), @@ -124,24 +123,24 @@ func resourceApiManagementBackend() *schema.Resource { }, "proxy": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "password": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, }, "url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "username": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, @@ -150,56 +149,56 @@ func resourceApiManagementBackend() *schema.Resource { }, "resource_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringLenBetween(1, 2000), }, "service_fabric_cluster": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, MaxItems: 1, Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "client_certificate_thumbprint": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "management_endpoints": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringIsNotEmpty, }, }, "max_partition_resolution_retries": { - Type: schema.TypeInt, + Type: pluginsdk.TypeInt, Required: true, }, "server_certificate_thumbprints": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Optional: true, ConflictsWith: []string{"service_fabric_cluster.0.server_x509_name"}, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.StringIsNotEmpty, }, }, "server_x509_name": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Optional: true, ConflictsWith: []string{"service_fabric_cluster.0.server_certificate_thumbprints"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "issuer_certificate_thumbprint": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, @@ -211,24 +210,24 @@ func resourceApiManagementBackend() *schema.Resource { }, "title": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringLenBetween(1, 300), }, "tls": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "validate_certificate_chain": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, AtLeastOneOf: []string{"tls.0.validate_certificate_chain", "tls.0.validate_certificate_name"}, }, "validate_certificate_name": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, AtLeastOneOf: []string{"tls.0.validate_certificate_chain", "tls.0.validate_certificate_name"}, }, @@ -237,7 +236,7 @@ func resourceApiManagementBackend() *schema.Resource { }, "url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, @@ -245,7 +244,7 @@ func resourceApiManagementBackend() *schema.Resource { } } -func resourceApiManagementBackendCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementBackendCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.BackendClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -322,7 +321,7 @@ func resourceApiManagementBackendCreateUpdate(d *schema.ResourceData, meta inter return resourceApiManagementBackendRead(d, meta) } -func resourceApiManagementBackendRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementBackendRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.BackendClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -375,7 +374,7 @@ func resourceApiManagementBackendRead(d *schema.ResourceData, meta interface{}) return nil } -func resourceApiManagementBackendDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementBackendDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.BackendClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() @@ -472,7 +471,7 @@ func expandApiManagementBackendServiceFabricCluster(input []interface{}) (error, } v := input[0].(map[string]interface{}) clientCertificatethumbprint := v["client_certificate_thumbprint"].(string) - managementEndpoints := v["management_endpoints"].(*schema.Set).List() + managementEndpoints := v["management_endpoints"].(*pluginsdk.Set).List() maxPartitionResolutionRetries := int32(v["max_partition_resolution_retries"].(int)) properties := apimanagement.BackendServiceFabricClusterProperties{ ClientCertificatethumbprint: utils.String(clientCertificatethumbprint), @@ -482,11 +481,11 @@ func expandApiManagementBackendServiceFabricCluster(input []interface{}) (error, serverCertificateThumbprintsUnset := true serverX509NamesUnset := true if serverCertificateThumbprints := v["server_certificate_thumbprints"]; serverCertificateThumbprints != nil { - properties.ServerCertificateThumbprints = utils.ExpandStringSlice(serverCertificateThumbprints.(*schema.Set).List()) + properties.ServerCertificateThumbprints = utils.ExpandStringSlice(serverCertificateThumbprints.(*pluginsdk.Set).List()) serverCertificateThumbprintsUnset = false } if serverX509Names := v["server_x509_name"]; serverX509Names != nil { - properties.ServerX509Names = expandApiManagementBackendServiceFabricClusterServerX509Names(serverX509Names.(*schema.Set).List()) + properties.ServerX509Names = expandApiManagementBackendServiceFabricClusterServerX509Names(serverX509Names.(*pluginsdk.Set).List()) serverX509NamesUnset = false } if serverCertificateThumbprintsUnset && serverX509NamesUnset { diff --git a/azurerm/internal/services/apimanagement/api_management_backend_resource_test.go b/azurerm/internal/services/apimanagement/api_management_backend_resource_test.go index ffadf39be80f..fcc1fe306239 100644 --- a/azurerm/internal/services/apimanagement/api_management_backend_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_backend_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementBackend_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_backend", "test") r := ApiManagementAuthorizationBackendResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data, "basic"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("protocol").HasValue("http"), check.That(data.ResourceName).Key("url").HasValue("https://acctest"), @@ -38,10 +37,10 @@ func TestAccApiManagementBackend_allProperties(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_backend", "test") r := ApiManagementAuthorizationBackendResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.allProperties(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("protocol").HasValue("http"), check.That(data.ResourceName).Key("url").HasValue("https://acctest"), @@ -73,10 +72,10 @@ func TestAccApiManagementBackend_credentialsNoCertificate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_backend", "test") r := ApiManagementAuthorizationBackendResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.credentialsNoCertificate(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -88,10 +87,10 @@ func TestAccApiManagementBackend_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_backend", "test") r := ApiManagementAuthorizationBackendResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data, "update"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("protocol").HasValue("http"), check.That(data.ResourceName).Key("url").HasValue("https://acctest"), @@ -99,7 +98,7 @@ func TestAccApiManagementBackend_update(t *testing.T) { }, { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("protocol").HasValue("soap"), check.That(data.ResourceName).Key("url").HasValue("https://updatedacctest"), @@ -116,7 +115,7 @@ func TestAccApiManagementBackend_update(t *testing.T) { }, { Config: r.basic(data, "update"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("protocol").HasValue("http"), check.That(data.ResourceName).Key("url").HasValue("https://acctest"), @@ -133,10 +132,10 @@ func TestAccApiManagementBackend_serviceFabric(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_backend", "test") r := ApiManagementAuthorizationBackendResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.serviceFabric(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("service_fabric_cluster.0.client_certificate_thumbprint").Exists(), ), @@ -149,7 +148,7 @@ func TestAccApiManagementBackend_disappears(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_backend", "test") r := ApiManagementAuthorizationBackendResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ data.DisappearsStep(acceptance.DisappearsStepData{ Config: func(d acceptance.TestData) string { return r.basic(d, "disappears") @@ -163,10 +162,10 @@ func TestAccApiManagementBackend_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_backend", "test") r := ApiManagementAuthorizationBackendResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data, "import"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -174,7 +173,7 @@ func TestAccApiManagementBackend_requiresImport(t *testing.T) { }) } -func (ApiManagementAuthorizationBackendResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementAuthorizationBackendResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err @@ -191,7 +190,7 @@ func (ApiManagementAuthorizationBackendResource) Exists(ctx context.Context, cli return utils.Bool(resp.ID != nil), nil } -func (r ApiManagementAuthorizationBackendResource) Destroy(ctx context.Context, client *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (r ApiManagementAuthorizationBackendResource) Destroy(ctx context.Context, client *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_certificate_resource.go b/azurerm/internal/services/apimanagement/api_management_certificate_resource.go index 2935e7e8af7b..b137514a03e6 100644 --- a/azurerm/internal/services/apimanagement/api_management_certificate_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_certificate_resource.go @@ -7,22 +7,21 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" keyVaultParse "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/parse" keyVaultValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementCertificate() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementCertificate() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementCertificateCreateUpdate, Read: resourceApiManagementCertificateRead, Update: resourceApiManagementCertificateCreateUpdate, @@ -30,14 +29,14 @@ func resourceApiManagementCertificate() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildName(), "resource_group_name": azure.SchemaResourceGroupName(), @@ -45,7 +44,7 @@ func resourceApiManagementCertificate() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "data": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, ValidateFunc: validation.StringIsBase64, @@ -54,14 +53,14 @@ func resourceApiManagementCertificate() *schema.Resource { }, "password": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, RequiredWith: []string{"data"}, }, "key_vault_secret_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: keyVaultValidate.NestedItemIdWithOptionalVersion, AtLeastOneOf: []string{"data", "key_vault_secret_id"}, @@ -69,31 +68,31 @@ func resourceApiManagementCertificate() *schema.Resource { }, "key_vault_identity_client_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.IsUUID, RequiredWith: []string{"key_vault_secret_id"}, }, "expiration": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "subject": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "thumbprint": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, }, } } -func resourceApiManagementCertificateCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementCertificateCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.CertificatesClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -159,7 +158,7 @@ func resourceApiManagementCertificateCreateUpdate(d *schema.ResourceData, meta i return resourceApiManagementCertificateRead(d, meta) } -func resourceApiManagementCertificateRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementCertificateRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.CertificatesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -204,7 +203,7 @@ func resourceApiManagementCertificateRead(d *schema.ResourceData, meta interface return nil } -func resourceApiManagementCertificateDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementCertificateDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.CertificatesClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_certificate_resource_test.go b/azurerm/internal/services/apimanagement/api_management_certificate_resource_test.go index 3d88e524cfb2..6312bcc79bd1 100644 --- a/azurerm/internal/services/apimanagement/api_management_certificate_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_certificate_resource_test.go @@ -8,11 +8,10 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -23,10 +22,10 @@ func TestAccApiManagementCertificate_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_certificate", "test") r := ApiManagementCertificateResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("expiration").Exists(), check.That(data.ResourceName).Key("subject").Exists(), @@ -50,10 +49,10 @@ func TestAccApiManagementCertificate_basicKeyVaultSystemIdentity(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_certificate", "test") r := ApiManagementCertificateResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basicKeyVaultSystemIdentity(data, "cert1"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("key_vault_secret_id").Exists(), check.That(data.ResourceName).Key("expiration").Exists(), @@ -69,10 +68,10 @@ func TestAccApiManagementCertificate_basicKeyVaultUserIdentity(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_certificate", "test") r := ApiManagementCertificateResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basicKeyVaultUserIdentity(data, "cert1"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("key_vault_secret_id").Exists(), check.That(data.ResourceName).Key("key_vault_identity_client_id").Exists(), @@ -91,10 +90,10 @@ func TestAccApiManagementCertificate_basicKeyVaultUpdate(t *testing.T) { certUpdatedRegex := regexp.MustCompile(fmt.Sprintf(`https://acct%d\.vault\.azure\.net/secrets/cert2/[a-z0-9]{32}`, data.RandomInteger)) - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basicKeyVaultSystemIdentity(data, "cert1"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("key_vault_secret_id").Exists(), check.That(data.ResourceName).Key("expiration").Exists(), @@ -104,7 +103,7 @@ func TestAccApiManagementCertificate_basicKeyVaultUpdate(t *testing.T) { }, { Config: r.basicKeyVaultSystemIdentity(data, "cert2"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("key_vault_secret_id").MatchesRegex(certUpdatedRegex), ), @@ -117,10 +116,10 @@ func TestAccApiManagementCertificate_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_certificate", "test") r := ApiManagementCertificateResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -128,7 +127,7 @@ func TestAccApiManagementCertificate_requiresImport(t *testing.T) { }) } -func (ApiManagementCertificateResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementCertificateResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_custom_domain_resource.go b/azurerm/internal/services/apimanagement/api_management_custom_domain_resource.go index 7dd596ff7769..51e2b7919e43 100644 --- a/azurerm/internal/services/apimanagement/api_management_custom_domain_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_custom_domain_resource.go @@ -7,8 +7,6 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" @@ -22,8 +20,8 @@ import ( var apiManagementCustomDomainResourceName = "azurerm_api_management_custom_domain" -func resourceApiManagementCustomDomain() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementCustomDomain() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: apiManagementCustomDomainCreateUpdate, Read: apiManagementCustomDomainRead, Update: apiManagementCustomDomainCreateUpdate, @@ -31,58 +29,58 @@ func resourceApiManagementCustomDomain() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "api_management_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: azure.ValidateResourceID, }, "management": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, AtLeastOneOf: []string{"management", "portal", "developer_portal", "proxy", "scm"}, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameSchema(), }, }, "portal": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, AtLeastOneOf: []string{"management", "portal", "developer_portal", "proxy", "scm"}, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameSchema(), }, }, "developer_portal": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, AtLeastOneOf: []string{"management", "portal", "developer_portal", "proxy", "scm"}, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameSchema(), }, }, "proxy": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, AtLeastOneOf: []string{"management", "portal", "developer_portal", "proxy", "scm"}, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameProxySchema(), }, }, "scm": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, AtLeastOneOf: []string{"management", "portal", "developer_portal", "proxy", "scm"}, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameSchema(), }, }, @@ -90,7 +88,7 @@ func resourceApiManagementCustomDomain() *schema.Resource { } } -func apiManagementCustomDomainCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func apiManagementCustomDomainCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ServiceClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -120,7 +118,7 @@ func apiManagementCustomDomainCreateUpdate(d *schema.ResourceData, meta interfac // Wait for the ProvisioningState to become "Succeeded" before attempting to update log.Printf("[DEBUG] Waiting for API Management Service %q (Resource Group: %q) to become ready", serviceName, resourceGroup) - stateConf := &resource.StateChangeConf{ + stateConf := &pluginsdk.StateChangeConf{ Pending: []string{"Updating", "Unknown"}, Target: []string{"Succeeded", "Ready"}, Refresh: apiManagementRefreshFunc(ctx, client, serviceName, resourceGroup), @@ -128,9 +126,9 @@ func apiManagementCustomDomainCreateUpdate(d *schema.ResourceData, meta interfac ContinuousTargetOccurence: 6, } if d.IsNewResource() { - stateConf.Timeout = d.Timeout(schema.TimeoutCreate) + stateConf.Timeout = d.Timeout(pluginsdk.TimeoutCreate) } else { - stateConf.Timeout = d.Timeout(schema.TimeoutUpdate) + stateConf.Timeout = d.Timeout(pluginsdk.TimeoutUpdate) } if _, err = stateConf.WaitForState(); err != nil { @@ -161,7 +159,7 @@ func apiManagementCustomDomainCreateUpdate(d *schema.ResourceData, meta interfac return apiManagementCustomDomainRead(d, meta) } -func apiManagementCustomDomainRead(d *schema.ResourceData, meta interface{}) error { +func apiManagementCustomDomainRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ServiceClient environment := meta.(*clients.Client).Account.Environment ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) @@ -203,7 +201,7 @@ func apiManagementCustomDomainRead(d *schema.ResourceData, meta interface{}) err return nil } -func apiManagementCustomDomainDelete(d *schema.ResourceData, meta interface{}) error { +func apiManagementCustomDomainDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ServiceClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() @@ -228,12 +226,12 @@ func apiManagementCustomDomainDelete(d *schema.ResourceData, meta interface{}) e // Wait for the ProvisioningState to become "Succeeded" before attempting to update log.Printf("[DEBUG] Waiting for API Management Service %q (Resource Group: %q) to become ready", serviceName, resourceGroup) - stateConf := &resource.StateChangeConf{ + stateConf := &pluginsdk.StateChangeConf{ Pending: []string{"Updating", "Unknown"}, Target: []string{"Succeeded", "Ready"}, Refresh: apiManagementRefreshFunc(ctx, client, serviceName, resourceGroup), MinTimeout: 1 * time.Minute, - Timeout: d.Timeout(schema.TimeoutDelete), + Timeout: d.Timeout(pluginsdk.TimeoutDelete), ContinuousTargetOccurence: 6, } @@ -258,7 +256,7 @@ func apiManagementCustomDomainDelete(d *schema.ResourceData, meta interface{}) e return nil } -func expandApiManagementCustomDomains(input *schema.ResourceData) *[]apimanagement.HostnameConfiguration { +func expandApiManagementCustomDomains(input *pluginsdk.ResourceData) *[]apimanagement.HostnameConfiguration { results := make([]apimanagement.HostnameConfiguration, 0) if managementRawVal, ok := input.GetOk("management"); ok { @@ -307,7 +305,7 @@ func expandApiManagementCustomDomains(input *schema.ResourceData) *[]apimanageme return &results } -func flattenApiManagementHostnameConfiguration(input *[]apimanagement.HostnameConfiguration, d *schema.ResourceData, name, apimHostNameSuffix string) []interface{} { +func flattenApiManagementHostnameConfiguration(input *[]apimanagement.HostnameConfiguration, d *pluginsdk.ResourceData, name, apimHostNameSuffix string) []interface{} { results := make([]interface{}, 0) if input == nil { return results diff --git a/azurerm/internal/services/apimanagement/api_management_custom_domain_resource_test.go b/azurerm/internal/services/apimanagement/api_management_custom_domain_resource_test.go index cb7afe6004d3..5bcb47162b3e 100644 --- a/azurerm/internal/services/apimanagement/api_management_custom_domain_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_custom_domain_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementCustomDomain_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_custom_domain", "test") r := ApiManagementCustomDomainResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagementCustomDomain_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_custom_domain", "test") r := ApiManagementCustomDomainResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -51,31 +50,31 @@ func TestAccApiManagementCustomDomain_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_custom_domain", "test") r := ApiManagementCustomDomainResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.proxyOnly(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.developerPortalOnly(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, }) } -func (ApiManagementCustomDomainResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementCustomDomainResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.CustomDomainID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_data_source.go b/azurerm/internal/services/apimanagement/api_management_data_source.go index 9deaa6d1427d..fc260e095450 100644 --- a/azurerm/internal/services/apimanagement/api_management_data_source.go +++ b/azurerm/internal/services/apimanagement/api_management_data_source.go @@ -10,23 +10,23 @@ import ( msiparse "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/msi/parse" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceApiManagementService() *schema.Resource { - return &schema.Resource{ +func dataSourceApiManagementService() *pluginsdk.Resource { + return &pluginsdk.Resource{ Read: dataSourceApiManagementRead, - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), + Timeouts: &pluginsdk.ResourceTimeout{ + Read: pluginsdk.DefaultTimeout(5 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementDataSourceName(), "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), @@ -34,58 +34,58 @@ func dataSourceApiManagementService() *schema.Resource { "location": azure.SchemaLocationForDataSource(), "public_ip_addresses": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, "private_ip_addresses": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, "publisher_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "publisher_email": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "sku_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "identity": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "type": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "principal_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "tenant_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "identity_ids": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, }, @@ -93,65 +93,65 @@ func dataSourceApiManagementService() *schema.Resource { }, "notification_sender_email": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "gateway_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "gateway_regional_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "portal_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "developer_portal_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "management_api_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "scm_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "additional_location": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "location": azure.SchemaLocationForDataSource(), "gateway_regional_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "public_ip_addresses": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, "private_ip_addresses": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, }, @@ -159,42 +159,42 @@ func dataSourceApiManagementService() *schema.Resource { }, "hostname_configuration": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "management": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementDataSourceHostnameSchema(), }, }, "portal": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementDataSourceHostnameSchema(), }, }, "developer_portal": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementDataSourceHostnameSchema(), }, }, "proxy": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementDataSourceHostnameProxySchema(), }, }, "scm": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementDataSourceHostnameSchema(), }, }, @@ -207,7 +207,7 @@ func dataSourceApiManagementService() *schema.Resource { } } -func dataSourceApiManagementRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceApiManagementRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ServiceClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -395,30 +395,30 @@ func flattenApiManagementDataSourceIdentity(identity *apimanagement.ServiceIdent return []interface{}{result}, nil } -func apiManagementDataSourceHostnameSchema() map[string]*schema.Schema { - return map[string]*schema.Schema{ +func apiManagementDataSourceHostnameSchema() map[string]*pluginsdk.Schema { + return map[string]*pluginsdk.Schema{ "host_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "key_vault_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "negotiate_client_certificate": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, } } -func apiManagementDataSourceHostnameProxySchema() map[string]*schema.Schema { +func apiManagementDataSourceHostnameProxySchema() map[string]*pluginsdk.Schema { hostnameSchema := apiManagementDataSourceHostnameSchema() - hostnameSchema["default_ssl_binding"] = &schema.Schema{ - Type: schema.TypeBool, + hostnameSchema["default_ssl_binding"] = &pluginsdk.Schema{ + Type: pluginsdk.TypeBool, Computed: true, } diff --git a/azurerm/internal/services/apimanagement/api_management_data_source_test.go b/azurerm/internal/services/apimanagement/api_management_data_source_test.go index 67691daf5cdd..8f6485bac191 100644 --- a/azurerm/internal/services/apimanagement/api_management_data_source_test.go +++ b/azurerm/internal/services/apimanagement/api_management_data_source_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "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/acceptance/check" ) @@ -16,10 +15,10 @@ func TestAccDataSourceApiManagement_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management", "test") r := ApiManagementDataSource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("publisher_email").HasValue("pub1@email.com"), check.That(data.ResourceName).Key("publisher_name").HasValue("pub1"), check.That(data.ResourceName).Key("sku_name").HasValue("Developer_1"), @@ -34,10 +33,10 @@ func TestAccDataSourceApiManagement_identitySystemAssigned(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management", "test") r := ApiManagementDataSource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.identitySystemAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("publisher_email").HasValue("pub1@email.com"), check.That(data.ResourceName).Key("publisher_name").HasValue("pub1"), check.That(data.ResourceName).Key("sku_name").HasValue("Developer_1"), @@ -54,10 +53,10 @@ func TestAccDataSourceApiManagement_identityUserAssigned(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management", "test") r := ApiManagementDataSource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.identityUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("publisher_email").HasValue("pub1@email.com"), check.That(data.ResourceName).Key("publisher_name").HasValue("pub1"), check.That(data.ResourceName).Key("sku_name").HasValue("Developer_1"), @@ -74,10 +73,10 @@ func TestAccDataSourceApiManagement_virtualNetwork(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management", "test") r := ApiManagementDataSource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.virtualNetwork(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("publisher_email").HasValue("pub1@email.com"), check.That(data.ResourceName).Key("publisher_name").HasValue("pub1"), check.That(data.ResourceName).Key("sku_name").HasValue("Premium_1"), diff --git a/azurerm/internal/services/apimanagement/api_management_diagnostic_resource.go b/azurerm/internal/services/apimanagement/api_management_diagnostic_resource.go index 382e4e6ae48c..692c30b0cc46 100644 --- a/azurerm/internal/services/apimanagement/api_management_diagnostic_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_diagnostic_resource.go @@ -6,8 +6,6 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -15,12 +13,13 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementDiagnostic() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementDiagnostic() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementDiagnosticCreateUpdate, Read: resourceApiManagementDiagnosticRead, Update: resourceApiManagementDiagnosticCreateUpdate, @@ -31,16 +30,16 @@ func resourceApiManagementDiagnostic() *schema.Resource { return err }), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "identifier": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ @@ -54,32 +53,32 @@ func resourceApiManagementDiagnostic() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "api_management_logger_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.LoggerID, }, "enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Deprecated: "this property has been removed from the API and will be removed in version 3.0 of the provider", }, "sampling_percentage": { - Type: schema.TypeFloat, + Type: pluginsdk.TypeFloat, Optional: true, Computed: true, ValidateFunc: validation.FloatBetween(0.0, 100.0), }, "always_log_errors": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Computed: true, }, "verbosity": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ValidateFunc: validation.StringInSlice([]string{ @@ -90,13 +89,13 @@ func resourceApiManagementDiagnostic() *schema.Resource { }, "log_client_ip": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Computed: true, }, "http_correlation_protocol": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ValidateFunc: validation.StringInSlice([]string{ @@ -117,7 +116,7 @@ func resourceApiManagementDiagnostic() *schema.Resource { } } -func resourceApiManagementDiagnosticCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementDiagnosticCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.DiagnosticClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -210,7 +209,7 @@ func resourceApiManagementDiagnosticCreateUpdate(d *schema.ResourceData, meta in return resourceApiManagementDiagnosticRead(d, meta) } -func resourceApiManagementDiagnosticRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementDiagnosticRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.DiagnosticClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -262,7 +261,7 @@ func resourceApiManagementDiagnosticRead(d *schema.ResourceData, meta interface{ return nil } -func resourceApiManagementDiagnosticDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementDiagnosticDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.DiagnosticClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_diagnostic_resource_test.go b/azurerm/internal/services/apimanagement/api_management_diagnostic_resource_test.go index e88552716c7e..309313727129 100644 --- a/azurerm/internal/services/apimanagement/api_management_diagnostic_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_diagnostic_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementDiagnostic_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_diagnostic", "test") r := ApiManagementDiagnosticResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,17 +35,17 @@ func TestAccApiManagementDiagnostic_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_diagnostic", "test") r := ApiManagementDiagnosticResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -58,10 +57,10 @@ func TestAccApiManagementDiagnostic_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_diagnostic", "test") r := ApiManagementDiagnosticResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -73,10 +72,10 @@ func TestAccApiManagementDiagnostic_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_diagnostic", "test") r := ApiManagementDiagnosticResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -84,7 +83,7 @@ func TestAccApiManagementDiagnostic_complete(t *testing.T) { }) } -func (ApiManagementDiagnosticResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementDiagnosticResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { diagnosticId, err := parse.DiagnosticID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_email_template_resource.go b/azurerm/internal/services/apimanagement/api_management_email_template_resource.go index a6d4eab77fde..c12254e5b48a 100644 --- a/azurerm/internal/services/apimanagement/api_management_email_template_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_email_template_resource.go @@ -7,20 +7,19 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementEmailTemplate() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementEmailTemplate() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementEmailTemplateCreateUpdate, Read: resourceApiManagementEmailTemplateRead, Update: resourceApiManagementEmailTemplateCreateUpdate, @@ -28,21 +27,21 @@ func resourceApiManagementEmailTemplate() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), // There is an open issue for the capitalization of the template names: https://github.com/Azure/azure-rest-api-specs/issues/13341 "template_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ @@ -63,28 +62,28 @@ func resourceApiManagementEmailTemplate() *schema.Resource { }, false), }, "body": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "subject": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, // Computed: "title": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, }, } } -func resourceApiManagementEmailTemplateCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementEmailTemplateCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.EmailTemplateClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) subscriptionId := meta.(*clients.Client).Account.SubscriptionId @@ -128,7 +127,7 @@ func resourceApiManagementEmailTemplateCreateUpdate(d *schema.ResourceData, meta return resourceApiManagementEmailTemplateRead(d, meta) } -func resourceApiManagementEmailTemplateRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementEmailTemplateRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.EmailTemplateClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -167,7 +166,7 @@ func resourceApiManagementEmailTemplateRead(d *schema.ResourceData, meta interfa return nil } -func resourceApiManagementEmailTemplateDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementEmailTemplateDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.EmailTemplateClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_email_template_resource_test.go b/azurerm/internal/services/apimanagement/api_management_email_template_resource_test.go index 52e983fc71cf..3c3323de3f37 100644 --- a/azurerm/internal/services/apimanagement/api_management_email_template_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_email_template_resource_test.go @@ -6,12 +6,11 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,10 +21,10 @@ func TestAccApiManagementEmailTemplate_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_email_template", "test") r := ApiManagementEmailTemplateResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -37,10 +36,10 @@ func TestAccApiManagementEmailTemplate_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_email_template", "test") r := ApiManagementEmailTemplateResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -52,10 +51,10 @@ func TestAccApiManagementEmailTemplate_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_email_template", "test") r := ApiManagementEmailTemplateResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("subject").HasValue("Please confirm your new customized $OrganizationName API account with this customized email"), ), @@ -63,7 +62,7 @@ func TestAccApiManagementEmailTemplate_update(t *testing.T) { data.ImportStep(), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("subject").HasValue("Please confirm your new customized $OrganizationName API account with this customized and updated email"), ), @@ -72,7 +71,7 @@ func TestAccApiManagementEmailTemplate_update(t *testing.T) { }) } -func (ApiManagementEmailTemplateResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementEmailTemplateResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.EmailTemplateID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_group_data_source.go b/azurerm/internal/services/apimanagement/api_management_group_data_source.go index ce4bd0beb128..f06055b04ba6 100644 --- a/azurerm/internal/services/apimanagement/api_management_group_data_source.go +++ b/azurerm/internal/services/apimanagement/api_management_group_data_source.go @@ -7,22 +7,22 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceApiManagementGroup() *schema.Resource { - return &schema.Resource{ +func dataSourceApiManagementGroup() *pluginsdk.Resource { + return &pluginsdk.Resource{ Read: dataSourceApiManagementGroupRead, - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), + Timeouts: &pluginsdk.ResourceTimeout{ + Read: pluginsdk.DefaultTimeout(5 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildDataSourceName(), "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), @@ -30,29 +30,29 @@ func dataSourceApiManagementGroup() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementDataSourceName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "external_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "type": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, }, } } -func dataSourceApiManagementGroupRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceApiManagementGroupRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.GroupClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_group_data_source_test.go b/azurerm/internal/services/apimanagement/api_management_group_data_source_test.go index 3537b7cf0106..b8321cbf2be2 100644 --- a/azurerm/internal/services/apimanagement/api_management_group_data_source_test.go +++ b/azurerm/internal/services/apimanagement/api_management_group_data_source_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "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/acceptance/check" ) @@ -16,10 +15,10 @@ func TestAccDataSourceApiManagementGroup_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management_group", "test") r := ApiManagementGroupDataSource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("display_name").HasValue("Test Group"), check.That(data.ResourceName).Key("description").HasValue(""), check.That(data.ResourceName).Key("external_id").HasValue(""), diff --git a/azurerm/internal/services/apimanagement/api_management_group_resource.go b/azurerm/internal/services/apimanagement/api_management_group_resource.go index a9660fc085c8..d9b7192f1414 100644 --- a/azurerm/internal/services/apimanagement/api_management_group_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_group_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementGroup() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementGroup() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementGroupCreateUpdate, Read: resourceApiManagementGroupRead, Update: resourceApiManagementGroupCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementGroup() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildName(), "resource_group_name": azure.SchemaResourceGroupName(), @@ -43,24 +42,24 @@ func resourceApiManagementGroup() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "external_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ForceNew: true, }, "type": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ForceNew: true, Default: string(apimanagement.Custom), @@ -73,7 +72,7 @@ func resourceApiManagementGroup() *schema.Resource { } } -func resourceApiManagementGroupCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementGroupCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.GroupClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -125,7 +124,7 @@ func resourceApiManagementGroupCreateUpdate(d *schema.ResourceData, meta interfa return resourceApiManagementGroupRead(d, meta) } -func resourceApiManagementGroupRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementGroupRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.GroupClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -163,7 +162,7 @@ func resourceApiManagementGroupRead(d *schema.ResourceData, meta interface{}) er return nil } -func resourceApiManagementGroupDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementGroupDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.GroupClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_group_resource_test.go b/azurerm/internal/services/apimanagement/api_management_group_resource_test.go index 56342ee747c6..8d29b4d514d4 100644 --- a/azurerm/internal/services/apimanagement/api_management_group_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_group_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementGroup_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_group", "test") r := ApiManagementGroupResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue("Test Group"), check.That(data.ResourceName).Key("type").HasValue("custom"), @@ -38,10 +37,10 @@ func TestAccApiManagementGroup_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_group", "test") r := ApiManagementGroupResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue("Test Group"), check.That(data.ResourceName).Key("type").HasValue("custom"), @@ -55,10 +54,10 @@ func TestAccApiManagementGroup_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_group", "test") r := ApiManagementGroupResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data, "Test Group", "A test description."), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue("Test Group"), check.That(data.ResourceName).Key("description").HasValue("A test description."), @@ -73,10 +72,10 @@ func TestAccApiManagementGroup_descriptionDisplayNameUpdate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_group", "test") r := ApiManagementGroupResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data, "Original Group", "The original description."), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue("Original Group"), check.That(data.ResourceName).Key("description").HasValue("The original description."), @@ -85,7 +84,7 @@ func TestAccApiManagementGroup_descriptionDisplayNameUpdate(t *testing.T) { }, { Config: r.complete(data, "Modified Group", "A modified description."), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue("Modified Group"), check.That(data.ResourceName).Key("description").HasValue("A modified description."), @@ -94,7 +93,7 @@ func TestAccApiManagementGroup_descriptionDisplayNameUpdate(t *testing.T) { }, { Config: r.complete(data, "Original Group", "The original description."), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue("Original Group"), check.That(data.ResourceName).Key("description").HasValue("The original description."), @@ -104,7 +103,7 @@ func TestAccApiManagementGroup_descriptionDisplayNameUpdate(t *testing.T) { }) } -func (ApiManagementGroupResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementGroupResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_group_user_resource.go b/azurerm/internal/services/apimanagement/api_management_group_user_resource.go index 6262568249da..72342ece79df 100644 --- a/azurerm/internal/services/apimanagement/api_management_group_user_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_group_user_resource.go @@ -7,32 +7,31 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "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/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementGroupUser() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementGroupUser() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementGroupUserCreate, Read: resourceApiManagementGroupUserRead, Delete: resourceApiManagementGroupUserDelete, // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "user_id": schemaz.SchemaApiManagementChildName(), "group_name": schemaz.SchemaApiManagementChildName(), @@ -44,7 +43,7 @@ func resourceApiManagementGroupUser() *schema.Resource { } } -func resourceApiManagementGroupUserCreate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementGroupUserCreate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.GroupUsersClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -79,7 +78,7 @@ func resourceApiManagementGroupUserCreate(d *schema.ResourceData, meta interface return resourceApiManagementGroupUserRead(d, meta) } -func resourceApiManagementGroupUserRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementGroupUserRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.GroupUsersClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -112,7 +111,7 @@ func resourceApiManagementGroupUserRead(d *schema.ResourceData, meta interface{} return nil } -func resourceApiManagementGroupUserDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementGroupUserDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.GroupUsersClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_group_user_resource_test.go b/azurerm/internal/services/apimanagement/api_management_group_user_resource_test.go index 43b70c1b9864..3b363d11a57a 100644 --- a/azurerm/internal/services/apimanagement/api_management_group_user_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_group_user_resource_test.go @@ -7,11 +7,10 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,10 +21,10 @@ func TestAccAzureRMApiManagementGroupUser_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_group_user", "test") r := ApiManagementGroupUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -37,10 +36,10 @@ func TestAccAzureRMApiManagementGroupUser_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_group_user", "test") r := ApiManagementGroupUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -48,7 +47,7 @@ func TestAccAzureRMApiManagementGroupUser_requiresImport(t *testing.T) { }) } -func (ApiManagementGroupUserResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementGroupUserResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_aad_resource.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_aad_resource.go index b0902ed914a1..b4ecb4bf78b4 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_aad_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_aad_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementIdentityProviderAAD() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementIdentityProviderAAD() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementIdentityProviderAADCreateUpdate, Read: resourceApiManagementIdentityProviderAADRead, Update: resourceApiManagementIdentityProviderAADCreateUpdate, @@ -28,41 +27,41 @@ func resourceApiManagementIdentityProviderAAD() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), "client_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.IsUUID, }, "client_secret": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, }, "allowed_tenants": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Required: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validation.IsUUID, }, }, "signin_tenant": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.IsUUID, }, @@ -70,7 +69,7 @@ func resourceApiManagementIdentityProviderAAD() *schema.Resource { } } -func resourceApiManagementIdentityProviderAADCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderAADCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -121,7 +120,7 @@ func resourceApiManagementIdentityProviderAADCreateUpdate(d *schema.ResourceData return resourceApiManagementIdentityProviderAADRead(d, meta) } -func resourceApiManagementIdentityProviderAADRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderAADRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -157,7 +156,7 @@ func resourceApiManagementIdentityProviderAADRead(d *schema.ResourceData, meta i return nil } -func resourceApiManagementIdentityProviderAADDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderAADDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_aad_resource_test.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_aad_resource_test.go index 925a2ad437ed..26e6ecb0b2b9 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_aad_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_aad_resource_test.go @@ -6,8 +6,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check" @@ -23,10 +22,10 @@ func TestAccApiManagementIdentityProviderAAD_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_aad", "test") r := ApiManagementIdentityProviderAADResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -38,10 +37,10 @@ func TestAccApiManagementIdentityProviderAAD_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_aad", "test") r := ApiManagementIdentityProviderAADResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("client_id").HasValue("00000000-0000-0000-0000-000000000000"), check.That(data.ResourceName).Key("client_secret").HasValue("00000000000000000000000000000000"), @@ -51,7 +50,7 @@ func TestAccApiManagementIdentityProviderAAD_update(t *testing.T) { }, { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("client_id").HasValue("11111111-1111-1111-1111-111111111111"), check.That(data.ResourceName).Key("client_secret").HasValue("11111111111111111111111111111111"), @@ -68,10 +67,10 @@ func TestAccApiManagementIdentityProviderAAD_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_aad", "test") r := ApiManagementIdentityProviderAADResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -79,7 +78,7 @@ func TestAccApiManagementIdentityProviderAAD_requiresImport(t *testing.T) { }) } -func (ApiManagementIdentityProviderAADResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementIdentityProviderAADResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.IdentityProviderID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_aadb2c_resource.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_aadb2c_resource.go index 28660047e357..f354c4776bfd 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_aadb2c_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_aadb2c_resource.go @@ -5,23 +5,21 @@ import ( "log" "time" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" - "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceArmApiManagementIdentityProviderAADB2C() *schema.Resource { - return &schema.Resource{ +func resourceArmApiManagementIdentityProviderAADB2C() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceArmApiManagementIdentityProviderAADB2CCreateUpdate, Read: resourceArmApiManagementIdentityProviderAADB2CRead, Update: resourceArmApiManagementIdentityProviderAADB2CCreateUpdate, @@ -29,26 +27,26 @@ func resourceArmApiManagementIdentityProviderAADB2C() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), "client_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.IsUUID, }, "client_secret": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, @@ -56,45 +54,45 @@ func resourceArmApiManagementIdentityProviderAADB2C() *schema.Resource { // For AADB2C identity providers, `allowed_tenants` must specify exactly one tenant "allowed_tenant": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "signin_tenant": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, // B2C tenant domains can be customized, and GUIDs might work here too ValidateFunc: validation.StringIsNotEmpty, }, "authority": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, // B2C login domains can be customized and don't necessarily end in b2clogin.com ValidateFunc: validation.StringIsNotEmpty, }, "signup_policy": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "signin_policy": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "profile_editing_policy": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, }, "password_reset_policy": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: validation.StringIsNotEmpty, }, @@ -102,7 +100,7 @@ func resourceArmApiManagementIdentityProviderAADB2C() *schema.Resource { } } -func resourceArmApiManagementIdentityProviderAADB2CCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceArmApiManagementIdentityProviderAADB2CCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -158,7 +156,7 @@ func resourceArmApiManagementIdentityProviderAADB2CCreateUpdate(d *schema.Resour return resourceArmApiManagementIdentityProviderAADB2CRead(d, meta) } -func resourceArmApiManagementIdentityProviderAADB2CRead(d *schema.ResourceData, meta interface{}) error { +func resourceArmApiManagementIdentityProviderAADB2CRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -202,7 +200,7 @@ func resourceArmApiManagementIdentityProviderAADB2CRead(d *schema.ResourceData, return nil } -func resourceArmApiManagementIdentityProviderAADB2CDelete(d *schema.ResourceData, meta interface{}) error { +func resourceArmApiManagementIdentityProviderAADB2CDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_aadb2c_resource_test.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_aadb2c_resource_test.go index 659cb68ec270..50a763bd07b2 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_aadb2c_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_aadb2c_resource_test.go @@ -8,8 +8,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check" @@ -35,10 +34,10 @@ func TestAccAzureRMApiManagementIdentityProviderAADB2C_basic(t *testing.T) { r := ApiManagementIdentityProviderAADB2CResource{} b2cConfig := testAccAzureRMApiManagementIdentityProviderAADB2C_getB2CConfig(t) - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data, b2cConfig), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -51,10 +50,10 @@ func TestAccAzureRMApiManagementIdentityProviderAADB2C_requiresImport(t *testing r := ApiManagementIdentityProviderAADB2CResource{} b2cConfig := testAccAzureRMApiManagementIdentityProviderAADB2C_getB2CConfig(t) - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data, b2cConfig), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -90,7 +89,7 @@ func testAccAzureRMApiManagementIdentityProviderAADB2C_getB2CConfig(t *testing.T return config } -func (ApiManagementIdentityProviderAADB2CResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementIdentityProviderAADB2CResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.IdentityProviderID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_facebook_resource.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_facebook_resource.go index 426b42e8077c..d8a384dd677c 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_facebook_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_facebook_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementIdentityProviderFacebook() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementIdentityProviderFacebook() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementIdentityProviderFacebookCreateUpdate, Read: resourceApiManagementIdentityProviderFacebookRead, Update: resourceApiManagementIdentityProviderFacebookCreateUpdate, @@ -28,26 +27,26 @@ func resourceApiManagementIdentityProviderFacebook() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), "app_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "app_secret": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, @@ -56,7 +55,7 @@ func resourceApiManagementIdentityProviderFacebook() *schema.Resource { } } -func resourceApiManagementIdentityProviderFacebookCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderFacebookCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -103,7 +102,7 @@ func resourceApiManagementIdentityProviderFacebookCreateUpdate(d *schema.Resourc return resourceApiManagementIdentityProviderFacebookRead(d, meta) } -func resourceApiManagementIdentityProviderFacebookRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderFacebookRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -137,7 +136,7 @@ func resourceApiManagementIdentityProviderFacebookRead(d *schema.ResourceData, m return nil } -func resourceApiManagementIdentityProviderFacebookDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderFacebookDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_facebook_resource_test.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_facebook_resource_test.go index fe72a4810282..eb43a5ff9faf 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_facebook_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_facebook_resource_test.go @@ -6,8 +6,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check" @@ -23,10 +22,10 @@ func TestAccApiManagementIdentityProviderFacebook_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_facebook", "test") r := ApiManagementIdentityProviderFacebookResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -38,10 +37,10 @@ func TestAccApiManagementIdentityProviderFacebook_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_facebook", "test") r := ApiManagementIdentityProviderFacebookResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("app_id").HasValue("00000000000000000000000000000000"), ), @@ -49,7 +48,7 @@ func TestAccApiManagementIdentityProviderFacebook_update(t *testing.T) { data.ImportStep("app_secret"), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("app_id").HasValue("11111111111111111111111111111111"), ), @@ -62,10 +61,10 @@ func TestAccApiManagementIdentityProviderFacebook_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_facebook", "test") r := ApiManagementIdentityProviderFacebookResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -73,7 +72,7 @@ func TestAccApiManagementIdentityProviderFacebook_requiresImport(t *testing.T) { }) } -func (ApiManagementIdentityProviderFacebookResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementIdentityProviderFacebookResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.IdentityProviderID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_google_resource.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_google_resource.go index 14e5a204707b..945fe6327733 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_google_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_google_resource.go @@ -7,21 +7,20 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "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/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementIdentityProviderGoogle() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementIdentityProviderGoogle() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementIdentityProviderGoogleCreateUpdate, Read: resourceApiManagementIdentityProviderGoogleRead, Update: resourceApiManagementIdentityProviderGoogleCreateUpdate, @@ -29,26 +28,26 @@ func resourceApiManagementIdentityProviderGoogle() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), "client_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.GoogleClientID, }, "client_secret": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, @@ -57,7 +56,7 @@ func resourceApiManagementIdentityProviderGoogle() *schema.Resource { } } -func resourceApiManagementIdentityProviderGoogleCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderGoogleCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -104,7 +103,7 @@ func resourceApiManagementIdentityProviderGoogleCreateUpdate(d *schema.ResourceD return resourceApiManagementIdentityProviderGoogleRead(d, meta) } -func resourceApiManagementIdentityProviderGoogleRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderGoogleRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -138,7 +137,7 @@ func resourceApiManagementIdentityProviderGoogleRead(d *schema.ResourceData, met return nil } -func resourceApiManagementIdentityProviderGoogleDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderGoogleDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_google_resource_test.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_google_resource_test.go index 9ca386c3b101..57cd8c932778 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_google_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_google_resource_test.go @@ -6,8 +6,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check" @@ -23,10 +22,10 @@ func TestAccApiManagementIdentityProviderGoogle_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_google", "test") r := ApiManagementIdentityProviderGoogleResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -38,10 +37,10 @@ func TestAccApiManagementIdentityProviderGoogle_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_google", "test") r := ApiManagementIdentityProviderGoogleResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("client_id").HasValue("00000000.apps.googleusercontent.com"), ), @@ -49,7 +48,7 @@ func TestAccApiManagementIdentityProviderGoogle_update(t *testing.T) { data.ImportStep("client_secret"), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("client_id").HasValue("11111111.apps.googleusercontent.com"), ), @@ -62,10 +61,10 @@ func TestAccApiManagementIdentityProviderGoogle_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_google", "test") r := ApiManagementIdentityProviderGoogleResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -73,7 +72,7 @@ func TestAccApiManagementIdentityProviderGoogle_requiresImport(t *testing.T) { }) } -func (ApiManagementIdentityProviderGoogleResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementIdentityProviderGoogleResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.IdentityProviderID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_microsoft_resource.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_microsoft_resource.go index 816cdcec06f8..e094a58b181a 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_microsoft_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_microsoft_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementIdentityProviderMicrosoft() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementIdentityProviderMicrosoft() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementIdentityProviderMicrosoftCreateUpdate, Read: resourceApiManagementIdentityProviderMicrosoftRead, Update: resourceApiManagementIdentityProviderMicrosoftCreateUpdate, @@ -28,26 +27,26 @@ func resourceApiManagementIdentityProviderMicrosoft() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), "client_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.IsUUID, }, "client_secret": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, @@ -56,7 +55,7 @@ func resourceApiManagementIdentityProviderMicrosoft() *schema.Resource { } } -func resourceApiManagementIdentityProviderMicrosoftCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderMicrosoftCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -103,7 +102,7 @@ func resourceApiManagementIdentityProviderMicrosoftCreateUpdate(d *schema.Resour return resourceApiManagementIdentityProviderMicrosoftRead(d, meta) } -func resourceApiManagementIdentityProviderMicrosoftRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderMicrosoftRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -137,7 +136,7 @@ func resourceApiManagementIdentityProviderMicrosoftRead(d *schema.ResourceData, return nil } -func resourceApiManagementIdentityProviderMicrosoftDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderMicrosoftDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_microsoft_resource_test.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_microsoft_resource_test.go index fb35324d16dd..dc5307411599 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_microsoft_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_microsoft_resource_test.go @@ -6,8 +6,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check" @@ -23,10 +22,10 @@ func TestAccApiManagementIdentityProviderMicrosoft_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_microsoft", "test") r := ApiManagementIdentityProviderMicrosoftResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -38,10 +37,10 @@ func TestAccApiManagementIdentityProviderMicrosoft_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_microsoft", "test") r := ApiManagementIdentityProviderMicrosoftResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("client_id").HasValue("00000000-0000-0000-0000-000000000000"), ), @@ -49,7 +48,7 @@ func TestAccApiManagementIdentityProviderMicrosoft_update(t *testing.T) { data.ImportStep("client_secret"), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("client_id").HasValue("11111111-1111-1111-1111-111111111111"), ), @@ -62,10 +61,10 @@ func TestAccApiManagementIdentityProviderMicrosoft_requiresImport(t *testing.T) data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_microsoft", "test") r := ApiManagementIdentityProviderMicrosoftResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -73,7 +72,7 @@ func TestAccApiManagementIdentityProviderMicrosoft_requiresImport(t *testing.T) }) } -func (ApiManagementIdentityProviderMicrosoftResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementIdentityProviderMicrosoftResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.IdentityProviderID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_twitter_resource.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_twitter_resource.go index 3de47e10ccbe..132913c46ae1 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_twitter_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_twitter_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementIdentityProviderTwitter() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementIdentityProviderTwitter() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementIdentityProviderTwitterCreateUpdate, Read: resourceApiManagementIdentityProviderTwitterRead, Update: resourceApiManagementIdentityProviderTwitterCreateUpdate, @@ -28,26 +27,26 @@ func resourceApiManagementIdentityProviderTwitter() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), "api_key": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "api_secret_key": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, @@ -56,7 +55,7 @@ func resourceApiManagementIdentityProviderTwitter() *schema.Resource { } } -func resourceApiManagementIdentityProviderTwitterCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderTwitterCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -103,7 +102,7 @@ func resourceApiManagementIdentityProviderTwitterCreateUpdate(d *schema.Resource return resourceApiManagementIdentityProviderTwitterRead(d, meta) } -func resourceApiManagementIdentityProviderTwitterRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderTwitterRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -137,7 +136,7 @@ func resourceApiManagementIdentityProviderTwitterRead(d *schema.ResourceData, me return nil } -func resourceApiManagementIdentityProviderTwitterDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementIdentityProviderTwitterDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.IdentityProviderClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_identity_provider_twitter_resource_test.go b/azurerm/internal/services/apimanagement/api_management_identity_provider_twitter_resource_test.go index c25ed46a2d3f..c26d6dc8a4be 100644 --- a/azurerm/internal/services/apimanagement/api_management_identity_provider_twitter_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_identity_provider_twitter_resource_test.go @@ -6,8 +6,7 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/acceptance/check" @@ -23,10 +22,10 @@ func TestAccApiManagementIdentityProviderTwitter_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_twitter", "test") r := ApiManagementIdentityProviderTwitterResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -38,10 +37,10 @@ func TestAccApiManagementIdentityProviderTwitter_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_twitter", "test") r := ApiManagementIdentityProviderTwitterResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("api_key").HasValue("00000000000000000000000000000000"), ), @@ -49,7 +48,7 @@ func TestAccApiManagementIdentityProviderTwitter_update(t *testing.T) { data.ImportStep("api_secret_key"), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("api_key").HasValue("11111111111111111111111111111111"), ), @@ -62,10 +61,10 @@ func TestAccApiManagementIdentityProviderTwitter_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_identity_provider_twitter", "test") r := ApiManagementIdentityProviderTwitterResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -73,7 +72,7 @@ func TestAccApiManagementIdentityProviderTwitter_requiresImport(t *testing.T) { }) } -func (ApiManagementIdentityProviderTwitterResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementIdentityProviderTwitterResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.IdentityProviderID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_logger_resource.go b/azurerm/internal/services/apimanagement/api_management_logger_resource.go index baf8fe1543c6..2bb07bafe526 100644 --- a/azurerm/internal/services/apimanagement/api_management_logger_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_logger_resource.go @@ -6,20 +6,19 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/eventhub/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementLogger() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementLogger() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementLoggerCreate, Read: resourceApiManagementLoggerRead, Update: resourceApiManagementLoggerUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementLogger() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildName(), "resource_group_name": azure.SchemaResourceGroupName(), @@ -43,27 +42,27 @@ func resourceApiManagementLogger() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "resource_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: azure.ValidateResourceID, }, "eventhub": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, MaxItems: 1, Optional: true, ForceNew: true, ConflictsWith: []string{"application_insights"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.ValidateEventHubName(), }, "connection_string": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, @@ -73,15 +72,15 @@ func resourceApiManagementLogger() *schema.Resource { }, "application_insights": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, MaxItems: 1, Optional: true, ForceNew: true, ConflictsWith: []string{"eventhub"}, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "instrumentation_key": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, @@ -91,20 +90,20 @@ func resourceApiManagementLogger() *schema.Resource { }, "buffered": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, }, } } -func resourceApiManagementLoggerCreate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementLoggerCreate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.LoggerClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -168,7 +167,7 @@ func resourceApiManagementLoggerCreate(d *schema.ResourceData, meta interface{}) return resourceApiManagementLoggerRead(d, meta) } -func resourceApiManagementLoggerRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementLoggerRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.LoggerClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -207,7 +206,7 @@ func resourceApiManagementLoggerRead(d *schema.ResourceData, meta interface{}) e return nil } -func resourceApiManagementLoggerUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementLoggerUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.LoggerClient ctx, cancel := timeouts.ForUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -241,7 +240,7 @@ func resourceApiManagementLoggerUpdate(d *schema.ResourceData, meta interface{}) return resourceApiManagementLoggerRead(d, meta) } -func resourceApiManagementLoggerDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementLoggerDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.LoggerClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() @@ -279,7 +278,7 @@ func expandApiManagementLoggerApplicationInsights(input []interface{}) map[strin return credentials } -func flattenApiManagementLoggerEventHub(d *schema.ResourceData, properties *apimanagement.LoggerContractProperties) []interface{} { +func flattenApiManagementLoggerEventHub(d *pluginsdk.ResourceData, properties *apimanagement.LoggerContractProperties) []interface{} { result := make([]interface{}, 0) if name := properties.Credentials["name"]; name != nil { eventHub := make(map[string]interface{}) diff --git a/azurerm/internal/services/apimanagement/api_management_logger_resource_test.go b/azurerm/internal/services/apimanagement/api_management_logger_resource_test.go index c7b710b33aa3..e4a3b4310420 100644 --- a/azurerm/internal/services/apimanagement/api_management_logger_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_logger_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementLogger_basicEventHub(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_logger", "test") r := ApiManagementLoggerResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basicEventHub(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("true"), check.That(data.ResourceName).Key("eventhub.#").HasValue("1"), @@ -45,10 +44,10 @@ func TestAccApiManagementLogger_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_logger", "test") r := ApiManagementLoggerResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basicEventHub(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("true"), check.That(data.ResourceName).Key("eventhub.#").HasValue("1"), @@ -64,10 +63,10 @@ func TestAccApiManagementLogger_basicApplicationInsights(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_logger", "test") r := ApiManagementLoggerResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basicApplicationInsights(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("true"), check.That(data.ResourceName).Key("eventhub.#").HasValue("0"), @@ -88,10 +87,10 @@ func TestAccApiManagementLogger_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_logger", "test") r := ApiManagementLoggerResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data, "Logger from Terraform test", "false"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("description").HasValue("Logger from Terraform test"), check.That(data.ResourceName).Key("buffered").HasValue("false"), @@ -114,10 +113,10 @@ func TestAccApiManagementLogger_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_logger", "test") r := ApiManagementLoggerResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basicApplicationInsights(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("true"), check.That(data.ResourceName).Key("description").HasValue(""), @@ -128,7 +127,7 @@ func TestAccApiManagementLogger_update(t *testing.T) { }, { Config: r.basicEventHub(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("true"), check.That(data.ResourceName).Key("description").HasValue(""), @@ -139,7 +138,7 @@ func TestAccApiManagementLogger_update(t *testing.T) { }, { Config: r.complete(data, "Logger from Terraform test", "false"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("false"), check.That(data.ResourceName).Key("description").HasValue("Logger from Terraform test"), @@ -150,7 +149,7 @@ func TestAccApiManagementLogger_update(t *testing.T) { }, { Config: r.complete(data, "Logger from Terraform update test", "true"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("true"), check.That(data.ResourceName).Key("description").HasValue("Logger from Terraform update test"), @@ -161,7 +160,7 @@ func TestAccApiManagementLogger_update(t *testing.T) { }, { Config: r.complete(data, "Logger from Terraform test", "false"), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("false"), check.That(data.ResourceName).Key("description").HasValue("Logger from Terraform test"), @@ -172,7 +171,7 @@ func TestAccApiManagementLogger_update(t *testing.T) { }, { Config: r.basicEventHub(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("buffered").HasValue("true"), check.That(data.ResourceName).Key("description").HasValue(""), @@ -184,7 +183,7 @@ func TestAccApiManagementLogger_update(t *testing.T) { }) } -func (ApiManagementLoggerResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementLoggerResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_named_value_resource.go b/azurerm/internal/services/apimanagement/api_management_named_value_resource.go index 9e8dcd1fb458..21e63ad85ee5 100644 --- a/azurerm/internal/services/apimanagement/api_management_named_value_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_named_value_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementNamedValue() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementNamedValue() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementNamedValueCreateUpdate, Read: resourceApiManagementNamedValueRead, Update: resourceApiManagementNamedValueCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementNamedValue() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildName(), "resource_group_name": azure.SchemaResourceGroupName(), @@ -43,36 +42,36 @@ func resourceApiManagementNamedValue() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "value": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, }, "secret": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tags": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, }, } } -func resourceApiManagementNamedValueCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementNamedValueCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.NamedValueClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -127,7 +126,7 @@ func resourceApiManagementNamedValueCreateUpdate(d *schema.ResourceData, meta in return resourceApiManagementNamedValueRead(d, meta) } -func resourceApiManagementNamedValueRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementNamedValueRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.NamedValueClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -168,7 +167,7 @@ func resourceApiManagementNamedValueRead(d *schema.ResourceData, meta interface{ return nil } -func resourceApiManagementNamedValueDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementNamedValueDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.NamedValueClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_named_value_resource_test.go b/azurerm/internal/services/apimanagement/api_management_named_value_resource_test.go index d189eefb9c2d..afe161490a8c 100644 --- a/azurerm/internal/services/apimanagement/api_management_named_value_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_named_value_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementNamedValue_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_named_value", "test") r := ApiManagementNamedValueResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,17 +35,17 @@ func TestAccApiManagementNamedValue_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_named_value", "test") r := ApiManagementNamedValueResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -54,7 +53,7 @@ func TestAccApiManagementNamedValue_update(t *testing.T) { }) } -func (ApiManagementNamedValueResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementNamedValueResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_openid_connect_provider_resource.go b/azurerm/internal/services/apimanagement/api_management_openid_connect_provider_resource.go index 92c0f9115c3a..0087de2e5529 100644 --- a/azurerm/internal/services/apimanagement/api_management_openid_connect_provider_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_openid_connect_provider_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementOpenIDConnectProvider() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementOpenIDConnectProvider() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementOpenIDConnectProviderCreateUpdate, Read: resourceApiManagementOpenIDConnectProviderRead, Update: resourceApiManagementOpenIDConnectProviderCreateUpdate, @@ -29,14 +28,14 @@ func resourceApiManagementOpenIDConnectProvider() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildName(), "resource_group_name": azure.SchemaResourceGroupName(), @@ -44,40 +43,40 @@ func resourceApiManagementOpenIDConnectProvider() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "client_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, }, "client_secret": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, }, "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "metadata_endpoint": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, }, } } -func resourceApiManagementOpenIDConnectProviderCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementOpenIDConnectProviderCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.OpenIdConnectClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -125,7 +124,7 @@ func resourceApiManagementOpenIDConnectProviderCreateUpdate(d *schema.ResourceDa return resourceApiManagementOpenIDConnectProviderRead(d, meta) } -func resourceApiManagementOpenIDConnectProviderRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementOpenIDConnectProviderRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.OpenIdConnectClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -162,7 +161,7 @@ func resourceApiManagementOpenIDConnectProviderRead(d *schema.ResourceData, meta return nil } -func resourceApiManagementOpenIDConnectProviderDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementOpenIDConnectProviderDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.OpenIdConnectClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_openid_connect_provider_resource_test.go b/azurerm/internal/services/apimanagement/api_management_openid_connect_provider_resource_test.go index 0d3031f490c8..0b8c7e4b6759 100644 --- a/azurerm/internal/services/apimanagement/api_management_openid_connect_provider_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_openid_connect_provider_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementOpenIDConnectProvider_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_openid_connect_provider", "test") r := ApiManagementOpenIDConnectProviderResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagementOpenIDConnectProvider_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_openid_connect_provider", "test") r := ApiManagementOpenIDConnectProviderResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -51,17 +50,17 @@ func TestAccApiManagementOpenIDConnectProvider_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_openid_connect_provider", "test") r := ApiManagementOpenIDConnectProviderResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep("client_secret"), { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -69,7 +68,7 @@ func TestAccApiManagementOpenIDConnectProvider_update(t *testing.T) { }) } -func (ApiManagementOpenIDConnectProviderResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementOpenIDConnectProviderResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err @@ -97,7 +96,7 @@ resource "azurerm_api_management_openid_connect_provider" "test" { client_id = "00001111-2222-3333-%d" client_secret = "%d-cwdavsxbacsaxZX-%d" display_name = "Initial Name" - metadata_endpoint = "https://azacctest.hashicorptest.com/example/foo" + metadata_endpoint = "https://azacceptance.hashicorptest.com/example/foo" } `, r.template(data), data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } @@ -130,7 +129,7 @@ resource "azurerm_api_management_openid_connect_provider" "test" { client_secret = "%d-423egvwdcsjx-%d" display_name = "Updated Name" description = "Example description" - metadata_endpoint = "https://azacctest.hashicorptest.com/example/updated" + metadata_endpoint = "https://azacceptance.hashicorptest.com/example/updated" } `, r.template(data), data.RandomInteger, data.RandomInteger, data.RandomInteger, data.RandomInteger) } diff --git a/azurerm/internal/services/apimanagement/api_management_policy_resource.go b/azurerm/internal/services/apimanagement/api_management_policy_resource.go index 864489bc9bbd..e7b2b1be2145 100644 --- a/azurerm/internal/services/apimanagement/api_management_policy_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_policy_resource.go @@ -7,7 +7,6 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" @@ -16,8 +15,8 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementPolicy() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementPolicy() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementPolicyCreateUpdate, Read: resourceApiManagementPolicyRead, Update: resourceApiManagementPolicyCreateUpdate, @@ -25,23 +24,23 @@ func resourceApiManagementPolicy() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "api_management_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: azure.ValidateResourceID, }, "xml_content": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ConflictsWith: []string{"xml_link"}, @@ -50,7 +49,7 @@ func resourceApiManagementPolicy() *schema.Resource { }, "xml_link": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ConflictsWith: []string{"xml_content"}, ExactlyOneOf: []string{"xml_link", "xml_content"}, @@ -59,7 +58,7 @@ func resourceApiManagementPolicy() *schema.Resource { } } -func resourceApiManagementPolicyCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementPolicyCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.PolicyClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -74,7 +73,7 @@ func resourceApiManagementPolicyCreateUpdate(d *schema.ResourceData, meta interf /* Other resources would have a check for d.IsNewResource() at this location, and would error out using `tf.ImportAsExistsError` if the resource already existed. - However, this is a sub-resource, and the API always returns a policy when queried, either a default policy or one configured by the user or by this resource. + However, this is a sub-resource, and the API always returns a policy when queried, either a default policy or one configured by the user or by this pluginsdk. Instead of the usual check, the resource documentation clearly states that any existing policy will be overwritten if the resource is used. */ @@ -122,7 +121,7 @@ func resourceApiManagementPolicyCreateUpdate(d *schema.ResourceData, meta interf return resourceApiManagementPolicyRead(d, meta) } -func resourceApiManagementPolicyRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementPolicyRead(d *pluginsdk.ResourceData, meta interface{}) error { serviceClient := meta.(*clients.Client).ApiManagement.ServiceClient client := meta.(*clients.Client).ApiManagement.PolicyClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) @@ -173,7 +172,7 @@ func resourceApiManagementPolicyRead(d *schema.ResourceData, meta interface{}) e return nil } -func resourceApiManagementPolicyDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementPolicyDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.PolicyClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_policy_resource_test.go b/azurerm/internal/services/apimanagement/api_management_policy_resource_test.go index 1fd4165b0fd9..01677d7088ca 100644 --- a/azurerm/internal/services/apimanagement/api_management_policy_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_policy_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementPolicy_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_policy", "test") r := ApiManagementPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,17 +35,17 @@ func TestAccApiManagementPolicy_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_policy", "test") r := ApiManagementPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep("xml_link"), { Config: r.customPolicy(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -58,10 +57,10 @@ func TestAccApiManagementPolicy_customPolicy(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_policy", "test") r := ApiManagementPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.customPolicy(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -69,7 +68,7 @@ func TestAccApiManagementPolicy_customPolicy(t *testing.T) { }) } -func (ApiManagementPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.PolicyID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_product_api_resource.go b/azurerm/internal/services/apimanagement/api_management_product_api_resource.go index c8452b4960ba..69f7de16edb5 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_api_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_product_api_resource.go @@ -7,32 +7,31 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "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/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementProductApi() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementProductApi() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementProductApiCreate, Read: resourceApiManagementProductApiRead, Delete: resourceApiManagementProductApiDelete, // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "api_name": schemaz.SchemaApiManagementApiName(), "product_id": schemaz.SchemaApiManagementChildName(), @@ -44,7 +43,7 @@ func resourceApiManagementProductApi() *schema.Resource { } } -func resourceApiManagementProductApiCreate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductApiCreate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductApisClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -78,7 +77,7 @@ func resourceApiManagementProductApiCreate(d *schema.ResourceData, meta interfac return resourceApiManagementProductApiRead(d, meta) } -func resourceApiManagementProductApiRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductApiRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductApisClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -119,7 +118,7 @@ func resourceApiManagementProductApiRead(d *schema.ResourceData, meta interface{ return nil } -func resourceApiManagementProductApiDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductApiDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductApisClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_product_api_resource_test.go b/azurerm/internal/services/apimanagement/api_management_product_api_resource_test.go index dd4866a5c04a..0a85976464d3 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_api_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_product_api_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementProductApi_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product_api", "test") r := ApiManagementProductAPIResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagementProductApi_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product_api", "test") r := ApiManagementProductAPIResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -47,7 +46,7 @@ func TestAccApiManagementProductApi_requiresImport(t *testing.T) { }) } -func (ApiManagementProductAPIResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementProductAPIResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_product_data_source.go b/azurerm/internal/services/apimanagement/api_management_product_data_source.go index ec06bd840055..d772624bf97a 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_data_source.go +++ b/azurerm/internal/services/apimanagement/api_management_product_data_source.go @@ -5,23 +5,23 @@ import ( "time" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceApiManagementProduct() *schema.Resource { - return &schema.Resource{ +func dataSourceApiManagementProduct() *pluginsdk.Resource { + return &pluginsdk.Resource{ Read: dataSourceApiManagementProductRead, - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), + Timeouts: &pluginsdk.ResourceTimeout{ + Read: pluginsdk.DefaultTimeout(5 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "product_id": schemaz.SchemaApiManagementChildDataSourceName(), "api_management_name": schemaz.SchemaApiManagementDataSourceName(), @@ -29,44 +29,44 @@ func dataSourceApiManagementProduct() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "subscription_required": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "approval_required": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "published": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Computed: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "terms": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "subscriptions_limit": { - Type: schema.TypeInt, + Type: pluginsdk.TypeInt, Computed: true, }, }, } } -func dataSourceApiManagementProductRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceApiManagementProductRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_product_data_source_test.go b/azurerm/internal/services/apimanagement/api_management_product_data_source_test.go index d3220de2e672..6c9b7200f743 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_data_source_test.go +++ b/azurerm/internal/services/apimanagement/api_management_product_data_source_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "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/acceptance/check" ) @@ -16,10 +15,10 @@ func TestAccDataSourceApiManagementProduct_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management_product", "test") r := ApiManagementProductDataSource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("product_id").HasValue("test-product"), check.That(data.ResourceName).Key("display_name").HasValue("Test Product"), check.That(data.ResourceName).Key("subscription_required").HasValue("true"), diff --git a/azurerm/internal/services/apimanagement/api_management_product_group_resource.go b/azurerm/internal/services/apimanagement/api_management_product_group_resource.go index 63847b304c9a..2e4c58d2e577 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_group_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_product_group_resource.go @@ -7,32 +7,31 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "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/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementProductGroup() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementProductGroup() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementProductGroupCreate, Read: resourceApiManagementProductGroupRead, Delete: resourceApiManagementProductGroupDelete, // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "product_id": schemaz.SchemaApiManagementChildName(), "group_name": schemaz.SchemaApiManagementChildName(), @@ -44,7 +43,7 @@ func resourceApiManagementProductGroup() *schema.Resource { } } -func resourceApiManagementProductGroupCreate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductGroupCreate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductGroupsClient ctx, cancel := timeouts.ForCreate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -78,7 +77,7 @@ func resourceApiManagementProductGroupCreate(d *schema.ResourceData, meta interf return resourceApiManagementProductGroupRead(d, meta) } -func resourceApiManagementProductGroupRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductGroupRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductGroupsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -111,7 +110,7 @@ func resourceApiManagementProductGroupRead(d *schema.ResourceData, meta interfac return nil } -func resourceApiManagementProductGroupDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductGroupDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductGroupsClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_product_group_resource_test.go b/azurerm/internal/services/apimanagement/api_management_product_group_resource_test.go index 94b5fb0573b9..f62b3a2aa2ce 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_group_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_product_group_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementProductGroup_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product_group", "test") r := ApiManagementProductGroupResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagementProductGroup_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product_group", "test") r := ApiManagementProductGroupResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -47,7 +46,7 @@ func TestAccApiManagementProductGroup_requiresImport(t *testing.T) { }) } -func (ApiManagementProductGroupResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementProductGroupResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_product_policy_resource.go b/azurerm/internal/services/apimanagement/api_management_product_policy_resource.go index 1087b3c36734..c34ec2439fb5 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_policy_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_product_policy_resource.go @@ -8,19 +8,18 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "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/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementProductPolicy() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementProductPolicy() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementProductPolicyCreateUpdate, Read: resourceApiManagementProductPolicyRead, Update: resourceApiManagementProductPolicyCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementProductPolicy() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "resource_group_name": azure.SchemaResourceGroupName(), "api_management_name": schemaz.SchemaApiManagementName(), @@ -43,7 +42,7 @@ func resourceApiManagementProductPolicy() *schema.Resource { "product_id": schemaz.SchemaApiManagementChildName(), "xml_content": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ConflictsWith: []string{"xml_link"}, @@ -51,7 +50,7 @@ func resourceApiManagementProductPolicy() *schema.Resource { }, "xml_link": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ConflictsWith: []string{"xml_content"}, }, @@ -59,7 +58,7 @@ func resourceApiManagementProductPolicy() *schema.Resource { } } -func resourceApiManagementProductPolicyCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductPolicyCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductPoliciesClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -120,7 +119,7 @@ func resourceApiManagementProductPolicyCreateUpdate(d *schema.ResourceData, meta return resourceApiManagementProductPolicyRead(d, meta) } -func resourceApiManagementProductPolicyRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductPolicyRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductPoliciesClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -157,7 +156,7 @@ func resourceApiManagementProductPolicyRead(d *schema.ResourceData, meta interfa return nil } -func resourceApiManagementProductPolicyDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductPolicyDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductPoliciesClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_product_policy_resource_test.go b/azurerm/internal/services/apimanagement/api_management_product_policy_resource_test.go index 25eb5cf351bb..6055088389e1 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_policy_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_product_policy_resource_test.go @@ -6,12 +6,11 @@ import ( "testing" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,10 +21,10 @@ func TestAccApiManagementProductPolicy_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product_policy", "test") r := ApiManagementProductPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -42,10 +41,10 @@ func TestAccApiManagementProductPolicy_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product_policy", "test") r := ApiManagementProductPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -57,16 +56,16 @@ func TestAccApiManagementProductPolicy_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product_policy", "test") r := ApiManagementProductPolicyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, { Config: r.updated(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -79,7 +78,7 @@ func TestAccApiManagementProductPolicy_update(t *testing.T) { }) } -func (ApiManagementProductPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementProductPolicyResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_product_resource.go b/azurerm/internal/services/apimanagement/api_management_product_resource.go index f837d1e64f2e..0c59191db95e 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_product_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementProduct() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementProduct() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementProductCreateUpdate, Read: resourceApiManagementProductRead, Update: resourceApiManagementProductCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementProduct() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "product_id": schemaz.SchemaApiManagementChildName(), "api_management_name": schemaz.SchemaApiManagementName(), @@ -43,45 +42,45 @@ func resourceApiManagementProduct() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "subscription_required": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Required: true, }, "published": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Required: true, }, "approval_required": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "terms": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "subscriptions_limit": { - Type: schema.TypeInt, + Type: pluginsdk.TypeInt, Optional: true, }, }, } } -func resourceApiManagementProductCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductsClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -154,7 +153,7 @@ func resourceApiManagementProductCreateUpdate(d *schema.ResourceData, meta inter return resourceApiManagementProductRead(d, meta) } -func resourceApiManagementProductRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -196,7 +195,7 @@ func resourceApiManagementProductRead(d *schema.ResourceData, meta interface{}) return nil } -func resourceApiManagementProductDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementProductDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ProductsClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_product_resource_test.go b/azurerm/internal/services/apimanagement/api_management_product_resource_test.go index c7ad8d9faef3..bb3aa748d047 100644 --- a/azurerm/internal/services/apimanagement/api_management_product_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_product_resource_test.go @@ -6,12 +6,11 @@ import ( "regexp" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,10 +21,10 @@ func TestAccApiManagementProduct_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product", "test") r := ApiManagementProductResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("approval_required").HasValue("false"), check.That(data.ResourceName).Key("description").HasValue(""), @@ -44,10 +43,10 @@ func TestAccApiManagementProduct_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product", "test") r := ApiManagementProductResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -59,10 +58,10 @@ func TestAccApiManagementProduct_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product", "test") r := ApiManagementProductResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("approval_required").HasValue("false"), check.That(data.ResourceName).Key("description").HasValue(""), @@ -76,7 +75,7 @@ func TestAccApiManagementProduct_update(t *testing.T) { data.ImportStep(), { Config: r.updated(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("approval_required").HasValue("true"), check.That(data.ResourceName).Key("description").HasValue(""), @@ -90,7 +89,7 @@ func TestAccApiManagementProduct_update(t *testing.T) { data.ImportStep(), { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("description").HasValue(""), check.That(data.ResourceName).Key("display_name").HasValue("Test Product"), @@ -107,10 +106,10 @@ func TestAccApiManagementProduct_subscriptionsLimit(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product", "test") r := ApiManagementProductResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.subscriptionLimits(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("approval_required").HasValue("true"), check.That(data.ResourceName).Key("subscription_required").HasValue("true"), @@ -125,10 +124,10 @@ func TestAccApiManagementProduct_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product", "test") r := ApiManagementProductResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("approval_required").HasValue("true"), check.That(data.ResourceName).Key("description").HasValue("This is an example description"), @@ -148,7 +147,7 @@ func TestAccApiManagementProduct_approvalRequiredError(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_product", "test") r := ApiManagementProductResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.approvalRequiredError(data), ExpectError: regexp.MustCompile("`subscription_required` must be true and `subscriptions_limit` must be greater than 0 to use `approval_required`"), @@ -156,7 +155,7 @@ func TestAccApiManagementProduct_approvalRequiredError(t *testing.T) { }) } -func (ApiManagementProductResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementProductResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_property_resource.go b/azurerm/internal/services/apimanagement/api_management_property_resource.go index 4aab015c5a36..e6ed23092633 100644 --- a/azurerm/internal/services/apimanagement/api_management_property_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_property_resource.go @@ -5,25 +5,22 @@ import ( "log" "time" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/migration" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementProperty() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementProperty() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementPropertyCreateUpdate, Read: resourceApiManagementPropertyRead, Update: resourceApiManagementPropertyCreateUpdate, @@ -34,11 +31,11 @@ func resourceApiManagementProperty() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, SchemaVersion: 1, @@ -46,7 +43,7 @@ func resourceApiManagementProperty() *schema.Resource { 0: migration.ApiPropertyV0ToV1{}, }), - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementChildName(), "resource_group_name": azure.SchemaResourceGroupName(), @@ -54,35 +51,35 @@ func resourceApiManagementProperty() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "value": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "secret": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tags": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, }, } } -func resourceApiManagementPropertyCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementPropertyCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.NamedValueClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -139,7 +136,7 @@ func resourceApiManagementPropertyCreateUpdate(d *schema.ResourceData, meta inte return resourceApiManagementPropertyRead(d, meta) } -func resourceApiManagementPropertyRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementPropertyRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.NamedValueClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -179,7 +176,7 @@ func resourceApiManagementPropertyRead(d *schema.ResourceData, meta interface{}) return nil } -func resourceApiManagementPropertyDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementPropertyDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.NamedValueClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_property_resource_test.go b/azurerm/internal/services/apimanagement/api_management_property_resource_test.go index f24a82cb5b2e..66e345157b71 100644 --- a/azurerm/internal/services/apimanagement/api_management_property_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_property_resource_test.go @@ -7,11 +7,10 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,10 +21,10 @@ func TestAccApiManagementProperty_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_property", "test") r := ApiManagementPropertyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("TestProperty%d", data.RandomInteger)), check.That(data.ResourceName).Key("value").HasValue("Test Value"), @@ -41,10 +40,10 @@ func TestAccApiManagementProperty_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_property", "test") r := ApiManagementPropertyResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("TestProperty%d", data.RandomInteger)), check.That(data.ResourceName).Key("value").HasValue("Test Value"), @@ -55,7 +54,7 @@ func TestAccApiManagementProperty_update(t *testing.T) { data.ImportStep(), { Config: r.update(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("display_name").HasValue(fmt.Sprintf("TestProperty2%d", data.RandomInteger)), check.That(data.ResourceName).Key("secret").HasValue("true"), @@ -67,7 +66,7 @@ func TestAccApiManagementProperty_update(t *testing.T) { }) } -func (ApiManagementPropertyResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementPropertyResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_resource.go b/azurerm/internal/services/apimanagement/api_management_resource.go index bb85ebf9bc23..ebabd0de34e9 100644 --- a/azurerm/internal/services/apimanagement/api_management_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_resource.go @@ -10,9 +10,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" "github.com/hashicorp/go-azure-helpers/response" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -23,6 +20,7 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/msi/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tags" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -47,8 +45,8 @@ var ( apimTlsRsaWithAes128CbcShaCiphers = "Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA" ) -func resourceApiManagementService() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementService() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementServiceCreateUpdate, Read: resourceApiManagementServiceRead, Update: resourceApiManagementServiceCreateUpdate, @@ -57,14 +55,14 @@ func resourceApiManagementService() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(3 * time.Hour), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(3 * time.Hour), - Delete: schema.DefaultTimeout(3 * time.Hour), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(3 * time.Hour), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(3 * time.Hour), + Delete: pluginsdk.DefaultTimeout(3 * time.Hour), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "name": schemaz.SchemaApiManagementName(), "resource_group_name": azure.SchemaResourceGroupName(), @@ -72,31 +70,31 @@ func resourceApiManagementService() *schema.Resource { "location": azure.SchemaLocation(), "publisher_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: apimValidate.ApiManagementServicePublisherName, }, "publisher_email": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: apimValidate.ApiManagementServicePublisherEmail, }, "sku_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: apimValidate.ApimSkuName(), }, "identity": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "type": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Default: string(apimanagement.None), ValidateFunc: validation.StringInSlice([]string{ @@ -107,19 +105,19 @@ func resourceApiManagementService() *schema.Resource { }, false), }, "principal_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "tenant_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "identity_ids": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Optional: true, MinItems: 1, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, ValidateFunc: validate.UserAssignedIdentityID, }, }, @@ -128,7 +126,7 @@ func resourceApiManagementService() *schema.Resource { }, "virtual_network_type": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Default: string(apimanagement.VirtualNetworkTypeNone), ValidateFunc: validation.StringInSlice([]string{ @@ -139,13 +137,13 @@ func resourceApiManagementService() *schema.Resource { }, "virtual_network_configuration": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "subnet_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: azure.ValidateResourceID, }, @@ -154,26 +152,26 @@ func resourceApiManagementService() *schema.Resource { }, "notification_sender_email": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, }, "additional_location": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "location": azure.SchemaLocation(), "virtual_network_configuration": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "subnet_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: azure.ValidateResourceID, @@ -183,22 +181,22 @@ func resourceApiManagementService() *schema.Resource { }, "gateway_regional_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "public_ip_addresses": { - Type: schema.TypeList, - Elem: &schema.Schema{ - Type: schema.TypeString, + Type: pluginsdk.TypeList, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, Computed: true, }, "private_ip_addresses": { - Type: schema.TypeList, - Elem: &schema.Schema{ - Type: schema.TypeString, + Type: pluginsdk.TypeList, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, Computed: true, }, @@ -207,25 +205,25 @@ func resourceApiManagementService() *schema.Resource { }, "certificate": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, MaxItems: 10, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "encoded_certificate": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, Sensitive: true, }, "certificate_password": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, }, "store_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringInSlice([]string{ string(apimanagement.CertificateAuthority), @@ -237,14 +235,14 @@ func resourceApiManagementService() *schema.Resource { }, "protocols": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "enable_http2": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, @@ -253,49 +251,49 @@ func resourceApiManagementService() *schema.Resource { }, "security": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "enable_backend_ssl30": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "enable_backend_tls10": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "enable_backend_tls11": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "enable_frontend_ssl30": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "enable_frontend_tls10": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "enable_frontend_tls11": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, // TODO: Remove in v3.0 "enable_triple_des_ciphers": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Computed: true, ConflictsWith: []string{"security.0.triple_des_ciphers_enabled"}, @@ -303,54 +301,54 @@ func resourceApiManagementService() *schema.Resource { }, "triple_des_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Computed: true, // TODO: v3.0 remove Computed and set Default: false ConflictsWith: []string{"security.0.enable_triple_des_ciphers"}, }, "tls_ecdhe_ecdsa_with_aes256_cbc_sha_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tls_ecdhe_ecdsa_with_aes128_cbc_sha_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tls_ecdhe_rsa_with_aes256_cbc_sha_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tls_ecdhe_rsa_with_aes128_cbc_sha_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tls_rsa_with_aes128_gcm_sha256_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tls_rsa_with_aes256_cbc_sha256_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tls_rsa_with_aes128_cbc_sha256_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tls_rsa_with_aes256_cbc_sha_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tls_rsa_with_aes128_cbc_sha_ciphers_enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, @@ -359,48 +357,48 @@ func resourceApiManagementService() *schema.Resource { }, "hostname_configuration": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "management": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameSchema(), }, AtLeastOneOf: []string{"hostname_configuration.0.management", "hostname_configuration.0.portal", "hostname_configuration.0.developer_portal", "hostname_configuration.0.proxy", "hostname_configuration.0.scm"}, }, "portal": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameSchema(), }, AtLeastOneOf: []string{"hostname_configuration.0.management", "hostname_configuration.0.portal", "hostname_configuration.0.developer_portal", "hostname_configuration.0.proxy", "hostname_configuration.0.scm"}, }, "developer_portal": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameSchema(), }, AtLeastOneOf: []string{"hostname_configuration.0.management", "hostname_configuration.0.portal", "hostname_configuration.0.developer_portal", "hostname_configuration.0.proxy", "hostname_configuration.0.scm"}, }, "proxy": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameProxySchema(), }, AtLeastOneOf: []string{"hostname_configuration.0.management", "hostname_configuration.0.portal", "hostname_configuration.0.developer_portal", "hostname_configuration.0.proxy", "hostname_configuration.0.scm"}, }, "scm": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ + Elem: &pluginsdk.Resource{ Schema: apiManagementResourceHostnameSchema(), }, AtLeastOneOf: []string{"hostname_configuration.0.management", "hostname_configuration.0.portal", "hostname_configuration.0.developer_portal", "hostname_configuration.0.proxy", "hostname_configuration.0.scm"}, @@ -411,15 +409,15 @@ func resourceApiManagementService() *schema.Resource { //lintignore:XS003 "policy": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - ConfigMode: schema.SchemaConfigModeAttr, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + ConfigMode: pluginsdk.SchemaConfigModeAttr, + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "xml_content": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ConflictsWith: []string{"policy.0.xml_link"}, @@ -427,7 +425,7 @@ func resourceApiManagementService() *schema.Resource { }, "xml_link": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ConflictsWith: []string{"policy.0.xml_content"}, }, @@ -436,14 +434,14 @@ func resourceApiManagementService() *schema.Resource { }, "sign_in": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Required: true, }, }, @@ -451,33 +449,33 @@ func resourceApiManagementService() *schema.Resource { }, "sign_up": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Required: true, }, "terms_of_service": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Required: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Required: true, }, "consent_required": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Required: true, }, "text": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, }, @@ -488,73 +486,73 @@ func resourceApiManagementService() *schema.Resource { }, "gateway_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "management_api_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "gateway_regional_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "public_ip_addresses": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, "private_ip_addresses": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Computed: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, "portal_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "developer_portal_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "scm_url": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "tenant_access": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, Computed: true, MaxItems: 1, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "enabled": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Required: true, }, "tenant_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "primary_key": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, Sensitive: true, }, "secondary_key": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, Sensitive: true, }, @@ -582,7 +580,7 @@ func resourceApiManagementService() *schema.Resource { } } -func resourceApiManagementServiceCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementServiceCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ServiceClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -752,7 +750,7 @@ func resourceApiManagementServiceCreateUpdate(d *schema.ResourceData, meta inter return resourceApiManagementServiceRead(d, meta) } -func resourceApiManagementServiceRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementServiceRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ServiceClient signInClient := meta.(*clients.Client).ApiManagement.SignInClient signUpClient := meta.(*clients.Client).ApiManagement.SignUpClient @@ -885,7 +883,7 @@ func resourceApiManagementServiceRead(d *schema.ResourceData, meta interface{}) return tags.FlattenAndSet(d, resp.Tags) } -func resourceApiManagementServiceDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementServiceDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.ServiceClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() @@ -912,7 +910,7 @@ func resourceApiManagementServiceDelete(d *schema.ResourceData, meta interface{} return nil } -func apiManagementRefreshFunc(ctx context.Context, client *apimanagement.ServiceClient, serviceName, resourceGroup string) resource.StateRefreshFunc { +func apiManagementRefreshFunc(ctx context.Context, client *apimanagement.ServiceClient, serviceName, resourceGroup string) pluginsdk.StateRefreshFunc { return func() (interface{}, string, error) { log.Printf("[DEBUG] Checking to see if API Management Service %q (Resource Group: %q) is available..", serviceName, resourceGroup) @@ -937,7 +935,7 @@ func apiManagementRefreshFunc(ctx context.Context, client *apimanagement.Service } } -func expandAzureRmApiManagementHostnameConfigurations(d *schema.ResourceData) *[]apimanagement.HostnameConfiguration { +func expandAzureRmApiManagementHostnameConfigurations(d *pluginsdk.ResourceData) *[]apimanagement.HostnameConfiguration { results := make([]apimanagement.HostnameConfiguration, 0) vs := d.Get("hostname_configuration") if vs == nil { @@ -1023,7 +1021,7 @@ func expandApiManagementCommonHostnameConfiguration(input map[string]interface{} return output } -func flattenApiManagementHostnameConfigurations(input *[]apimanagement.HostnameConfiguration, d *schema.ResourceData, name, apimHostNameSuffix string) []interface{} { +func flattenApiManagementHostnameConfigurations(input *[]apimanagement.HostnameConfiguration, d *pluginsdk.ResourceData, name, apimHostNameSuffix string) []interface{} { results := make([]interface{}, 0) if input == nil { return results @@ -1108,7 +1106,7 @@ func flattenApiManagementHostnameConfigurations(input *[]apimanagement.HostnameC } } -func expandAzureRmApiManagementCertificates(d *schema.ResourceData) *[]apimanagement.CertificateConfiguration { +func expandAzureRmApiManagementCertificates(d *pluginsdk.ResourceData) *[]apimanagement.CertificateConfiguration { vs := d.Get("certificate").([]interface{}) results := make([]apimanagement.CertificateConfiguration, 0) @@ -1134,7 +1132,7 @@ func expandAzureRmApiManagementCertificates(d *schema.ResourceData) *[]apimanage return &results } -func expandAzureRmApiManagementAdditionalLocations(d *schema.ResourceData, sku *apimanagement.ServiceSkuProperties) (*[]apimanagement.AdditionalLocation, error) { +func expandAzureRmApiManagementAdditionalLocations(d *pluginsdk.ResourceData, sku *apimanagement.ServiceSkuProperties) (*[]apimanagement.AdditionalLocation, error) { inputLocations := d.Get("additional_location").([]interface{}) parentVnetConfig := d.Get("virtual_network_configuration").([]interface{}) @@ -1216,7 +1214,7 @@ func expandAzureRmApiManagementIdentity(vs []interface{}) (*apimanagement.Servic var identityIdSet []interface{} if identityIds, exists := v["identity_ids"]; exists { - identityIdSet = identityIds.(*schema.Set).List() + identityIdSet = identityIds.(*pluginsdk.Set).List() } // If type contains `UserAssigned`, `identity_ids` must be specified and have at least 1 element @@ -1264,13 +1262,13 @@ func flattenAzureRmApiManagementMachineIdentity(identity *apimanagement.ServiceI } identityIds = append(identityIds, parsedId.ID()) } - result["identity_ids"] = schema.NewSet(schema.HashString, identityIds) + result["identity_ids"] = pluginsdk.NewSet(pluginsdk.HashString, identityIds) } return []interface{}{result}, nil } -func expandAzureRmApiManagementSkuName(d *schema.ResourceData) *apimanagement.ServiceSkuProperties { +func expandAzureRmApiManagementSkuName(d *pluginsdk.ResourceData) *apimanagement.ServiceSkuProperties { vs := d.Get("sku_name").(string) if len(vs) == 0 { @@ -1296,7 +1294,7 @@ func flattenApiManagementServiceSkuName(input *apimanagement.ServiceSkuPropertie return fmt.Sprintf("%s_%d", string(input.Name), *input.Capacity) } -func expandApiManagementCustomProperties(d *schema.ResourceData, skuIsConsumption bool) (map[string]*string, error) { +func expandApiManagementCustomProperties(d *pluginsdk.ResourceData, skuIsConsumption bool) (map[string]*string, error) { backendProtocolSsl3 := false backendProtocolTls10 := false backendProtocolTls11 := false @@ -1417,7 +1415,7 @@ func expandApiManagementCustomProperties(d *schema.ResourceData, skuIsConsumptio return customProperties, nil } -func expandAzureRmApiManagementVirtualNetworkConfigurations(d *schema.ResourceData) *apimanagement.VirtualNetworkConfiguration { +func expandAzureRmApiManagementVirtualNetworkConfigurations(d *pluginsdk.ResourceData) *apimanagement.VirtualNetworkConfiguration { vs := d.Get("virtual_network_configuration").([]interface{}) if len(vs) == 0 { return nil @@ -1630,7 +1628,7 @@ func expandApiManagementPolicies(input []interface{}) (*apimanagement.PolicyCont return nil, fmt.Errorf("Either `xml_content` or `xml_link` should be set if the `policy` block is defined.") } -func flattenApiManagementPolicies(d *schema.ResourceData, input apimanagement.PolicyContract) []interface{} { +func flattenApiManagementPolicies(d *pluginsdk.ResourceData, input apimanagement.PolicyContract) []interface{} { xmlContent := "" if props := input.PolicyContractProperties; props != nil { if props.Value != nil { diff --git a/azurerm/internal/services/apimanagement/api_management_resource_test.go b/azurerm/internal/services/apimanagement/api_management_resource_test.go index 2d6ad6666ddd..e6bfeee8e709 100644 --- a/azurerm/internal/services/apimanagement/api_management_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagement_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -36,10 +35,10 @@ func TestAccApiManagement_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -51,24 +50,24 @@ func TestAccApiManagement_skuUpgradeDowngrade(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.standardSku(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -80,10 +79,10 @@ func TestAccApiManagement_customProps(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.customProps(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("protocols.0.enable_http2").HasValue("false"), ), @@ -96,10 +95,10 @@ func TestAccApiManagement_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -126,10 +125,10 @@ func TestAccApiManagement_signInSignUpSettings(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.signInSignUpSettings(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -141,17 +140,17 @@ func TestAccApiManagement_policy(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.policyXmlContent(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.policyXmlLink(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -165,7 +164,7 @@ func TestAccApiManagement_policy(t *testing.T) { }, { Config: r.policyRemoved(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -177,10 +176,10 @@ func TestAccApiManagement_virtualNetworkInternal(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.virtualNetworkInternal(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("virtual_network_type").HasValue("Internal"), check.That(data.ResourceName).Key("private_ip_addresses.#").Exists(), @@ -194,17 +193,17 @@ func TestAccApiManagement_virtualNetworkInternalUpdate(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.virtualNetworkInternal(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -216,10 +215,10 @@ func TestAccApiManagement_virtualNetworkInternalAdditionalLocation(t *testing.T) data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.virtualNetworkInternalAdditionalLocation(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("virtual_network_type").HasValue("Internal"), check.That(data.ResourceName).Key("private_ip_addresses.#").Exists(), @@ -238,17 +237,17 @@ func TestAccApiManagement_identitySystemAssignedUpdateHostnameConfigurationsVers data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identitySystemAssignedUpdateHostnameConfigurationsKeyVaultId(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identitySystemAssignedUpdateHostnameConfigurationsVersionedKeyVaultIdUpdateCD(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -260,17 +259,17 @@ func TestAccApiManagement_identitySystemAssignedUpdateHostnameConfigurationsVers data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identitySystemAssignedUpdateHostnameConfigurationsKeyVaultId(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identitySystemAssignedUpdateHostnameConfigurationsVersionlessKeyVaultIdUpdateCD(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -282,10 +281,10 @@ func TestAccApiManagement_consumption(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.consumption(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -293,7 +292,7 @@ func TestAccApiManagement_consumption(t *testing.T) { }) } -func (ApiManagementResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.ApiManagementID(state.ID) if err != nil { return nil, err @@ -313,10 +312,10 @@ func TestAccApiManagement_identityUserAssigned(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identityUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -328,17 +327,17 @@ func TestAccApiManagement_identityNoneUpdateUserAssigned(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identityNone(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identityUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -350,17 +349,17 @@ func TestAccApiManagement_identityUserAssignedUpdateNone(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identityUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identityNone(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -372,10 +371,10 @@ func TestAccApiManagement_identitySystemAssigned(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identitySystemAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -387,17 +386,17 @@ func TestAccApiManagement_identitySystemAssignedUpdateNone(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identitySystemAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identityNone(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -409,17 +408,17 @@ func TestAccApiManagement_identityNoneUpdateSystemAssigned(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identityNone(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identitySystemAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -431,10 +430,10 @@ func TestAccApiManagement_identitySystemAssignedUserAssigned(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identitySystemAssignedUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -446,17 +445,17 @@ func TestAccApiManagement_identitySystemAssignedUserAssignedUpdateNone(t *testin data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identitySystemAssignedUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identityNone(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -468,17 +467,17 @@ func TestAccApiManagement_identityNoneUpdateSystemAssignedUserAssigned(t *testin data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identityNone(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identitySystemAssignedUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -490,17 +489,17 @@ func TestAccApiManagement_identitySystemAssignedUserAssignedUpdateSystemAssigned data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identitySystemAssignedUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identitySystemAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -512,17 +511,17 @@ func TestAccApiManagement_identitySystemAssignedUserAssignedUpdateUserAssigned(t data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.identitySystemAssignedUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, data.ImportStep(), { Config: r.identityUserAssigned(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -534,10 +533,10 @@ func TestAccApiManagement_tenantAccess(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management", "test") r := ApiManagementResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.tenantAccess(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("tenant_access.0.enabled").HasValue("true"), check.That(data.ResourceName).Key("tenant_access.0.tenant_id").Exists(), @@ -845,7 +844,7 @@ resource "azurerm_api_management" "test" { hostname_configuration { proxy { - host_name = "api.terraform.io" + host_name = "api.pluginsdk.io" certificate = filebase64("testdata/api_management_api_test.pfx") certificate_password = "terraform" default_ssl_binding = true @@ -853,20 +852,20 @@ resource "azurerm_api_management" "test" { } proxy { - host_name = "api2.terraform.io" + host_name = "api2.pluginsdk.io" certificate = filebase64("testdata/api_management_api2_test.pfx") certificate_password = "terraform" negotiate_client_certificate = true } portal { - host_name = "portal.terraform.io" + host_name = "portal.pluginsdk.io" certificate = filebase64("testdata/api_management_portal_test.pfx") certificate_password = "terraform" } developer_portal { - host_name = "developer-portal.terraform.io" + host_name = "developer-portal.pluginsdk.io" certificate = filebase64("testdata/api_management_developer_portal_test.pfx") } } @@ -1229,9 +1228,9 @@ resource "azurerm_key_vault_certificate" "test" { "keyEncipherment", ] subject_alternative_names { - dns_names = ["api.terraform.io"] + dns_names = ["api.pluginsdk.io"] } - subject = "CN=api.terraform.io" + subject = "CN=api.pluginsdk.io" validity_in_months = 1 } } @@ -1272,7 +1271,7 @@ resource "azurerm_api_management" "test" { } hostname_configuration { proxy { - host_name = "api.terraform.io" + host_name = "api.pluginsdk.io" key_vault_id = "${azurerm_key_vault.test.vault_uri}secrets/${azurerm_key_vault_certificate.test.name}" default_ssl_binding = true negotiate_client_certificate = false @@ -1298,7 +1297,7 @@ resource "azurerm_api_management" "test" { } hostname_configuration { proxy { - host_name = "api.terraform.io" + host_name = "api.pluginsdk.io" key_vault_id = azurerm_key_vault_certificate.test.secret_id default_ssl_binding = true negotiate_client_certificate = false diff --git a/azurerm/internal/services/apimanagement/api_management_subscription_resource.go b/azurerm/internal/services/apimanagement/api_management_subscription_resource.go index d4cd1be74b3d..6a3208572574 100644 --- a/azurerm/internal/services/apimanagement/api_management_subscription_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_subscription_resource.go @@ -7,8 +7,6 @@ import ( "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" "github.com/gofrs/uuid" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" @@ -16,12 +14,13 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/validate" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementSubscription() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementSubscription() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementSubscriptionCreateUpdate, Read: resourceApiManagementSubscriptionRead, Update: resourceApiManagementSubscriptionCreateUpdate, @@ -29,16 +28,16 @@ func resourceApiManagementSubscription() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - 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), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(30 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(30 * time.Minute), + Delete: pluginsdk.DefaultTimeout(30 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "subscription_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ForceNew: true, @@ -47,7 +46,7 @@ func resourceApiManagementSubscription() *schema.Resource { // 3.0 this seems to have been renamed to owner id? "user_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ForceNew: true, ValidateFunc: azure.ValidateResourceID, @@ -58,21 +57,21 @@ func resourceApiManagementSubscription() *schema.Resource { "api_management_name": schemaz.SchemaApiManagementName(), "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, // TODO this now sets the scope property - either a scope block needs adding or additional properties `api_id` and maybe `all_apis` "product_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ForceNew: true, ValidateFunc: validate.ProductID, }, "state": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Default: string(apimanagement.Submitted), ValidateFunc: validation.StringInSlice([]string{ @@ -86,21 +85,21 @@ func resourceApiManagementSubscription() *schema.Resource { }, "primary_key": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, Sensitive: true, }, "secondary_key": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, Sensitive: true, }, "allow_tracing": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: true, }, @@ -108,7 +107,7 @@ func resourceApiManagementSubscription() *schema.Resource { } } -func resourceApiManagementSubscriptionCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementSubscriptionCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.SubscriptionsClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -179,7 +178,7 @@ func resourceApiManagementSubscriptionCreateUpdate(d *schema.ResourceData, meta return resourceApiManagementSubscriptionRead(d, meta) } -func resourceApiManagementSubscriptionRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementSubscriptionRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.SubscriptionsClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -231,7 +230,7 @@ func resourceApiManagementSubscriptionRead(d *schema.ResourceData, meta interfac return nil } -func resourceApiManagementSubscriptionDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementSubscriptionDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.SubscriptionsClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_subscription_resource_test.go b/azurerm/internal/services/apimanagement/api_management_subscription_resource_test.go index 91200d61545a..5b53d78f98d8 100644 --- a/azurerm/internal/services/apimanagement/api_management_subscription_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_subscription_resource_test.go @@ -7,11 +7,10 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -22,10 +21,10 @@ func TestAccApiManagementSubscription_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_subscription", "test") r := ApiManagementSubscriptionResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("allow_tracing").HasValue("true"), check.That(data.ResourceName).Key("subscription_id").Exists(), @@ -41,10 +40,10 @@ func TestAccApiManagementSubscription_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_subscription", "test") r := ApiManagementSubscriptionResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("subscription_id").Exists(), check.That(data.ResourceName).Key("primary_key").Exists(), @@ -59,10 +58,10 @@ func TestAccApiManagementSubscription_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_subscription", "test") r := ApiManagementSubscriptionResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.update(data, "submitted", true), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("state").HasValue("submitted"), check.That(data.ResourceName).Key("allow_tracing").HasValue("true"), @@ -73,28 +72,28 @@ func TestAccApiManagementSubscription_update(t *testing.T) { }, { Config: r.update(data, "active", true), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("state").HasValue("active"), ), }, { Config: r.update(data, "suspended", true), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("state").HasValue("suspended"), ), }, { Config: r.update(data, "cancelled", true), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("state").HasValue("cancelled"), ), }, { Config: r.update(data, "active", false), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("allow_tracing").HasValue("false"), ), @@ -106,10 +105,10 @@ func TestAccApiManagementSubscription_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_subscription", "test") r := ApiManagementSubscriptionResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("state").HasValue("active"), check.That(data.ResourceName).Key("allow_tracing").HasValue("false"), @@ -126,10 +125,10 @@ func TestAccApiManagementSubscription_withoutUser(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_subscription", "test") r := ApiManagementSubscriptionResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.withoutUser(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("state").HasValue("active"), check.That(data.ResourceName).Key("allow_tracing").HasValue("false"), @@ -143,7 +142,7 @@ func TestAccApiManagementSubscription_withoutUser(t *testing.T) { }) } -func (ApiManagementSubscriptionResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementSubscriptionResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := parse.SubscriptionID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/api_management_user_data_source.go b/azurerm/internal/services/apimanagement/api_management_user_data_source.go index 492afedcc92f..0b8c0ef26db7 100644 --- a/azurerm/internal/services/apimanagement/api_management_user_data_source.go +++ b/azurerm/internal/services/apimanagement/api_management_user_data_source.go @@ -4,23 +4,23 @@ import ( "fmt" "time" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func dataSourceApiManagementUser() *schema.Resource { - return &schema.Resource{ +func dataSourceApiManagementUser() *pluginsdk.Resource { + return &pluginsdk.Resource{ Read: dataSourceApiManagementUserRead, - Timeouts: &schema.ResourceTimeout{ - Read: schema.DefaultTimeout(5 * time.Minute), + Timeouts: &pluginsdk.ResourceTimeout{ + Read: pluginsdk.DefaultTimeout(5 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "user_id": schemaz.SchemaApiManagementUserDataSourceName(), "api_management_name": schemaz.SchemaApiManagementDataSourceName(), @@ -28,34 +28,34 @@ func dataSourceApiManagementUser() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupNameForDataSource(), "first_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "email": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "last_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "note": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, "state": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Computed: true, }, }, } } -func dataSourceApiManagementUserRead(d *schema.ResourceData, meta interface{}) error { +func dataSourceApiManagementUserRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.UsersClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_user_data_source_test.go b/azurerm/internal/services/apimanagement/api_management_user_data_source_test.go index f58a7d9609c8..8bff9ac14ff3 100644 --- a/azurerm/internal/services/apimanagement/api_management_user_data_source_test.go +++ b/azurerm/internal/services/apimanagement/api_management_user_data_source_test.go @@ -4,7 +4,6 @@ import ( "fmt" "testing" - "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/acceptance/check" ) @@ -16,10 +15,10 @@ func TestAccDataSourceApiManagementUser_basic(t *testing.T) { data := acceptance.BuildTestData(t, "data.azurerm_api_management_user", "test") r := ApiManagementUserDataSource{} - data.DataSourceTest(t, []resource.TestStep{ + data.DataSourceTest(t, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).Key("user_id").HasValue("test-user"), check.That(data.ResourceName).Key("first_name").HasValue("Acceptance"), check.That(data.ResourceName).Key("last_name").HasValue("Test"), diff --git a/azurerm/internal/services/apimanagement/api_management_user_resource.go b/azurerm/internal/services/apimanagement/api_management_user_resource.go index ec3864f94664..c1aed49945b1 100644 --- a/azurerm/internal/services/apimanagement/api_management_user_resource.go +++ b/azurerm/internal/services/apimanagement/api_management_user_resource.go @@ -7,20 +7,19 @@ import ( "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/parse" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/schemaz" - "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "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" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/timeouts" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) -func resourceApiManagementUser() *schema.Resource { - return &schema.Resource{ +func resourceApiManagementUser() *pluginsdk.Resource { + return &pluginsdk.Resource{ Create: resourceApiManagementUserCreateUpdate, Read: resourceApiManagementUserRead, Update: resourceApiManagementUserCreateUpdate, @@ -28,14 +27,14 @@ func resourceApiManagementUser() *schema.Resource { // TODO: replace this with an importer which validates the ID during import Importer: pluginsdk.DefaultImporter(), - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(45 * time.Minute), - Read: schema.DefaultTimeout(5 * time.Minute), - Update: schema.DefaultTimeout(45 * time.Minute), - Delete: schema.DefaultTimeout(45 * time.Minute), + Timeouts: &pluginsdk.ResourceTimeout{ + Create: pluginsdk.DefaultTimeout(45 * time.Minute), + Read: pluginsdk.DefaultTimeout(5 * time.Minute), + Update: pluginsdk.DefaultTimeout(45 * time.Minute), + Delete: pluginsdk.DefaultTimeout(45 * time.Minute), }, - Schema: map[string]*schema.Schema{ + Schema: map[string]*pluginsdk.Schema{ "user_id": schemaz.SchemaApiManagementUserName(), "api_management_name": schemaz.SchemaApiManagementName(), @@ -43,25 +42,25 @@ func resourceApiManagementUser() *schema.Resource { "resource_group_name": azure.SchemaResourceGroupName(), "first_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "email": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "last_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validation.StringIsNotEmpty, }, "confirmation": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ForceNew: true, ValidateFunc: validation.StringInSlice([]string{ @@ -71,18 +70,18 @@ func resourceApiManagementUser() *schema.Resource { }, "note": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "password": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, }, "state": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Computed: true, ValidateFunc: validation.StringInSlice([]string{ @@ -95,7 +94,7 @@ func resourceApiManagementUser() *schema.Resource { } } -func resourceApiManagementUserCreateUpdate(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementUserCreateUpdate(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.UsersClient ctx, cancel := timeouts.ForCreateUpdate(meta.(*clients.Client).StopContext, d) defer cancel() @@ -167,7 +166,7 @@ func resourceApiManagementUserCreateUpdate(d *schema.ResourceData, meta interfac return resourceApiManagementUserRead(d, meta) } -func resourceApiManagementUserRead(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementUserRead(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.UsersClient ctx, cancel := timeouts.ForRead(meta.(*clients.Client).StopContext, d) defer cancel() @@ -207,7 +206,7 @@ func resourceApiManagementUserRead(d *schema.ResourceData, meta interface{}) err return nil } -func resourceApiManagementUserDelete(d *schema.ResourceData, meta interface{}) error { +func resourceApiManagementUserDelete(d *pluginsdk.ResourceData, meta interface{}) error { client := meta.(*clients.Client).ApiManagement.UsersClient ctx, cancel := timeouts.ForDelete(meta.(*clients.Client).StopContext, d) defer cancel() diff --git a/azurerm/internal/services/apimanagement/api_management_user_resource_test.go b/azurerm/internal/services/apimanagement/api_management_user_resource_test.go index db029e1e615c..b2d60207c3df 100644 --- a/azurerm/internal/services/apimanagement/api_management_user_resource_test.go +++ b/azurerm/internal/services/apimanagement/api_management_user_resource_test.go @@ -5,12 +5,11 @@ import ( "fmt" "testing" - "github.com/hashicorp/terraform-plugin-sdk/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/terraform" "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/acceptance/check" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/clients" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) @@ -21,10 +20,10 @@ func TestAccApiManagementUser_basic(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_user", "test") r := ApiManagementUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("first_name").HasValue("Acceptance"), check.That(data.ResourceName).Key("last_name").HasValue("Test"), @@ -38,10 +37,10 @@ func TestAccApiManagementUser_requiresImport(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_user", "test") r := ApiManagementUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -53,10 +52,10 @@ func TestAccApiManagementUser_update(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_user", "test") r := ApiManagementUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.basic(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("first_name").HasValue("Acceptance"), check.That(data.ResourceName).Key("last_name").HasValue("Test"), @@ -65,7 +64,7 @@ func TestAccApiManagementUser_update(t *testing.T) { }, { Config: r.updatedBlocked(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("first_name").HasValue("Acceptance Updated"), check.That(data.ResourceName).Key("last_name").HasValue("Test Updated"), @@ -74,7 +73,7 @@ func TestAccApiManagementUser_update(t *testing.T) { }, { Config: r.updatedActive(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("first_name").HasValue("Acceptance"), check.That(data.ResourceName).Key("last_name").HasValue("Test"), @@ -88,10 +87,10 @@ func TestAccApiManagementUser_password(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_user", "test") r := ApiManagementUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.password(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("first_name").HasValue("Acceptance"), check.That(data.ResourceName).Key("last_name").HasValue("Test"), @@ -110,10 +109,10 @@ func TestAccApiManagementUser_invite(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_user", "test") r := ApiManagementUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.invited(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -133,10 +132,10 @@ func TestAccApiManagementUser_signup(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_user", "test") r := ApiManagementUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.signUp(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), ), }, @@ -156,10 +155,10 @@ func TestAccApiManagementUser_complete(t *testing.T) { data := acceptance.BuildTestData(t, "azurerm_api_management_user", "test") r := ApiManagementUserResource{} - data.ResourceTest(t, r, []resource.TestStep{ + data.ResourceTest(t, r, []acceptance.TestStep{ { Config: r.complete(data), - Check: resource.ComposeTestCheckFunc( + Check: acceptance.ComposeTestCheckFunc( check.That(data.ResourceName).ExistsInAzure(r), check.That(data.ResourceName).Key("first_name").HasValue("Acceptance"), check.That(data.ResourceName).Key("last_name").HasValue("Test"), @@ -178,7 +177,7 @@ func TestAccApiManagementUser_complete(t *testing.T) { }) } -func (ApiManagementUserResource) Exists(ctx context.Context, clients *clients.Client, state *terraform.InstanceState) (*bool, error) { +func (ApiManagementUserResource) Exists(ctx context.Context, clients *clients.Client, state *pluginsdk.InstanceState) (*bool, error) { id, err := azure.ParseAzureResourceID(state.ID) if err != nil { return nil, err diff --git a/azurerm/internal/services/apimanagement/diff_suppress.go b/azurerm/internal/services/apimanagement/diff_suppress.go index 0e6e49824500..5d23d12a156e 100644 --- a/azurerm/internal/services/apimanagement/diff_suppress.go +++ b/azurerm/internal/services/apimanagement/diff_suppress.go @@ -3,14 +3,14 @@ package apimanagement import ( "strings" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/suppress" ) // XmlWithDotNetInterpolationsDiffSuppress is a Diff Suppress Func for when the XML contains // .net interpolations, and thus isn't valid XML to parse // whilst really we should be parsing the XML Tokens and skipping over the error - in practice -func XmlWithDotNetInterpolationsDiffSuppress(k, old, new string, d *schema.ResourceData) bool { +func XmlWithDotNetInterpolationsDiffSuppress(k, old, new string, d *pluginsdk.ResourceData) bool { // try parsing this as valid xml if we can, to handle ordering differences same := suppress.XmlDiff(k, old, new, d) if same { diff --git a/azurerm/internal/services/apimanagement/migration/api_version_set.go b/azurerm/internal/services/apimanagement/migration/api_version_set.go index 9edd99e3af06..1d1ba1fdeb70 100644 --- a/azurerm/internal/services/apimanagement/migration/api_version_set.go +++ b/azurerm/internal/services/apimanagement/migration/api_version_set.go @@ -6,8 +6,6 @@ import ( "strings" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" - - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" ) var _ pluginsdk.StateUpgrade = ApiVersionSetV0ToV1{} @@ -16,47 +14,47 @@ type ApiVersionSetV0ToV1 struct { } func (ApiVersionSetV0ToV1) Schema() map[string]*pluginsdk.Schema { - return map[string]*schema.Schema{ + return map[string]*pluginsdk.Schema{ "name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, }, "resource_group_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, }, "api_management_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, }, "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "versioning_scheme": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "version_header_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "version_query_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, } diff --git a/azurerm/internal/services/apimanagement/migration/property.go b/azurerm/internal/services/apimanagement/migration/property.go index 0091641423af..34e7fb0b8de8 100644 --- a/azurerm/internal/services/apimanagement/migration/property.go +++ b/azurerm/internal/services/apimanagement/migration/property.go @@ -5,7 +5,6 @@ import ( "log" "strings" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" ) @@ -15,46 +14,46 @@ type ApiPropertyV0ToV1 struct { } func (ApiPropertyV0ToV1) Schema() map[string]*pluginsdk.Schema { - return map[string]*schema.Schema{ + return map[string]*pluginsdk.Schema{ "name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, }, "resource_group_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, }, "api_management_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, ForceNew: true, }, "display_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "value": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "secret": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, "tags": { - Type: schema.TypeList, + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, }, } diff --git a/azurerm/internal/services/apimanagement/registration.go b/azurerm/internal/services/apimanagement/registration.go index c53a745b87c4..33df5d6e44b1 100644 --- a/azurerm/internal/services/apimanagement/registration.go +++ b/azurerm/internal/services/apimanagement/registration.go @@ -1,7 +1,7 @@ package apimanagement import ( - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" ) type Registration struct{} @@ -19,8 +19,8 @@ func (r Registration) WebsiteCategories() []string { } // SupportedDataSources returns the supported Data Sources supported by this Service -func (r Registration) SupportedDataSources() map[string]*schema.Resource { - return map[string]*schema.Resource{ +func (r Registration) SupportedDataSources() map[string]*pluginsdk.Resource { + return map[string]*pluginsdk.Resource{ "azurerm_api_management": dataSourceApiManagementService(), "azurerm_api_management_api": dataSourceApiManagementApi(), "azurerm_api_management_api_version_set": dataSourceApiManagementApiVersionSet(), @@ -31,8 +31,8 @@ func (r Registration) SupportedDataSources() map[string]*schema.Resource { } // SupportedResources returns the supported Resources supported by this Service -func (r Registration) SupportedResources() map[string]*schema.Resource { - return map[string]*schema.Resource{ +func (r Registration) SupportedResources() map[string]*pluginsdk.Resource { + return map[string]*pluginsdk.Resource{ "azurerm_api_management": resourceApiManagementService(), "azurerm_api_management_api": resourceApiManagementApi(), "azurerm_api_management_api_diagnostic": resourceApiManagementApiDiagnostic(), diff --git a/azurerm/internal/services/apimanagement/schema.go b/azurerm/internal/services/apimanagement/schema.go index ddbd552d57ab..d74023d46919 100644 --- a/azurerm/internal/services/apimanagement/schema.go +++ b/azurerm/internal/services/apimanagement/schema.go @@ -1,17 +1,17 @@ package apimanagement import ( - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" keyVaultValidate "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/keyvault/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/suppress" ) -func apiManagementResourceHostnameSchema() map[string]*schema.Schema { - return map[string]*schema.Schema{ +func apiManagementResourceHostnameSchema() map[string]*pluginsdk.Schema { + return map[string]*pluginsdk.Schema{ "host_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, DiffSuppressFunc: suppress.CaseDifference, ValidateFunc: validation.StringIsNotEmpty, @@ -19,38 +19,38 @@ func apiManagementResourceHostnameSchema() map[string]*schema.Schema { "key_vault_id": { // TODO: should this become `key_vault_key_id` since that's what this is? - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, ValidateFunc: keyVaultValidate.NestedItemIdWithOptionalVersion, }, "certificate": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, }, "certificate_password": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, Sensitive: true, ValidateFunc: validation.StringIsNotEmpty, }, "negotiate_client_certificate": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Optional: true, Default: false, }, } } -func apiManagementResourceHostnameProxySchema() map[string]*schema.Schema { +func apiManagementResourceHostnameProxySchema() map[string]*pluginsdk.Schema { hostnameSchema := apiManagementResourceHostnameSchema() - hostnameSchema["default_ssl_binding"] = &schema.Schema{ - Type: schema.TypeBool, + hostnameSchema["default_ssl_binding"] = &pluginsdk.Schema{ + Type: pluginsdk.TypeBool, Optional: true, Computed: true, // Azure has certain logic to set this, which we cannot predict } diff --git a/azurerm/internal/services/apimanagement/schemaz/api_management.go b/azurerm/internal/services/apimanagement/schemaz/api_management.go index 1aad3f3d97f0..06df10b3a1d0 100644 --- a/azurerm/internal/services/apimanagement/schemaz/api_management.go +++ b/azurerm/internal/services/apimanagement/schemaz/api_management.go @@ -5,25 +5,25 @@ import ( "strings" "github.com/Azure/azure-sdk-for-go/services/apimanagement/mgmt/2020-12-01/apimanagement" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/services/apimanagement/validate" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" "github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils" ) // not in service package as migrate package required this -func SchemaApiManagementName() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, +func SchemaApiManagementName() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validate.ApiManagementServiceName, } } -func SchemaApiManagementDataSourceName() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, +func SchemaApiManagementDataSourceName() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.ApiManagementServiceName, } @@ -31,9 +31,9 @@ func SchemaApiManagementDataSourceName() *schema.Schema { // SchemaApiManagementChildName returns the Schema for the identifier // used by resources within nested under the API Management Service resource -func SchemaApiManagementChildName() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, +func SchemaApiManagementChildName() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validate.ApiManagementChildName, @@ -42,9 +42,9 @@ func SchemaApiManagementChildName() *schema.Schema { // SchemaApiManagementChildName returns the Schema for the identifier // used by resources within nested under the API Management Service resource -func SchemaApiManagementApiName() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, +func SchemaApiManagementApiName() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validate.ApiManagementApiName, @@ -53,56 +53,56 @@ func SchemaApiManagementApiName() *schema.Schema { // SchemaApiManagementChildDataSourceName returns the Schema for the identifier // used by resources within nested under the API Management Service resource -func SchemaApiManagementChildDataSourceName() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, +func SchemaApiManagementChildDataSourceName() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.ApiManagementChildName, } } -func SchemaApiManagementUserName() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, +func SchemaApiManagementUserName() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeString, Required: true, ForceNew: true, ValidateFunc: validate.ApiManagementUserName, } } -func SchemaApiManagementUserDataSourceName() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeString, +func SchemaApiManagementUserDataSourceName() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeString, Required: true, ValidateFunc: validate.ApiManagementUserName, } } -func SchemaApiManagementOperationRepresentation() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeList, +func SchemaApiManagementOperationRepresentation() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "content_type": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "form_parameter": SchemaApiManagementOperationParameterContract(), "sample": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "schema_id": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "type_name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, }, @@ -193,40 +193,40 @@ func FlattenApiManagementOperationRepresentation(input *[]apimanagement.Represen return outputs } -func SchemaApiManagementOperationParameterContract() *schema.Schema { - return &schema.Schema{ - Type: schema.TypeList, +func SchemaApiManagementOperationParameterContract() *pluginsdk.Schema { + return &pluginsdk.Schema{ + Type: pluginsdk.TypeList, Optional: true, - Elem: &schema.Resource{ - Schema: map[string]*schema.Schema{ + Elem: &pluginsdk.Resource{ + Schema: map[string]*pluginsdk.Schema{ "name": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "required": { - Type: schema.TypeBool, + Type: pluginsdk.TypeBool, Required: true, }, "description": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "type": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Required: true, }, "default_value": { - Type: schema.TypeString, + Type: pluginsdk.TypeString, Optional: true, }, "values": { - Type: schema.TypeSet, + Type: pluginsdk.TypeSet, Optional: true, - Elem: &schema.Schema{ - Type: schema.TypeString, + Elem: &pluginsdk.Schema{ + Type: pluginsdk.TypeString, }, - Set: schema.HashString, + Set: pluginsdk.HashString, }, }, }, @@ -248,7 +248,7 @@ func ExpandApiManagementOperationParameterContract(input []interface{}) *[]apima paramType := vs["type"].(string) defaultValue := vs["default_value"].(string) required := vs["required"].(bool) - valuesRaw := vs["values"].(*schema.Set).List() + valuesRaw := vs["values"].(*pluginsdk.Set).List() output := apimanagement.ParameterContract{ Name: utils.String(name), @@ -293,7 +293,7 @@ func FlattenApiManagementOperationParameterContract(input *[]apimanagement.Param output["default_value"] = *v.DefaultValue } - output["values"] = schema.NewSet(schema.HashString, utils.FlattenStringSlice(v.Values)) + output["values"] = pluginsdk.NewSet(pluginsdk.HashString, utils.FlattenStringSlice(v.Values)) outputs = append(outputs, output) } diff --git a/azurerm/internal/services/apimanagement/validate/api_management_sku.go b/azurerm/internal/services/apimanagement/validate/api_management_sku.go index 3b64b0268bd9..8e484bde23a6 100644 --- a/azurerm/internal/services/apimanagement/validate/api_management_sku.go +++ b/azurerm/internal/services/apimanagement/validate/api_management_sku.go @@ -3,11 +3,11 @@ package validate import ( "regexp" - "github.com/hashicorp/terraform-plugin-sdk/helper/schema" - "github.com/hashicorp/terraform-plugin-sdk/helper/validation" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/pluginsdk" + "github.com/terraform-providers/terraform-provider-azurerm/azurerm/internal/tf/validation" ) -func ApimSkuName() schema.SchemaValidateFunc { +func ApimSkuName() pluginsdk.SchemaValidateFunc { return validation.StringMatch( regexp.MustCompile(`^Consumption_0$|^Basic_(1|2)$|^Developer_1$|^Premium_([1-9]|10)$|^Standard_[1-4]$`), `This is not a valid Api Management sku name.`,