From c17464294178c4e7bbfd88575f921dbea8ae22ed Mon Sep 17 00:00:00 2001 From: gambtho Date: Tue, 17 Sep 2019 02:30:57 -0400 Subject: [PATCH] fixed path to bastion client --- azurerm/internal/services/network/client.go | 5 +++++ azurerm/resource_arm_bastion_host.go | 6 +++--- azurerm/resource_arm_bastion_host_test.go | 4 ++-- website/docs/r/bastion_host.html.markdown | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/azurerm/internal/services/network/client.go b/azurerm/internal/services/network/client.go index 81c0dba8add6d..cca6ebaa7f2df 100644 --- a/azurerm/internal/services/network/client.go +++ b/azurerm/internal/services/network/client.go @@ -9,6 +9,7 @@ type Client struct { ApplicationGatewaysClient *network.ApplicationGatewaysClient ApplicationSecurityGroupsClient *network.ApplicationSecurityGroupsClient AzureFirewallsClient *network.AzureFirewallsClient + BastionHostsClient *network.BastionHostsClient ConnectionMonitorsClient *network.ConnectionMonitorsClient DDOSProtectionPlansClient *network.DdosProtectionPlansClient ExpressRouteAuthsClient *network.ExpressRouteCircuitAuthorizationsClient @@ -46,6 +47,9 @@ func BuildClient(o *common.ClientOptions) *Client { AzureFirewallsClient := network.NewAzureFirewallsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&AzureFirewallsClient.Client, o.ResourceManagerAuthorizer) + BastionHostsClient := network.NewBastionHostsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) + o.ConfigureClient(&AzureFirewallsClient.Client, o.ResourceManagerAuthorizer) + ConnectionMonitorsClient := network.NewConnectionMonitorsClientWithBaseURI(o.ResourceManagerEndpoint, o.SubscriptionId) o.ConfigureClient(&ConnectionMonitorsClient.Client, o.ResourceManagerAuthorizer) @@ -122,6 +126,7 @@ func BuildClient(o *common.ClientOptions) *Client { ApplicationGatewaysClient: &ApplicationGatewaysClient, ApplicationSecurityGroupsClient: &ApplicationSecurityGroupsClient, AzureFirewallsClient: &AzureFirewallsClient, + BastionHostsClient: &BastionHostsClient, ConnectionMonitorsClient: &ConnectionMonitorsClient, DDOSProtectionPlansClient: &DDOSProtectionPlansClient, ExpressRouteAuthsClient: &ExpressRouteAuthsClient, diff --git a/azurerm/resource_arm_bastion_host.go b/azurerm/resource_arm_bastion_host.go index 970e0a677a522..dc2fc0d497415 100644 --- a/azurerm/resource_arm_bastion_host.go +++ b/azurerm/resource_arm_bastion_host.go @@ -71,7 +71,7 @@ func resourceArmBastionHost() *schema.Resource { } func resourceArmBastionHostCreateUpdate(d *schema.ResourceData, meta interface{}) error { - client := meta.(*ArmClient).bastionHostsClient + client := meta.(*ArmClient).network.BastionHostsClient ctx := meta.(*ArmClient).StopContext log.Println("[INFO] preparing arguments for Azure Bastion Host creation.") @@ -156,7 +156,7 @@ func resourceArmBastionHostCreateUpdate(d *schema.ResourceData, meta interface{} } func resourceArmBastionHostRead(d *schema.ResourceData, meta interface{}) error { - client := meta.(*ArmClient).bastionHostsClient + client := meta.(*ArmClient).network.BastionHostsClient ctx := meta.(*ArmClient).StopContext id, err := parseAzureResourceID(d.Id()) @@ -182,7 +182,7 @@ func resourceArmBastionHostRead(d *schema.ResourceData, meta interface{}) error } func resourceArmBastionHostDelete(d *schema.ResourceData, meta interface{}) error { - client := meta.(*ArmClient).bastionHostsClient + client := meta.(*ArmClient).network.BastionHostsClient ctx := meta.(*ArmClient).StopContext id, err := parseAzureResourceID(d.Id()) diff --git a/azurerm/resource_arm_bastion_host_test.go b/azurerm/resource_arm_bastion_host_test.go index da74eb947dc9a..00a088b8bca02 100644 --- a/azurerm/resource_arm_bastion_host_test.go +++ b/azurerm/resource_arm_bastion_host_test.go @@ -76,7 +76,7 @@ resource "azurerm_bastion_host" "test" { func testCheckAzureRMBastionHostExists(resourceName string) resource.TestCheckFunc { return func(s *terraform.State) error { - client := testAccProvider.Meta().(*ArmClient).bastionHostsClient + client := testAccProvider.Meta().(*ArmClient).network.BastionHostsClient ctx := testAccProvider.Meta().(*ArmClient).StopContext rs, ok := s.RootModule().Resources[resourceName] @@ -101,7 +101,7 @@ func testCheckAzureRMBastionHostExists(resourceName string) resource.TestCheckFu } func testCheckAzureRMBastionHostDestroy(s *terraform.State) error { - client := testAccProvider.Meta().(*ArmClient).bastionHostsClient + client := testAccProvider.Meta().(*ArmClient).network.BastionHostsClient ctx := testAccProvider.Meta().(*ArmClient).StopContext for _, rs := range s.RootModule().Resources { diff --git a/website/docs/r/bastion_host.html.markdown b/website/docs/r/bastion_host.html.markdown index 8ddae943cd6ee..e132046ecb184 100644 --- a/website/docs/r/bastion_host.html.markdown +++ b/website/docs/r/bastion_host.html.markdown @@ -13,7 +13,7 @@ Manages a Bastion Host Instance. ## Example Usage -This example deploys an Azure Bastion Host Instance to a target virtual network. +This example deploys an Azure Bastion Host Instance to a virtual network. ```hcl resource "azurerm_resource_group" "test" {