networking: fixing up the PR comments

hashicorp · Nov 29, 2019 · 188cd61 · 188cd61
1 parent 2dc08c9
commit 188cd61
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 32 deletions.
diff --git a/azurerm/resource_arm_point_to_site_vpn_gateway.go b/azurerm/resource_arm_point_to_site_vpn_gateway.go
@@ -7,6 +7,7 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/validate"
@@ -63,11 +64,15 @@ func resourceArmPointToSiteVPNGateway() *schema.Resource {
 			"connection_configuration": {
 				Type:     schema.TypeList,
 				Required: true,
+				// Code="P2SVpnGatewayCanHaveOnlyOneP2SConnectionConfiguration"
+				// Message="Currently, P2SVpnGateway [ID] can have only one P2SConnectionConfiguration. Specified number of P2SConnectionConfiguration are 2.
+				MaxItems: 1,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
 						"name": {
-							Type:     schema.TypeString,
-							Required: true,
+							Type:         schema.TypeString,
+							Required:     true,
+							ValidateFunc: validate.NoEmptyStrings,
 						},
 
 						"vpn_client_address_pool": {
@@ -89,14 +94,12 @@ func resourceArmPointToSiteVPNGateway() *schema.Resource {
 						},
 					},
 				},
-				// Code="P2SVpnGatewayCanHaveOnlyOneP2SConnectionConfiguration"
-				// Message="Currently, P2SVpnGateway [ID] can have only one P2SConnectionConfiguration. Specified number of P2SConnectionConfiguration are 2.
-				MaxItems: 1,
 			},
 
 			"scale_unit": {
-				Type:     schema.TypeInt,
-				Required: true,
+				Type:         schema.TypeInt,
+				Required:     true,
+				ValidateFunc: validation.IntAtLeast(0),
 			},
 
 			"tags": tags.Schema(),

