Added validation on Variable Key.

Author: Thibault Drevon

gitlab/provider.go

@@ -54,7 +54,7 @@ func Provider() terraform.ResourceProvider {
 			"gitlab_deploy_key":         resourceGitlabDeployKey(),
 			"gitlab_user":               resourceGitlabUser(),
 			"gitlab_project_membership": resourceGitlabProjectMembership(),
-			"gitlab_project_variable": 	 resourceGitlabProjectVariable(),
+			"gitlab_project_variable":   resourceGitlabProjectVariable(),
 		},
 
 		ConfigureFunc: providerConfigure,

gitlab/resource_gitlab_project_variable.go

@@ -20,8 +20,9 @@ func resourceGitlabProjectVariable() *schema.Resource {
 				Required: true,
 			},
 			"key": {
-				Type:     schema.TypeString,
-				Required: true,
+				Type:         schema.TypeString,
+				Required:     true,
+				ValidateFunc: StringIsGitlabVariableName(),
 			},
 			"value": {
 				Type:      schema.TypeString,

gitlab/resource_gitlab_project_variable_test.go

@@ -24,17 +24,15 @@ func TestAccGitlabProjectVariable_basic(t *testing.T) {
 				Config: testAccGitlabProjectVariableConfig(rString),
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckGitlabProjectVariableExists("gitlab_project_variable.foo", &projectVariable),
-					testAccCheckGitlabProjectVariableAttributes(&projectVariable, &testAccGitlabProjectVariableExpectedAttributes{
-						Key:   fmt.Sprintf("key-%s", rString),
-						Value: fmt.Sprintf("value-%s", rString),
-					}),
+					resource.TestCheckResourceAttr("gitlab_project_variable.foo", "Key", fmt.Sprintf("key-%s", rString)),
+					resource.TestCheckResourceAttr("gitlab_project_variable.foo", "Value", fmt.Sprintf("value-%s", rString)),
 				),
 			},
 			// Update the project variable to toggle all the values to their inverse
 			{
 				Config: testAccGitlabProjectVariableUpdateConfig(rString),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGitlabProjectVariableExists("gitlab_project_hook.foo", &projectVariable),
+					testAccCheckGitlabProjectVariableExists("gitlab_project_variable.foo", &projectVariable),
 					testAccCheckGitlabProjectVariableAttributes(&projectVariable, &testAccGitlabProjectVariableExpectedAttributes{
 						Key:       fmt.Sprintf("key-%s", rString),
 						Value:     fmt.Sprintf("value-inverse-%s", rString),
@@ -46,7 +44,7 @@ func TestAccGitlabProjectVariable_basic(t *testing.T) {
 			{
 				Config: testAccGitlabProjectVariableConfig(rString),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckGitlabProjectVariableExists("gitlab_project_hook.foo", &projectVariable),
+					testAccCheckGitlabProjectVariableExists("gitlab_project_variable.foo", &projectVariable),
 					testAccCheckGitlabProjectVariableAttributes(&projectVariable, &testAccGitlabProjectVariableExpectedAttributes{
 						Key:       fmt.Sprintf("key-%s", rString),
 						Value:     fmt.Sprintf("value-%s", rString),

gitlab/util.go

@@ -4,7 +4,8 @@ import (
 	"fmt"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	gitlab "github.com/xanzy/go-gitlab"
+	"github.com/xanzy/go-gitlab"
+	"regexp"
 )
 
 // copied from ../github/util.go
@@ -39,3 +40,22 @@ func stringToVisibilityLevel(s string) *gitlab.VisibilityValue {
 	}
 	return &value
 }
+
+func StringIsGitlabVariableName() schema.SchemaValidateFunc {
+	return func(v interface{}, k string) (s []string, es []error) {
+		value, ok := v.(string)
+		if !ok {
+			es = append(es, fmt.Errorf("expected type of %s to be string", k))
+			return
+		}
+		if len(value) < 1 || len(value) > 255 {
+			es = append(es, fmt.Errorf("expected length of %s to be in the range (%d - %d), got %s", k, 1, 255, v))
+		}
+
+		match, _ := regexp.MatchString("[a-zA-Z0-9_]+", value)
+		if !match {
+			es = append(es, fmt.Errorf("%s is an invalid value for argument %s. Only A-Z, a-z, 0-9, and _ are allowed", value, k))
+		}
+		return
+	}
+}