Merge pull request #41 from ThatGerber/fix-default-branch-update

roidelapluie · web-flow · commit d6ccefea991a · 2018-06-28T23:06:10.000+02:00
Fixes error when updating default branch
diff --git a/gitlab/resource_gitlab_project.go b/gitlab/resource_gitlab_project.go
@@ -183,7 +183,7 @@ func resourceGitlabProjectUpdate(d *schema.ResourceData, meta interface{}) error
 	}
 
 	if d.HasChange("default_branch") {
-		options.DefaultBranch = gitlab.String(d.Get("description").(string))
+		options.DefaultBranch = gitlab.String(d.Get("default_branch").(string))
 	}
 
 	if d.HasChange("visibility_level") {
@@ -235,10 +235,9 @@ func resourceGitlabProjectDelete(d *schema.ResourceData, meta interface{}) error
 			if err != nil {
 				if response.StatusCode == 404 {
 					return out, "Deleted", nil
-				} else {
-					log.Printf("[ERROR] Received error: %#v", err)
-					return out, "Error", err
 				}
+				log.Printf("[ERROR] Received error: %#v", err)
+				return out, "Error", err
 			}
 			return out, "Deleting", nil
 		},

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ func resourceGitlabProjectUpdate(d *schema.ResourceData, meta interface{}) error`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`if d.HasChange("default_branch") {`
`186`		`- options.DefaultBranch = gitlab.String(d.Get("description").(string))`
	`186`	`+ options.DefaultBranch = gitlab.String(d.Get("default_branch").(string))`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`if d.HasChange("visibility_level") {`
`@@ -235,10 +235,9 @@ func resourceGitlabProjectDelete(d *schema.ResourceData, meta interface{}) error`
`235`	`235`	`if err != nil {`
`236`	`236`	`if response.StatusCode == 404 {`
`237`	`237`	`return out, "Deleted", nil`
`238`		`- } else {`
`239`		`- log.Printf("[ERROR] Received error: %#v", err)`
`240`		`- return out, "Error", err`
`241`	`238`	`}`
	`239`	`+ log.Printf("[ERROR] Received error: %#v", err)`
	`240`	`+ return out, "Error", err`
`242`	`241`	`}`
`243`	`242`	`return out, "Deleting", nil`
`244`	`243`	`},`