From ed5043f84c32c7e082eafee93c0d822777bf8b9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20Arild=20T=C3=B8rresdal?= Date: Fri, 26 Oct 2018 20:55:56 +0200 Subject: [PATCH] Fixed issues after running int.tests. --- azurerm/data_source_api_management_api.go | 3 ++- azurerm/data_source_api_management_api_test.go | 5 +++-- azurerm/resource_arm_api_management_api.go | 3 ++- azurerm/resource_arm_api_management_api_test.go | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/azurerm/data_source_api_management_api.go b/azurerm/data_source_api_management_api.go index 3817603ad5fc7..00f3b461a8a50 100644 --- a/azurerm/data_source_api_management_api.go +++ b/azurerm/data_source_api_management_api.go @@ -76,7 +76,8 @@ func dataSourceApiManagementApi() *schema.Resource { "revision": { Type: schema.TypeInt, Optional: true, - Default: 1, + Default: nil, + Computed: true, }, "api_version": { diff --git a/azurerm/data_source_api_management_api_test.go b/azurerm/data_source_api_management_api_test.go index 2c8257adfad06..6032c264e0834 100644 --- a/azurerm/data_source_api_management_api_test.go +++ b/azurerm/data_source_api_management_api_test.go @@ -31,8 +31,8 @@ func TestAccDataSourceAzureRMApiManagementApi_basic(t *testing.T) { resource.TestCheckResourceAttr(dataSourceName, "subscription_key_parameter_names.#", "1"), resource.TestCheckResourceAttr(dataSourceName, "subscription_key_parameter_names.0.header", "Ocp-Apim-Subscription-Key"), resource.TestCheckResourceAttr(dataSourceName, "subscription_key_parameter_names.0.query", "subscription-key"), - resource.TestCheckResourceAttr(dataSourceName, "version", ""), - resource.TestCheckResourceAttr(dataSourceName, "version_set_id", ""), + resource.TestCheckResourceAttr(dataSourceName, "api_version", ""), + resource.TestCheckResourceAttr(dataSourceName, "api_version_set_id", ""), ), }, }, @@ -64,6 +64,7 @@ resource "azurerm_api_management_api" "test" { name = "acctestAMA-%d" service_name = "${azurerm_api_management.test.name}" path = "api1" + protocols = ["https"] import { content_value = "${file("testdata/api_management_api_swagger.json")}" diff --git a/azurerm/resource_arm_api_management_api.go b/azurerm/resource_arm_api_management_api.go index 23a19e20b40ba..c4fd9d78052aa 100644 --- a/azurerm/resource_arm_api_management_api.go +++ b/azurerm/resource_arm_api_management_api.go @@ -147,7 +147,8 @@ func resourceArmApiManagementApi() *schema.Resource { "revision": { Type: schema.TypeInt, Optional: true, - Default: 1, + Computed: true, + Default: nil, }, "version": { diff --git a/azurerm/resource_arm_api_management_api_test.go b/azurerm/resource_arm_api_management_api_test.go index c52d4bbc83377..47d2b475a4ca0 100644 --- a/azurerm/resource_arm_api_management_api_test.go +++ b/azurerm/resource_arm_api_management_api_test.go @@ -154,6 +154,7 @@ resource "azurerm_api_management_api" "test" { name = "acctestAMA-%d" service_name = "${azurerm_api_management.test.name}" path = "api1" + protocols = ["https"] import { content_value = "${file("testdata/api_management_api_swagger.json")}" @@ -189,6 +190,7 @@ resource "azurerm_api_management_api" "test" { name = "acctestAMA-%d" service_name = "${azurerm_api_management.test.name}" path = "api1" + protocols = ["http", "https"] import { content_value = "${file("testdata/api_management_api_wsdl.xml")}" @@ -207,8 +209,6 @@ resource "azurerm_api_management_api" "test" { query = "test2" } - protocols = ["http", "https"] - resource_group_name = "${azurerm_resource_group.test.name}" } `, rInt, location, rInt, rInt)