made sure files are added

hashicorp · Jul 17, 2017 · f0c1c67 · f0c1c67
1 parent 87277d4
commit f0c1c67
Show file tree

Hide file tree

Showing 6 changed files with 2,972 additions and 2 deletions.
diff --git a/azurerm/config.go b/azurerm/config.go
@@ -56,7 +56,7 @@ type ArmClient struct {
 	diskClient       disk.DisksClient
 	documentDBClient documentdb.DatabaseAccountsClient
 
-	appGatewayClient             network.ApplicationGatewaysClient
+	applicationGatewayClient     network.ApplicationGatewaysClient
 	ifaceClient                  network.InterfacesClient
 	expressRouteCircuitClient    network.ExpressRouteCircuitsClient
 	loadBalancerClient           network.LoadBalancersClient
@@ -248,7 +248,7 @@ func (c *Config) getArmClient() (*ArmClient, error) {
 	setUserAgent(&agc.Client)
 	agc.Authorizer = auth
 	agc.Sender = autorest.CreateSender(withRequestLogging())
-	client.appGatewayClient = agc
+	client.applicationGatewayClient = agc
 
 	crc := containerregistry.NewRegistriesClientWithBaseURI(endpoint, c.SubscriptionID)
 	setUserAgent(&crc.Client)

diff --git a/azurerm/provider.go b/azurerm/provider.go
@@ -70,13 +70,22 @@ func Provider() terraform.ResourceProvider {
 
 		ResourcesMap: map[string]*schema.Resource{
 			// These resources use the Azure ARM SDK
+<<<<<<< HEAD
 			"azurerm_availability_set":   resourceArmAvailabilitySet(),
 			"azurerm_cdn_endpoint":       resourceArmCdnEndpoint(),
 			"azurerm_cdn_profile":        resourceArmCdnProfile(),
 			"azurerm_container_registry": resourceArmContainerRegistry(),
 			"azurerm_container_service":  resourceArmContainerService(),
 			"azurerm_cosmosdb_account":   resourceArmCosmosDBAccount(),
 			"azurerm_dns_ptr_record":     resourceArmDnsPtrRecord(),
+=======
+			"azurerm_application_gateway": resourceArmApplicationGateway(),
+			"azurerm_availability_set":    resourceArmAvailabilitySet(),
+			"azurerm_cdn_endpoint":        resourceArmCdnEndpoint(),
+			"azurerm_cdn_profile":         resourceArmCdnProfile(),
+			"azurerm_container_registry":  resourceArmContainerRegistry(),
+			"azurerm_container_service":   resourceArmContainerService(),
+>>>>>>> For new Application Gateway Resource:
 
 			"azurerm_eventhub":                    resourceArmEventHub(),
 			"azurerm_eventhub_authorization_rule": resourceArmEventHubAuthorizationRule(),