Merge pull request #1017 from ewbankkit/patch-1

paddycarver · web-flow · commit 6eb6333f3c0d · 2018-01-29T08:21:42.000-08:00
Fix nil pointer dereference updating project labels
diff --git a/google/resource_google_project.go b/google/resource_google_project.go
@@ -289,7 +289,7 @@ func resourceGoogleProjectUpdate(d *schema.ResourceData, meta interface{}) error
 		// Do Update on project
 		p, err = config.clientResourceManager.Projects.Update(p.ProjectId, p).Do()
 		if err != nil {
-			return fmt.Errorf("Error updating project %q: %s", p.Name, err)
+			return fmt.Errorf("Error updating project %q: %s", project_name, err)
 		}
 	}
 	d.Partial(false)

Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,7 @@ func resourceGoogleProjectUpdate(d *schema.ResourceData, meta interface{}) error`
`289`	`289`	`// Do Update on project`
`290`	`290`	`p, err = config.clientResourceManager.Projects.Update(p.ProjectId, p).Do()`
`291`	`291`	`if err != nil {`
`292`		`- return fmt.Errorf("Error updating project %q: %s", p.Name, err)`
	`292`	`+ return fmt.Errorf("Error updating project %q: %s", project_name, err)`
`293`	`293`	`}`
`294`	`294`	`}`
`295`	`295`	`d.Partial(false)`