Fix Id management by using a two part id

Author: sudoapt-getclean

gitlab/resource_gitlab_project_variable.go

@@ -13,6 +13,9 @@ func resourceGitlabProjectVariable() *schema.Resource {
 		Read:   resourceGitlabProjectVariableRead,
 		Update: resourceGitlabProjectVariableUpdate,
 		Delete: resourceGitlabProjectVariableDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
 
 		Schema: map[string]*schema.Schema{
 			"project": {
@@ -49,27 +52,37 @@ func resourceGitlabProjectVariableCreate(d *schema.ResourceData, meta interface{
 	}
 	log.Printf("[DEBUG] create gitlab project variable %s/%s", project, key)
 
-	_, _, err := client.BuildVariables.CreateBuildVariable(project, options)
+	v, _, err := client.BuildVariables.CreateBuildVariable(project, options)
 	if err != nil {
 		return err
 	}
 
+	d.SetId(buildTwoPartID(&project, &v.Key))
+
 	return resourceGitlabProjectVariableRead(d, meta)
 }
 
 func resourceGitlabProjectVariableRead(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
-	project := d.Get("project").(string)
-	key := d.Get("key").(string)
+
+	project, key, err := parseTwoPartID(d.Id())
+	if err != nil {
+		return err
+	}
+
 	log.Printf("[DEBUG] read gitlab project variable %s/%s", project, key)
 
 	v, _, err := client.BuildVariables.GetBuildVariable(project, key)
 	if err != nil {
 		return err
 	}
 
+	d.Set("key", v.Key)
 	d.Set("value", v.Value)
+	d.Set("project", project)
 	d.Set("protected", v.Protected)
+	d.SetId(buildTwoPartID(&project, &v.Key))
+
 	return nil
 }
 
@@ -84,11 +97,13 @@ func resourceGitlabProjectVariableUpdate(d *schema.ResourceData, meta interface{
 	}
 	log.Printf("[DEBUG] update gitlab project variable %s/%s", project, key)
 
-	_, _, err := client.BuildVariables.UpdateBuildVariable(project, key, options)
+	v, _, err := client.BuildVariables.UpdateBuildVariable(project, key, options)
 	if err != nil {
 		return err
 	}
 
+	d.SetId(buildTwoPartID(&project, &v.Key))
+
 	return resourceGitlabProjectVariableRead(d, meta)
 }
 

gitlab/util.go

@@ -6,6 +6,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/xanzy/go-gitlab"
 	"regexp"
+	"strings"
 )
 
 // copied from ../github/util.go
@@ -59,3 +60,18 @@ func StringIsGitlabVariableName() schema.SchemaValidateFunc {
 		return
 	}
 }
+
+// return the pieces of id `a:b` as a, b
+func parseTwoPartID(id string) (string, string, error) {
+	parts := strings.SplitN(id, ":", 2)
+	if len(parts) != 2 {
+		return "", "", fmt.Errorf("Unexpected ID format (%q). Expected project:key", id)
+	}
+
+	return parts[0], parts[1], nil
+}
+
+// format the strings into an id `a:b`
+func buildTwoPartID(a, b *string) string {
+	return fmt.Sprintf("%s:%s", *a, *b)
+}