Merge pull request #4175 from pdecat/api_management_additional_locations

Support multiple alternative locations for azurerm_api_management
hashicorp · Aug 29, 2019 · b412970 · b412970
2 parents da09b92 + 88e7013
commit b412970
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -106,6 +106,7 @@ The following Environment Variables must be set in your shell prior to running a
 - `ARM_ENVIRONMENT`
 - `ARM_TEST_LOCATION`
 - `ARM_TEST_LOCATION_ALT`
+- `ARM_TEST_LOCATION_ALT2`
 
 **Note:** Acceptance tests create real resources in Azure which often cost money to run.
 

diff --git a/azurerm/provider_test.go b/azurerm/provider_test.go
@@ -43,6 +43,7 @@ func testAccPreCheck(t *testing.T) {
 		"ARM_TENANT_ID",
 		"ARM_TEST_LOCATION",
 		"ARM_TEST_LOCATION_ALT",
+		"ARM_TEST_LOCATION_ALT2",
 	}
 
 	for _, variable := range variables {
@@ -61,6 +62,10 @@ func testAltLocation() string {
 	return os.Getenv("ARM_TEST_LOCATION_ALT")
 }
 
+func testAltLocation2() string {
+	return os.Getenv("ARM_TEST_LOCATION_ALT2")
+}
+
 func testArmEnvironmentName() string {
 	envName, exists := os.LookupEnv("ARM_ENVIRONMENT")
 	if !exists {

diff --git a/azurerm/resource_arm_api_management.go b/azurerm/resource_arm_api_management.go
@@ -123,7 +123,6 @@ func resourceArmApiManagementService() *schema.Resource {
 			"additional_location": {
 				Type:     schema.TypeList,
 				Optional: true,
-				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"location": azure.SchemaLocation(),

diff --git a/azurerm/resource_arm_api_management_test.go b/azurerm/resource_arm_api_management_test.go
@@ -93,7 +93,7 @@ func TestAccAzureRMApiManagement_customProps(t *testing.T) {
 func TestAccAzureRMApiManagement_complete(t *testing.T) {
 	resourceName := "azurerm_api_management.test"
 	ri := tf.AccRandTimeInt()
-	config := testAccAzureRMApiManagement_complete(ri, testLocation(), testAltLocation())
+	config := testAccAzureRMApiManagement_complete(ri, testLocation(), testAltLocation(), testAltLocation2())
 
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:     func() { testAccPreCheck(t) },
@@ -442,7 +442,7 @@ resource "azurerm_api_management" "test" {
 `, rInt, location, rInt)
 }
 
-func testAccAzureRMApiManagement_complete(rInt int, location string, altLocation string) string {
+func testAccAzureRMApiManagement_complete(rInt int, location string, altLocation string, altLocation2 string) string {
 	return fmt.Sprintf(`
 resource "azurerm_resource_group" "test1" {
   name     = "acctestRG-%d"
@@ -454,6 +454,11 @@ resource "azurerm_resource_group" "test2" {
   location = "%s"
 }
 
+resource "azurerm_resource_group" "test3" {
+	name     = "acctestRG3-%d"
+	location = "%s"
+}
+
 resource "azurerm_api_management" "test" {
   name                      = "acctestAM-%d"
   publisher_name            = "pub1"
@@ -464,6 +469,10 @@ resource "azurerm_api_management" "test" {
     location = "${azurerm_resource_group.test2.location}"
   }
 
+  additional_location {
+    location = "${azurerm_resource_group.test3.location}"
+  }
+
   certificate {
     encoded_certificate  = "${filebase64("testdata/api_management_api_test.pfx")}"
     certificate_password = "terraform"
@@ -516,5 +525,5 @@ resource "azurerm_api_management" "test" {
   location            = "${azurerm_resource_group.test1.location}"
   resource_group_name = "${azurerm_resource_group.test1.name}"
 }
-`, rInt, location, rInt, altLocation, rInt)
+`, rInt, location, rInt, altLocation, rInt, altLocation2, rInt)
 }