Skip to content

Commit 412edf6

Browse files
committed
feat: added new fileds to organization members
1 parent a3a74f0 commit 412edf6

File tree

6 files changed

+686
-499
lines changed

6 files changed

+686
-499
lines changed

cloudql/github/table_github_organization_member.go

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,41 @@ func gitHubOrganizationMemberColumns() []*plugin.Column {
2424
Name: "has_two_factor_enabled",
2525
Type: proto.ColumnType_BOOL,
2626
Transform: transform.FromField("Description.HasTwoFactorEnabled")},
27+
{
28+
Name: "login",
29+
Type: proto.ColumnType_STRING,
30+
Description: "",
31+
Transform: transform.FromField("Description.Login")},
32+
{
33+
Name: "login_id",
34+
Type: proto.ColumnType_STRING,
35+
Description: "",
36+
Transform: transform.FromField("Description.LoginID")},
37+
{
38+
Name: "url",
39+
Type: proto.ColumnType_STRING,
40+
Description: "",
41+
Transform: transform.FromField("Description.URL")},
42+
{
43+
Name: "email",
44+
Type: proto.ColumnType_STRING,
45+
Description: "",
46+
Transform: transform.FromField("Description.Email")},
47+
{
48+
Name: "created_at",
49+
Type: proto.ColumnType_TIMESTAMP,
50+
Description: "",
51+
Transform: transform.FromField("Description.CreatedAt")},
52+
{
53+
Name: "company",
54+
Type: proto.ColumnType_STRING,
55+
Description: "",
56+
Transform: transform.FromField("Description.Company")},
57+
{
58+
Name: "status",
59+
Type: proto.ColumnType_STRING,
60+
Description: "",
61+
Transform: transform.FromField("Description.Status")},
2762
}
2863

2964
return append(tableCols, sharedUserColumns()...)

discovery/describers/organization_member.go

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,20 @@ import (
1414
type memberWithRole struct {
1515
HasTwoFactorEnabled *bool
1616
Role *string
17-
Node steampipemodels.User
17+
Node struct {
18+
DatabaseID int
19+
Login string
20+
Name string
21+
URL string
22+
Email string
23+
CreatedAt githubv4.DateTime
24+
Company *string
25+
Status *struct {
26+
Message *string
27+
IndicatesLimitedAvailability *bool
28+
}
29+
steampipemodels.User
30+
}
1831
}
1932

2033
func GetAllMembers(ctx context.Context, githubClient model.GitHubClient, organizationName string, stream *models.StreamSender) ([]models.Resource, error) {
@@ -63,10 +76,16 @@ func GetOrganizationMembers(ctx context.Context, githubClient model.GitHubClient
6376
ID: strconv.Itoa(member.Node.Id),
6477
Name: member.Node.Name,
6578
Description: model.OrgMembersDescription{
66-
User: member.Node,
79+
User: member.Node.User,
6780
Organization: org,
6881
HasTwoFactorEnabled: member.HasTwoFactorEnabled,
6982
Role: member.Role,
83+
Login: member.Node.Login,
84+
LoginID: strconv.Itoa(member.Node.DatabaseID),
85+
URL: member.Node.URL,
86+
Email: member.Node.Email,
87+
CreatedAt: member.Node.CreatedAt.Time,
88+
Company: member.Node.Company,
7089
},
7190
}
7291
if stream != nil {

discovery/pkg/es/resources_clients.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3232,9 +3232,16 @@ func (p OrgMembersPaginator) NextPage(ctx context.Context) ([]OrgMembers, error)
32323232
}
32333233

32343234
var listOrgMembersFilters = map[string]string{
3235+
"company": "Description.Company",
3236+
"created_at": "Description.CreatedAt",
3237+
"email": "Description.Email",
32353238
"has_two_factor_enabled": "Description.HasTwoFactorEnabled",
3239+
"login": "Description.Login",
3240+
"login_id": "Description.LoginID",
32363241
"organization": "Description.Organization",
32373242
"role": "Description.Role",
3243+
"status": "Description.Status",
3244+
"url": "Description.URL",
32383245
}
32393246

32403247
func ListOrgMembers(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
@@ -3298,9 +3305,16 @@ func ListOrgMembers(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateD
32983305
}
32993306

33003307
var getOrgMembersFilters = map[string]string{
3308+
"company": "Description.Company",
3309+
"created_at": "Description.CreatedAt",
3310+
"email": "Description.Email",
33013311
"has_two_factor_enabled": "Description.HasTwoFactorEnabled",
3312+
"login": "Description.Login",
3313+
"login_id": "Description.LoginID",
33023314
"organization": "Description.Organization",
33033315
"role": "Description.Role",
3316+
"status": "Description.Status",
3317+
"url": "Description.URL",
33043318
}
33053319

33063320
func GetOrgMembers(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {

discovery/provider/model.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -809,6 +809,13 @@ type OrgMembersDescription struct {
809809
Organization string
810810
HasTwoFactorEnabled *bool
811811
Role *string
812+
Login string
813+
LoginID string
814+
URL string
815+
Email string
816+
CreatedAt time.Time
817+
Company *string
818+
Status *bool
812819
}
813820

814821
type PullRequestDescription struct {

0 commit comments

Comments
 (0)