[WIP] Added GPG and SSH key to GitHub user data source

CHANGELOG.md

@@ -7,6 +7,7 @@ FEATURES:
 IMPROVEMENTS:
 
 * provider/rancher: Move to Rancher V2 API [GH-13908]
+* provider/github: Added SSH and GPG key to user data source [GH-15211]
 
 
 

builtin/providers/github/data_source_github_team.go

@@ -50,11 +50,11 @@ func dataSourceGithubTeamRead(d *schema.ResourceData, meta interface{}) error {
 		return err
 	}
 
-	d.SetId(strconv.Itoa(*team.ID))
-	d.Set("name", *team.Name)
-	d.Set("description", *team.Description)
-	d.Set("privacy", *team.Privacy)
-	d.Set("permission", *team.Permission)
+	d.SetId(strconv.Itoa(team.GetID()))
+	d.Set("name", team.GetName())
+	d.Set("description", team.GetDescription())
+	d.Set("privacy", team.GetPrivacy())
+	d.Set("permission", team.GetPermission())
 
 	return nil
 }

builtin/providers/github/data_source_github_user.go

@@ -53,6 +53,14 @@ func dataSourceGithubUser() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"gpg_key": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"ssh_key": &schema.Schema{
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"bio": &schema.Schema{
 				Type:     schema.TypeString,
 				Computed: true,
@@ -90,29 +98,42 @@ func dataSourceGithubUserRead(d *schema.ResourceData, meta interface{}) error {
 	log.Printf("[INFO] Refreshing Gitub User: %s", username)
 
 	client := meta.(*Organization).client
+	ctx := context.Background()
+
+	user, _, err := client.Users.Get(ctx, username)
+	if err != nil {
+		return err
+	}
+
+	gpg, _, err := client.Users.ListGPGKeys(ctx, username, nil)
+	if err != nil {
+		return err
+	}
 
-	user, _, err := client.Users.Get(context.TODO(), username)
+	ssh, _, err := client.Users.ListKeys(ctx, username, nil)
 	if err != nil {
 		return err
 	}
 
-	d.SetId(strconv.Itoa(*user.ID))
-	d.Set("login", *user.Login)
-	d.Set("avatar_url", *user.AvatarURL)
-	d.Set("gravatar_id", *user.GravatarID)
-	d.Set("site_admin", *user.SiteAdmin)
-	d.Set("company", *user.Company)
-	d.Set("blog", *user.Blog)
-	d.Set("location", *user.Location)
-	d.Set("name", *user.Name)
-	d.Set("email", *user.Email)
-	d.Set("bio", *user.Bio)
-	d.Set("public_repos", *user.PublicRepos)
-	d.Set("public_gists", *user.PublicGists)
-	d.Set("followers", *user.Followers)
-	d.Set("following", *user.Following)
-	d.Set("created_at", *user.CreatedAt)
-	d.Set("updated_at", *user.UpdatedAt)
+	d.SetId(strconv.Itoa(user.GetID()))
+	d.Set("login", user.GetLogin())
+	d.Set("avatar_url", user.GetAvatarURL())
+	d.Set("gravatar_id", user.GetGravatarID())
+	d.Set("site_admin", user.GetSiteAdmin())
+	d.Set("company", user.GetCompany())
+	d.Set("blog", user.GetBlog())
+	d.Set("location", user.GetLocation())
+	d.Set("name", user.GetName())
+	d.Set("email", user.GetEmail())
+	d.Set("gpg_key", gpg[0].GetPublicKey())
+	d.Set("ssh_key", ssh[0].GetKey())
+	d.Set("bio", user.GetBio())
+	d.Set("public_repos", user.GetPublicRepos())
+	d.Set("public_gists", user.GetPublicGists())
+	d.Set("followers", user.GetFollowers())
+	d.Set("following", user.GetFollowing())
+	d.Set("created_at", user.GetCreatedAt())
+	d.Set("updated_at", user.GetUpdatedAt())
 
 	return nil
 }