Merge remote-tracking branch 'upstream/master'

CHANGELOG.md

@@ -1,4 +1,15 @@
-## 0.3.1 (Unreleased)
+## 0.3.2 (Unreleased)
+
+FEATURES: 
+
+* **New Resource:** `azurerm_application_gateway` [GH-413]
+
+## 0.3.1 (October 21, 2017)
+
+IMPROVEMENTS:
+
+  - `azurerm_virtual_machine_scale_set` - Updating this resource with the v11 of the Azure SDK for Go ([#448](https://github.com/terraform-providers/terraform-provider-azurerm/issues/448))
+
 ## 0.3.0 (October 17, 2017)
 
 UPGRADE NOTES:

GNUmakefile

@@ -12,7 +12,7 @@ test: fmtcheck
 		xargs -t -n4 go test $(TESTARGS) -timeout=30s -parallel=4
 
 testacc: fmtcheck
-	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 120m
+	TF_ACC=1 go test $(TEST) -v $(TESTARGS) -timeout 180m
 
 vet:
 	@echo "go vet ."

azurerm/config.go

@@ -72,7 +72,7 @@ type ArmClient struct {
 	automationCredentialClient automation.CredentialClient
 	automationScheduleClient   automation.ScheduleClient
 
-	appGatewayClient             network.ApplicationGatewaysClient
+	applicationGatewayClient     network.ApplicationGatewaysClient
 	ifaceClient                  network.InterfacesClient
 	expressRouteCircuitClient    network.ExpressRouteCircuitsClient
 	loadBalancerClient           network.LoadBalancersClient
@@ -329,7 +329,7 @@ func (c *Config) getArmClient() (*ArmClient, error) {
 	setUserAgent(&agc.Client)
 	agc.Authorizer = auth
 	agc.Sender = sender
-	client.appGatewayClient = agc
+	client.applicationGatewayClient = agc
 
 	crc := containerregistry.NewRegistriesClientWithBaseURI(endpoint, c.SubscriptionID)
 	setUserAgent(&crc.Client)

azurerm/import_arm_application_gateway_test.go

@@ -0,0 +1,31 @@
+package azurerm
+
+import (
+	"testing"
+
+	"github.com/hashicorp/terraform/helper/acctest"
+	"github.com/hashicorp/terraform/helper/resource"
+)
+
+func TestAzureRMApplicationGateway_importBasic(t *testing.T) {
+	resourceName := "azurerm_application_gateway.test"
+
+	ri := acctest.RandInt()
+	config := testAccAzureRMApplicationGateway_basic(ri)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testCheckAzureRMApplicationGatewayDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: config,
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

azurerm/provider.go

@@ -83,6 +83,7 @@ func Provider() terraform.ResourceProvider {
 		},
 
 		ResourcesMap: map[string]*schema.Resource{
+			"azurerm_application_gateway":         resourceArmApplicationGateway(),
 			"azurerm_application_insights":        resourceArmApplicationInsights(),
 			"azurerm_app_service":                 resourceArmAppService(),
 			"azurerm_app_service_plan":            resourceArmAppServicePlan(),