v12 fix IBM-Cloud#1090 Validate Schema for name input field for VPC r…

…esources
kavya498 · Feb 13, 2020 · 3bd0ff2 · 3bd0ff2
1 parent 41ee2c6
commit 3bd0ff2
Show file tree

Hide file tree

Showing 19 changed files with 100 additions and 53 deletions.
diff --git a/ibm/resource_ibm_is_floating_ip.go b/ibm/resource_ibm_is_floating_ip.go
@@ -7,7 +7,6 @@ import (
 
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
-
 	"github.ibm.com/Bluemix/riaas-go-client/clients/network"
 	iserrors "github.ibm.com/Bluemix/riaas-go-client/errors"
 )
@@ -47,9 +46,10 @@ func resourceIBMISFloatingIP() *schema.Resource {
 			},
 
 			isFloatingIPName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isFloatingIPStatus: {

diff --git a/ibm/resource_ibm_is_ike_policy.go b/ibm/resource_ibm_is_ike_policy.go
@@ -35,8 +35,9 @@ func resourceIBMISIKEPolicy() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isIKEName: {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateISName,
 			},
 
 			isIKEAuthenticationAlg: {

diff --git a/ibm/resource_ibm_is_image.go b/ibm/resource_ibm_is_image.go
@@ -59,9 +59,10 @@ func resourceIBMISImage() *schema.Resource {
 			},
 
 			isImageName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isImageTags: {

diff --git a/ibm/resource_ibm_is_instance.go b/ibm/resource_ibm_is_instance.go
@@ -110,9 +110,10 @@ func resourceIBMISInstance() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isInstanceName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isInstanceVPC: {

diff --git a/ibm/resource_ibm_is_ipsec_policy.go b/ibm/resource_ibm_is_ipsec_policy.go
@@ -34,8 +34,9 @@ func resourceIBMISIPSecPolicy() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isIpSecName: {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateISName,
 			},
 
 			isIpSecAuthenticationAlg: {

diff --git a/ibm/resource_ibm_is_lb.go b/ibm/resource_ibm_is_lb.go
@@ -55,9 +55,10 @@ func resourceIBMISLB() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 
 			isLBName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isLBType: {

diff --git a/ibm/resource_ibm_is_lb_pool.go b/ibm/resource_ibm_is_lb_pool.go
@@ -54,8 +54,9 @@ func resourceIBMISLBPool() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isLBPoolName: {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateISName,
 			},
 
 			isLBID: {

diff --git a/ibm/resource_ibm_is_networkacls.go b/ibm/resource_ibm_is_networkacls.go
@@ -52,9 +52,10 @@ func resourceIBMISNetworkACL() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isNetworkACLName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 			isNetworkACLVPC: {
 				Type:     schema.TypeString,

diff --git a/ibm/resource_ibm_is_public_gateway.go b/ibm/resource_ibm_is_public_gateway.go
@@ -40,9 +40,10 @@ func resourceIBMISPublicGateway() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isPublicGatewayName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isPublicGatewayFloatingIP: {

diff --git a/ibm/resource_ibm_is_security_group.go b/ibm/resource_ibm_is_security_group.go
@@ -2,7 +2,6 @@ package ibm
 
 import (
 	"github.com/go-openapi/strfmt"
-
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	gouuid "github.com/satori/go.uuid"
 	"github.ibm.com/Bluemix/riaas-go-client/clients/network"
@@ -30,10 +29,11 @@ func resourceIBMISSecurityGroup() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 
 			isSecurityGroupName: {
-				Type:        schema.TypeString,
-				Optional:    true,
-				Computed:    true,
-				Description: "Security group name",
+				Type:         schema.TypeString,
+				Optional:     true,
+				Computed:     true,
+				Description:  "Security group name",
+				ValidateFunc: validateISName,
 			},
 			isSecurityGroupVPC: {
 				Type:        schema.TypeString,

diff --git a/ibm/resource_ibm_is_ssh_key.go b/ibm/resource_ibm_is_ssh_key.go
@@ -37,9 +37,10 @@ func resourceIBMISSSHKey() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isKeyName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isKeyPublicKey: {

diff --git a/ibm/resource_ibm_is_subnet.go b/ibm/resource_ibm_is_subnet.go
@@ -82,9 +82,10 @@ func resourceIBMISSubnet() *schema.Resource {
 			},
 
 			isSubnetName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isSubnetNetworkACL: {

diff --git a/ibm/resource_ibm_is_volume.go b/ibm/resource_ibm_is_volume.go
@@ -54,8 +54,9 @@ func resourceIBMISVolume() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 
 			isVolumeName: {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateISName,
 			},
 
 			isVolumeProfileName: {

diff --git a/ibm/resource_ibm_is_vpc.go b/ibm/resource_ibm_is_vpc.go
@@ -85,9 +85,10 @@ func resourceIBMISVPC() *schema.Resource {
 			},
 
 			isVPCName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isVPCResourceGroup: {

diff --git a/ibm/resource_ibm_is_vpc_address_prefix.go b/ibm/resource_ibm_is_vpc_address_prefix.go
@@ -28,9 +28,10 @@ func resourceIBMISVpcAddressPrefix() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isVPCAddressPrefixPrefixName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 			isVPCAddressPrefixZoneName: {
 				Type:     schema.TypeString,

diff --git a/ibm/resource_ibm_is_vpc_route.go b/ibm/resource_ibm_is_vpc_route.go
@@ -40,9 +40,10 @@ func resourceIBMISVpcRoute() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			isVPCRouteName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 			isVPCRouteLocation: {
 				Type:     schema.TypeString,

diff --git a/ibm/resource_ibm_is_vpn_gateway.go b/ibm/resource_ibm_is_vpn_gateway.go
@@ -48,9 +48,10 @@ func resourceIBMISVPNGateway() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 
 			isVPNGatewayName: {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: false,
+				Type:         schema.TypeString,
+				Required:     true,
+				ForceNew:     false,
+				ValidateFunc: validateISName,
 			},
 
 			isVPNGatewaySubnet: {

diff --git a/ibm/resource_ibm_is_vpn_gateway_connections.go b/ibm/resource_ibm_is_vpn_gateway_connections.go
@@ -49,8 +49,9 @@ func resourceIBMISVPNGatewayConnection() *schema.Resource {
 		Schema: map[string]*schema.Schema{
 
 			isVPNGatewayConnectionName: {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: validateISName,
 			},
 
 			isVPNGatewayConnectionVPNGateway: {

diff --git a/ibm/validators.go b/ibm/validators.go
@@ -8,10 +8,11 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/IBM-Cloud/bluemix-go/helpers"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
 	homedir "github.com/mitchellh/go-homedir"
 	gouuid "github.com/satori/go.uuid"
+
+	"github.com/IBM-Cloud/bluemix-go/helpers"
 )
 
 var (
@@ -935,3 +936,33 @@ func validateLBListenerConnectionLimit(v interface{}, k string) (ws []string, er
 	}
 	return
 }
+
+func validateISName(v interface{}, k string) (ws []string, errors []error) {
+	name := v.(string)
+	acceptedcharacters, _ := regexp.MatchString(`^[a-z][-a-z0-9]*$`, name)
+	endwithalphanumeric, _ := regexp.MatchString(`.*[a-z0-9]$`, name)
+	length := len(name)
+	if acceptedcharacters == true {
+		if length <= 40 {
+			if endwithalphanumeric == true {
+				if strings.Contains(name, "--") != true {
+					return
+				} else {
+					errors = append(errors, fmt.Errorf(
+						"%q (%q) should not contain consecutive dash(-)", k, v))
+				}
+			} else {
+				errors = append(errors, fmt.Errorf(
+					"%q (%q) should not end with dash(-) ", k, v))
+			}
+		} else {
+			errors = append(errors, fmt.Errorf(
+				"%q (%q) should not exceed 40 characters", k, v))
+		}
+
+	} else {
+		errors = append(errors, fmt.Errorf(
+			"%q (%q) should contain only lowercase alphanumeric,dash and should begin with lowercase character", k, v))
+	}
+	return
+}