Fix incomplete read

Author: sudoapt-getclean

gitlab/resource_gitlab_group_membership.go

@@ -150,14 +150,13 @@ func resourceGitlabGroupMembershipDelete(d *schema.ResourceData, meta interface{
 	return err
 }
 
-func resourceGitlabGroupMembershipSetToState(d *schema.ResourceData, groupMember *gitlab.GroupMember, group_id *string) {
-	d.Set("username", groupMember.Username)
-	d.Set("email", groupMember.Email)
-	d.Set("Name", groupMember.Name)
-	d.Set("State", groupMember.State)
-	d.Set("AccessLevel", groupMember.AccessLevel)
-	d.Set("ExpiresAt", groupMember.ExpiresAt)
+func resourceGitlabGroupMembershipSetToState(d *schema.ResourceData, groupMember *gitlab.GroupMember, groupId *string) {
+
+	d.Set("group_id", groupId)
+	d.Set("user_id", groupMember.ID)
+	d.Set("access_level", accessLevel[groupMember.AccessLevel])
+	d.Set("expires_at", groupMember.ExpiresAt)
 
 	userId := strconv.Itoa(groupMember.ID)
-	d.SetId(buildTwoPartID(group_id, &userId))
+	d.SetId(buildTwoPartID(groupId, &userId))
 }

gitlab/resource_gitlab_group_variable.go

@@ -57,12 +57,12 @@ func resourceGitlabGroupVariableCreate(d *schema.ResourceData, meta interface{})
 	}
 	log.Printf("[DEBUG] create gitlab group variable %s/%s", group, key)
 
-	groupVariable, _, err := client.GroupVariables.CreateVariable(group, &options)
+	_, _, err := client.GroupVariables.CreateVariable(group, &options)
 	if err != nil {
 		return err
 	}
 
-	d.SetId(buildTwoPartID(&group, &groupVariable.Key))
+	d.SetId(buildTwoPartID(&group, &key))
 
 	return resourceGitlabGroupVariableRead(d, meta)
 }

gitlab/resource_gitlab_project_membership.go

@@ -58,11 +58,11 @@ func resourceGitlabProjectMembershipCreate(d *schema.ResourceData, meta interfac
 	}
 	log.Printf("[DEBUG] create gitlab project membership for %d in %s", options.UserID, projectId)
 
-	projectMember, _, err := client.ProjectMembers.AddProjectMember(projectId, options)
+	_, _, err := client.ProjectMembers.AddProjectMember(projectId, options)
 	if err != nil {
 		return err
 	}
-	userIdString := strconv.Itoa(projectMember.ID)
+	userIdString := strconv.Itoa(userId)
 	d.SetId(buildTwoPartID(&projectId, &userIdString))
 	return resourceGitlabProjectMembershipRead(d, meta)
 }
@@ -142,13 +142,12 @@ func resourceGitlabProjectMembershipDelete(d *schema.ResourceData, meta interfac
 	return err
 }
 
-func resourceGitlabProjectMembershipSetToState(d *schema.ResourceData, projectMember *gitlab.ProjectMember, project_id *string) {
-	d.Set("username", projectMember.Username)
-	d.Set("email", projectMember.Email)
-	d.Set("Name", projectMember.Name)
-	d.Set("State", projectMember.State)
-	d.Set("AccessLevel", projectMember.AccessLevel)
+func resourceGitlabProjectMembershipSetToState(d *schema.ResourceData, projectMember *gitlab.ProjectMember, projectId *string) {
+
+	d.Set("project_id", projectId)
+	d.Set("user_id", projectMember.ID)
+	d.Set("access_level", accessLevel[projectMember.AccessLevel])
 
 	userId := strconv.Itoa(projectMember.ID)
-	d.SetId(buildTwoPartID(project_id, &userId))
+	d.SetId(buildTwoPartID(projectId, &userId))
 }

gitlab/resource_gitlab_project_membership_test.go

@@ -80,14 +80,6 @@ type testAccGitlabProjectMembershipExpectedAttributes struct {
 	access_level string
 }
 
-var accessLevel = map[gitlab.AccessLevelValue]string{
-	gitlab.GuestPermissions:     "guest",
-	gitlab.ReporterPermissions:  "reporter",
-	gitlab.DeveloperPermissions: "developer",
-	gitlab.MasterPermissions:    "master",
-	gitlab.OwnerPermission:      "owner",
-}
-
 func testAccCheckGitlabProjectMembershipAttributes(membership *gitlab.ProjectMember, want *testAccGitlabProjectMembershipExpectedAttributes) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
 

gitlab/resource_gitlab_project_variable.go

@@ -57,12 +57,12 @@ func resourceGitlabProjectVariableCreate(d *schema.ResourceData, meta interface{
 	}
 	log.Printf("[DEBUG] create gitlab project variable %s/%s", project, key)
 
-	v, _, err := client.ProjectVariables.CreateVariable(project, &options)
+	_, _, err := client.ProjectVariables.CreateVariable(project, &options)
 	if err != nil {
 		return err
 	}
 
-	d.SetId(buildTwoPartID(&project, &v.Key))
+	d.SetId(buildTwoPartID(&project, &key))
 
 	return resourceGitlabProjectVariableRead(d, meta)
 }

gitlab/util.go

@@ -96,3 +96,11 @@ var accessLevelID = map[string]gitlab.AccessLevelValue{
 	"master":    gitlab.MasterPermissions,
 	"owner":     gitlab.OwnerPermission,
 }
+
+var accessLevel = map[gitlab.AccessLevelValue]string{
+	gitlab.GuestPermissions:     "guest",
+	gitlab.ReporterPermissions:  "reporter",
+	gitlab.DeveloperPermissions: "developer",
+	gitlab.MasterPermissions:    "master",
+	gitlab.OwnerPermission:      "owner",
+}