diff --git a/azurerm/resource_arm_point_to_site_vpn_gateway_test.go b/azurerm/resource_arm_point_to_site_vpn_gateway_test.go
@@ -180,7 +180,7 @@ func testAccAzureRMAzureRMPointToSiteVPNGateway_basic(rInt int, location string)
 %s
 
 resource "azurerm_point_to_site_vpn_gateway" "test" {
-  name                        = "acctestp2svpng-%d"
+  name                        = "acctestp2sVPNG-%d"
   location                    = azurerm_resource_group.test.location
   resource_group_name         = azurerm_resource_group.test.name
   virtual_hub_id              = azurerm_virtual_hub.test.id
@@ -203,7 +203,7 @@ func testAccAzureRMAzureRMPointToSiteVPNGateway_updated(rInt int, location strin
 %s
 
 resource "azurerm_point_to_site_vpn_gateway" "test" {
-  name                        = "acctestp2svpng-%d"
+  name                        = "acctestp2sVPNG-%d"
   location                    = azurerm_resource_group.test.location
   resource_group_name         = azurerm_resource_group.test.name
   virtual_hub_id              = azurerm_virtual_hub.test.id
@@ -249,7 +249,7 @@ func testAccAzureRMAzureRMPointToSiteVPNGateway_tags(rInt int, location string)
 %s
 
 resource "azurerm_point_to_site_vpn_gateway" "test" {
-  name                        = "acctestp2svpng-%d"
+  name                        = "acctestp2sVPNG-%d"
   location                    = azurerm_resource_group.test.location
   resource_group_name         = azurerm_resource_group.test.name
   virtual_hub_id              = azurerm_virtual_hub.test.id

diff --git a/azurerm/resource_arm_virtual_hub.go b/azurerm/resource_arm_virtual_hub.go
@@ -21,7 +21,7 @@ import (
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/utils"
 )
 
-var virtualHubResourceName = "azurerm_virtual_hub"
+const virtualHubResourceName = "azurerm_virtual_hub"
 
 func resourceArmVirtualHub() *schema.Resource {
 	return &schema.Resource{

diff --git a/azurerm/resource_arm_virtual_hub_test.go b/azurerm/resource_arm_virtual_hub_test.go
@@ -215,7 +215,7 @@ func testAccAzureRMVirtualHub_basic(rInt int, location string) string {
 %s
 
 resource "azurerm_virtual_hub" "test" {
-  name                = "acctestvhub-%d"
+  name                = "acctestVHUB-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   virtual_wan_id      = azurerm_virtual_wan.test.id
@@ -244,7 +244,7 @@ func testAccAzureRMVirtualHub_updated(rInt int, location string) string {
 %s
 
 resource "azurerm_virtual_hub" "test" {
-  name                = "acctestvhub-%d"
+  name                = "acctestVHUB-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   virtual_wan_id      = azurerm_virtual_wan.test.id
@@ -259,7 +259,7 @@ func testAccAzureRMVirtualHub_route(rInt int, location string) string {
 %s
 
 resource "azurerm_virtual_hub" "test" {
-  name                = "acctestvhub-%d"
+  name                = "acctestVHUB-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   virtual_wan_id      = azurerm_virtual_wan.test.id
@@ -279,7 +279,7 @@ func testAccAzureRMVirtualHub_routeUpdated(rInt int, location string) string {
 %s
 
 resource "azurerm_virtual_hub" "test" {
-  name                = "acctestvhub-%d"
+  name                = "acctestVHUB-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   virtual_wan_id      = azurerm_virtual_wan.test.id
@@ -299,7 +299,7 @@ func testAccAzureRMVirtualHub_tags(rInt int, location string) string {
 %s
 
 resource "azurerm_virtual_hub" "test" {
-  name                = "acctestvhub-%d"
+  name                = "acctestVHUB-%d"
   resource_group_name = azurerm_resource_group.test.name
   location            = azurerm_resource_group.test.location
   virtual_wan_id      = azurerm_virtual_wan.test.id

diff --git a/azurerm/resource_arm_vpn_gateway.go b/azurerm/resource_arm_vpn_gateway.go
@@ -9,6 +9,7 @@ import (
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2019-09-01/network"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/azure"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/response"
 	"github.com/terraform-providers/terraform-provider-azurerm/azurerm/helpers/tf"
@@ -49,8 +50,10 @@ func resourceArmVPNGateway() *schema.Resource {
 			"location": azure.SchemaLocation(),
 
 			"virtual_hub_id": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     true,
+				ValidateFunc: networkSvc.ValidateVirtualHubID,
 			},
 
 			"bgp_settings": {
@@ -80,9 +83,10 @@ func resourceArmVPNGateway() *schema.Resource {
 			},
 
 			"scale_unit": {
-				Type:     schema.TypeInt,
-				Optional: true,
-				Default:  1,
+				Type:         schema.TypeInt,
+				Optional:     true,
+				Default:      1,
+				ValidateFunc: validation.IntAtLeast(0),
 			},
 
 			"tags": tags.Schema(),

diff --git a/azurerm/resource_arm_vpn_gateway_test.go b/azurerm/resource_arm_vpn_gateway_test.go
@@ -229,7 +229,7 @@ func testAccAzureRMVPNGateway_basic(rInt int, location string) string {
 %s
 
 resource "azurerm_vpn_gateway" "test" {
-  name                = "acctestvpng-%d"
+  name                = "acctestVPNG-%d"
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   virtual_hub_id      = azurerm_virtual_hub.test.id
@@ -257,7 +257,7 @@ func testAccAzureRMVPNGateway_bgpSettings(rInt int, location string) string {
 %s
 
 resource "azurerm_vpn_gateway" "test" {
-  name                = "acctestvpng-%d"
+  name                = "acctestVPNG-%d"
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   virtual_hub_id      = azurerm_virtual_hub.test.id
@@ -276,7 +276,7 @@ func testAccAzureRMVPNGateway_scaleUnit(rInt int, location string, scaleUnit int
 %s
 
 resource "azurerm_vpn_gateway" "test" {
-  name                = "acctestvpng-%d"
+  name                = "acctestVPNG-%d"
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   virtual_hub_id      = azurerm_virtual_hub.test.id
@@ -291,7 +291,7 @@ func testAccAzureRMVPNGateway_tags(rInt int, location string) string {
 %s
 
 resource "azurerm_vpn_gateway" "test" {
-  name                = "acctestvpng-%d"
+  name                = "acctestVPNG-%d"
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   virtual_hub_id      = azurerm_virtual_hub.test.id
@@ -309,7 +309,7 @@ func testAccAzureRMVPNGateway_tagsUpdated(rInt int, location string) string {
 %s
 
 resource "azurerm_vpn_gateway" "test" {
-  name                = "acctestvpng-%d"
+  name                = "acctestVPNG-%d"
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   virtual_hub_id      = azurerm_virtual_hub.test.id

diff --git a/azurerm/resource_arm_vpn_server_configuration.go b/azurerm/resource_arm_vpn_server_configuration.go
@@ -771,7 +771,6 @@ func flattenVpnServerConfigurationRadiusServer(input *network.VpnServerConfigura
 		radiusAddress = *input.RadiusServerAddress
 	}
 
-	// TODO: confirm if secret is returned or if we need to look it up
 	radiusSecret := ""
 	if input.RadiusServerSecret != nil {
 		radiusSecret = *input.RadiusServerSecret

diff --git a/azurerm/resource_arm_vpn_server_configuration_test.go b/azurerm/resource_arm_vpn_server_configuration_test.go
@@ -257,7 +257,7 @@ func testAccAzureRMAzureRMVPNServerConfiguration_azureAD(rInt int, location stri
 %s
 
 resource "azurerm_vpn_server_configuration" "test" {
-  name                    = "acctestrg-%d"
+  name                    = "acctestVPNSC-%d"
   resource_group_name     = azurerm_resource_group.test.name
   location                = azurerm_resource_group.test.location
   vpn_authentication_types =  [ "AAD" ]
@@ -277,7 +277,7 @@ func testAccAzureRMAzureRMVPNServerConfiguration_certificate(rInt int, location
 %s
 
 resource "azurerm_vpn_server_configuration" "test" {
-  name                     = "acctestrg-%d"
+  name                     = "acctestVPNSC-%d"
   resource_group_name      = azurerm_resource_group.test.name
   location                 = azurerm_resource_group.test.location
   vpn_authentication_types = ["Certificate"]
@@ -317,7 +317,7 @@ func testAccAzureRMAzureRMVPNServerConfiguration_certificateUpdated(rInt int, lo
 %s
 
 resource "azurerm_vpn_server_configuration" "test" {
-  name                     = "acctestrg-%d"
+  name                     = "acctestVPNSC-%d"
   resource_group_name      = azurerm_resource_group.test.name
   location                 = azurerm_resource_group.test.location
   vpn_authentication_types = ["Certificate"]
@@ -362,7 +362,7 @@ func testAccAzureRMAzureRMVPNServerConfiguration_radius(rInt int, location strin
 %s
 
 resource "azurerm_vpn_server_configuration" "test" {
-  name                    = "acctestrg-%d"
+  name                    = "acctestVPNSC-%d"
   resource_group_name     = azurerm_resource_group.test.name
   location                = azurerm_resource_group.test.location
   vpn_authentication_types =  [ "Radius" ]
@@ -447,7 +447,7 @@ func testAccAzureRMAzureRMVPNServerConfiguration_tags(rInt int, location string)
 %s
 
 resource "azurerm_vpn_server_configuration" "test" {
-  name                     = "acctestrg-%d"
+  name                     = "acctestVPNSC-%d"
   resource_group_name      = azurerm_resource_group.test.name
   location                 = azurerm_resource_group.test.location
   vpn_authentication_types = ["Certificate"]