Refactor Project_variable to use project variable from new library

Author: sudoapt-getclean

gitlab/resource_gitlab_project_variable.go

@@ -43,16 +43,21 @@ func resourceGitlabProjectVariable() *schema.Resource {
 
 func resourceGitlabProjectVariableCreate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
+
 	project := d.Get("project").(string)
 	key := d.Get("key").(string)
-	options := &gitlab.CreateBuildVariableOptions{
-		Key:       gitlab.String(key),
-		Value:     gitlab.String(d.Get("value").(string)),
-		Protected: gitlab.Bool(d.Get("protected").(bool)),
+	value := d.Get("value").(string)
+	protected := d.Get("protected").(bool)
+
+	options := gitlab.CreateVariableOptions{
+		Key:              &key,
+		Value:            &value,
+		Protected:        &protected,
+		EnvironmentScope: nil,
 	}
 	log.Printf("[DEBUG] create gitlab project variable %s/%s", project, key)
 
-	v, _, err := client.BuildVariables.CreateBuildVariable(project, options)
+	v, _, err := client.ProjectVariables.CreateVariable(project, &options)
 	if err != nil {
 		return err
 	}
@@ -72,7 +77,7 @@ func resourceGitlabProjectVariableRead(d *schema.ResourceData, meta interface{})
 
 	log.Printf("[DEBUG] read gitlab project variable %s/%s", project, key)
 
-	v, _, err := client.BuildVariables.GetBuildVariable(project, key)
+	v, _, err := client.ProjectVariables.GetVariable(project, key)
 	if err != nil {
 		return err
 	}
@@ -88,16 +93,21 @@ func resourceGitlabProjectVariableRead(d *schema.ResourceData, meta interface{})
 
 func resourceGitlabProjectVariableUpdate(d *schema.ResourceData, meta interface{}) error {
 	client := meta.(*gitlab.Client)
+
 	project := d.Get("project").(string)
 	key := d.Get("key").(string)
-	options := &gitlab.UpdateBuildVariableOptions{
-		Key:       gitlab.String(d.Get("key").(string)),
-		Value:     gitlab.String(d.Get("value").(string)),
-		Protected: gitlab.Bool(d.Get("protected").(bool)),
+	value := d.Get("value").(string)
+	protected := d.Get("protected").(bool)
+
+	options := &gitlab.UpdateVariableOptions{
+		Key:              &key,
+		Value:            &value,
+		Protected:        &protected,
+		EnvironmentScope: nil,
 	}
 	log.Printf("[DEBUG] update gitlab project variable %s/%s", project, key)
 
-	v, _, err := client.BuildVariables.UpdateBuildVariable(project, key, options)
+	v, _, err := client.ProjectVariables.UpdateVariable(project, key, options)
 	if err != nil {
 		return err
 	}
@@ -113,6 +123,6 @@ func resourceGitlabProjectVariableDelete(d *schema.ResourceData, meta interface{
 	key := d.Get("key").(string)
 	log.Printf("[DEBUG] Delete gitlab project variable %s/%s", project, key)
 
-	_, err := client.BuildVariables.RemoveBuildVariable(project, key)
+	_, err := client.ProjectVariables.RemoveVariable(project, key)
 	return err
 }

gitlab/resource_gitlab_project_variable_test.go

@@ -11,7 +11,7 @@ import (
 )
 
 func TestAccGitlabProjectVariable_basic(t *testing.T) {
-	var projectVariable gitlab.BuildVariable
+	var projectVariable gitlab.ProjectVariable
 	rString := acctest.RandString(5)
 
 	resource.Test(t, resource.TestCase{
@@ -58,7 +58,7 @@ func TestAccGitlabProjectVariable_basic(t *testing.T) {
 	})
 }
 
-func testAccCheckGitlabProjectVariableExists(n string, projectVariable *gitlab.BuildVariable) resource.TestCheckFunc {
+func testAccCheckGitlabProjectVariableExists(n string, projectVariable *gitlab.ProjectVariable) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		rs, ok := s.RootModule().Resources[n]
 		if !ok {
@@ -75,7 +75,7 @@ func testAccCheckGitlabProjectVariableExists(n string, projectVariable *gitlab.B
 		}
 		conn := testAccProvider.Meta().(*gitlab.Client)
 
-		gotVariable, _, err := conn.BuildVariables.GetBuildVariable(repoName, key)
+		gotVariable, _, err := conn.ProjectVariables.GetVariable(repoName, key)
 		if err != nil {
 			return err
 		}
@@ -90,7 +90,7 @@ type testAccGitlabProjectVariableExpectedAttributes struct {
 	Protected bool
 }
 
-func testAccCheckGitlabProjectVariableAttributes(variable *gitlab.BuildVariable, want *testAccGitlabProjectVariableExpectedAttributes) resource.TestCheckFunc {
+func testAccCheckGitlabProjectVariableAttributes(variable *gitlab.ProjectVariable, want *testAccGitlabProjectVariableExpectedAttributes) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 		if variable.Key != want.Key {
 			return fmt.Errorf("got key %s; want %s", variable.Key, want.Key)