Skip to content

Commit 6d084e6

Browse files
authored
Fix nil pointer dereference importing gitlab_user (#490)
1 parent db10e24 commit 6d084e6

File tree

2 files changed

+2
-19
lines changed

2 files changed

+2
-19
lines changed

gitlab/resource_gitlab_user.go

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,7 @@ func resourceGitlabUser() *schema.Resource {
1616
Update: resourceGitlabUserUpdate,
1717
Delete: resourceGitlabUserDelete,
1818
Importer: &schema.ResourceImporter{
19-
State: func(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
20-
client := meta.(*gitlab.Client)
21-
log.Printf("[DEBUG] read gitlab user %s", d.Id())
22-
23-
id, _ := strconv.Atoi(d.Id())
24-
25-
user, _, err := client.Users.GetUser(id)
26-
if err != nil {
27-
return nil, err
28-
}
29-
30-
resourceGitlabUserSetToState(d, user)
31-
d.Set("email", user.Email)
32-
d.Set("is_admin", user.IsAdmin)
33-
d.Set("is_external", user.External)
34-
return []*schema.ResourceData{d}, nil
35-
},
19+
State: schema.ImportStatePassthrough,
3620
},
3721

3822
Schema: map[string]*schema.Schema{
@@ -94,7 +78,7 @@ func resourceGitlabUserSetToState(d *schema.ResourceData, user *gitlab.User) {
9478
d.Set("email", user.Email)
9579
d.Set("is_admin", user.IsAdmin)
9680
d.Set("is_external", user.External)
97-
d.Set("skip_confirmation", !user.ConfirmedAt.IsZero())
81+
d.Set("skip_confirmation", user.ConfirmedAt != nil && !user.ConfirmedAt.IsZero())
9882
}
9983

10084
func resourceGitlabUserCreate(d *schema.ResourceData, meta interface{}) error {

gitlab/resource_gitlab_user_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ func TestAccGitlabUser_basic(t *testing.T) {
8181
ImportStateVerify: true,
8282
ImportStateVerifyIgnore: []string{
8383
"password",
84-
"skip_confirmation",
8584
},
8685
},
8786
},

0 commit comments

Comments
 (0)