Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Virtual network gateway connection #35

Merged
merged 10 commits into from
Sep 10, 2018
Merged

Virtual network gateway connection #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
aa2c6de
Add virtual_network_gateway_connection resource, test and website doc…
marinsalinas Aug 28, 2018
1cb48ea
Add import test step on virtual network gateway connection resource
marinsalinas Aug 28, 2018
8c58cfc
Remove unsupported arguments in virtual_network_gateway_connection
marinsalinas Aug 29, 2018
172ed3f
Merge branch 'master' into virtual-network-gateway-connection
thetonymaster Sep 7, 2018
2f28938
Add validation
thetonymaster Sep 7, 2018
71a2b48
Merge branch 'master' into virtual-network-gateway-connection
thetonymaster Sep 7, 2018
db65ffd
Fix formatting lost on automerge
thetonymaster Sep 7, 2018
c0902d0
Change validators and refactor a couple of errors
thetonymaster Sep 9, 2018
cbb52b0
Align variable assignments
thetonymaster Sep 9, 2018
11d622e
Align the remaining example on documentation
thetonymaster Sep 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions azurestack/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,11 @@ type ArmClient struct {
zonesClient dns.ZonesClient

// Networking
ifaceClient network.InterfacesClient
localNetConnClient network.LocalNetworkGatewaysClient
secRuleClient network.SecurityRulesClient
vnetGatewayClient network.VirtualNetworkGatewaysClient
ifaceClient network.InterfacesClient
localNetConnClient network.LocalNetworkGatewaysClient
secRuleClient network.SecurityRulesClient
vnetGatewayClient network.VirtualNetworkGatewaysClient
vnetGatewayConnectionsClient network.VirtualNetworkGatewayConnectionsClient

// Resources
providersClient resources.ProvidersClient
Expand Down Expand Up @@ -227,6 +228,10 @@ func (c *ArmClient) registerNetworkingClients(endpoint, subscriptionId string, a
c.configureClient(&gatewaysClient.Client, auth)
c.vnetGatewayClient = gatewaysClient

gatewayConnectionsClient := network.NewVirtualNetworkGatewayConnectionsClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&gatewayConnectionsClient.Client, auth)
c.vnetGatewayConnectionsClient = gatewayConnectionsClient

localNetworkGatewaysClient := network.NewLocalNetworkGatewaysClientWithBaseURI(endpoint, subscriptionId)
c.configureClient(&localNetworkGatewaysClient.Client, auth)
c.localNetConnClient = localNetworkGatewaysClient
Expand Down
53 changes: 27 additions & 26 deletions azurestack/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,32 +76,33 @@ func Provider() terraform.ResourceProvider {
},

ResourcesMap: map[string]*schema.Resource{
"azurestack_availability_set": resourceArmAvailabilitySet(),
"azurestack_dns_zone": resourceArmDnsZone(),
"azurestack_dns_a_record": resourceArmDnsARecord(),
"azurestack_network_interface": resourceArmNetworkInterface(),
"azurestack_network_security_group": resourceArmNetworkSecurityGroup(),
"azurestack_network_security_rule": resourceArmNetworkSecurityRule(),
"azurestack_local_network_gateway": resourceArmLocalNetworkGateway(),
"azurestack_lb": resourceArmLoadBalancer(),
"azurestack_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(),
"azurestack_lb_nat_rule": resourceArmLoadBalancerNatRule(),
"azurestack_lb_probe": resourceArmLoadBalancerProbe(),
"azurestack_lb_nat_pool": resourceArmLoadBalancerNatPool(),
"azurestack_lb_rule": resourceArmLoadBalancerRule(),
"azurestack_public_ip": resourceArmPublicIp(),
"azurestack_resource_group": resourceArmResourceGroup(),
"azurestack_route": resourceArmRoute(),
"azurestack_route_table": resourceArmRouteTable(),
"azurestack_storage_account": resourceArmStorageAccount(),
"azurestack_storage_blob": resourceArmStorageBlob(),
"azurestack_storage_container": resourceArmStorageContainer(),
"azurestack_subnet": resourceArmSubnet(),
"azurestack_template_deployment": resourceArmTemplateDeployment(),
"azurestack_virtual_network": resourceArmVirtualNetwork(),
"azurestack_virtual_network_gateway": resourceArmVirtualNetworkGateway(),
"azurestack_virtual_machine": resourceArmVirtualMachine(),
"azurestack_virtual_machine_extension": resourceArmVirtualMachineExtensions(),
"azurestack_availability_set": resourceArmAvailabilitySet(),
"azurestack_dns_zone": resourceArmDnsZone(),
"azurestack_dns_a_record": resourceArmDnsARecord(),
"azurestack_network_interface": resourceArmNetworkInterface(),
"azurestack_network_security_group": resourceArmNetworkSecurityGroup(),
"azurestack_network_security_rule": resourceArmNetworkSecurityRule(),
"azurestack_local_network_gateway": resourceArmLocalNetworkGateway(),
"azurestack_lb": resourceArmLoadBalancer(),
"azurestack_lb_backend_address_pool": resourceArmLoadBalancerBackendAddressPool(),
"azurestack_lb_nat_rule": resourceArmLoadBalancerNatRule(),
"azurestack_lb_probe": resourceArmLoadBalancerProbe(),
"azurestack_lb_nat_pool": resourceArmLoadBalancerNatPool(),
"azurestack_lb_rule": resourceArmLoadBalancerRule(),
"azurestack_public_ip": resourceArmPublicIp(),
"azurestack_resource_group": resourceArmResourceGroup(),
"azurestack_route": resourceArmRoute(),
"azurestack_route_table": resourceArmRouteTable(),
"azurestack_storage_account": resourceArmStorageAccount(),
"azurestack_storage_blob": resourceArmStorageBlob(),
"azurestack_storage_container": resourceArmStorageContainer(),
"azurestack_subnet": resourceArmSubnet(),
"azurestack_template_deployment": resourceArmTemplateDeployment(),
"azurestack_virtual_network": resourceArmVirtualNetwork(),
"azurestack_virtual_network_gateway": resourceArmVirtualNetworkGateway(),
"azurestack_virtual_machine": resourceArmVirtualMachine(),
"azurestack_virtual_machine_extension": resourceArmVirtualMachineExtensions(),
"azurestack_virtual_network_gateway_connection": resourceArmVirtualNetworkGatewayConnection(),
},
}

Expand Down
4 changes: 4 additions & 0 deletions azurestack/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@ func testLocation() string {
return os.Getenv("ARM_TEST_LOCATION")
}

func testAltLocation() string {
return os.Getenv("ARM_TEST_LOCATION_ALT")
}

func testGetAzureConfig(t *testing.T) *authentication.Config {
if os.Getenv(resource.TestEnvVar) == "" {
t.Skip(fmt.Sprintf("Integration test skipped unless env '%s' set", resource.TestEnvVar))
Expand Down
Loading