fix: fixed organization_external_identity

ArshiaBP · ArshiaBP · commit c291fb31b36f · 2025-02-23T17:15:25.000+03:30
diff --git a/cloudql/github/table_github_organization_external_identity.go b/cloudql/github/table_github_organization_external_identity.go
@@ -1,6 +1,7 @@
 package github
 
 import (
+	opengovernance "github.com/opengovern/og-describer-github/discovery/pkg/es"
 	"github.com/turbot/steampipe-plugin-sdk/v5/grpc/proto"
 	"github.com/turbot/steampipe-plugin-sdk/v5/plugin"
 	"github.com/turbot/steampipe-plugin-sdk/v5/plugin/transform"
@@ -13,8 +14,8 @@ func gitHubOrganizationExternalIdentityColumns() []*plugin.Column {
 		{Name: "guid", Type: proto.ColumnType_STRING, Description: "Guid identifier for the external identity.",
 			Transform: transform.FromField("Description.Guid")},
 		{Name: "user_login", Type: proto.ColumnType_STRING, Description: "The GitHub user login.",
-			Transform: transform.FromField("Description.User.Login")},
-		{Name: "user_detail", Type: proto.ColumnType_JSON, Description: "The GitHub user details.",
+			Transform: transform.FromField("Description.UserLogin")},
+		{Name: "user", Type: proto.ColumnType_JSON, Description: "The GitHub user details.",
 			Transform: transform.FromField("Description.User")},
 		{Name: "saml_identity", Type: proto.ColumnType_JSON, Description: "The external SAML identity.",
 			Transform: transform.FromField("Description.SamlIdentity")},
@@ -30,7 +31,11 @@ func tableGitHubOrganizationExternalIdentity() *plugin.Table {
 		Name:        "github_organization_external_identity",
 		Description: "GitHub members for a given organization. GitHub Users are user accounts in GitHub.",
 		List: &plugin.ListConfig{
-			Hydrate: nil,
+			Hydrate: opengovernance.ListOrgExternalIdentity,
+		},
+		Get: &plugin.GetConfig{
+			KeyColumns: plugin.SingleColumn("guid"),
+			Hydrate:    opengovernance.GetOrgExternalIdentity,
 		},
 		Columns: commonColumns(gitHubOrganizationExternalIdentityColumns()),
 	}
diff --git a/discovery/describers/organization_external_identity.go b/discovery/describers/organization_external_identity.go
@@ -55,7 +55,6 @@ func GetOrganizationExternalIdentities(ctx context.Context, githubClient model.G
 					OrganizationExternalIdentity: externalIdentity,
 					Organization:                 org,
 					UserLogin:                    externalIdentity.User.Login,
-					UserDetail:                   externalIdentity.User,
 				},
 			}
 			if stream != nil {
diff --git a/discovery/pkg/es/resources_clients.go b/discovery/pkg/es/resources_clients.go
@@ -3020,8 +3020,8 @@ var listOrgExternalIdentityFilters = map[string]string{
 	"organization_invitation": "Description.OrganizationInvitation",
 	"saml_identity":           "Description.SamlIdentity",
 	"scim_identity":           "Description.ScimIdentity",
-	"user_detail":             "Description.User",
-	"user_login":              "Description.User.Login",
+	"user":                    "Description.User",
+	"user_login":              "Description.UserLogin",
 }
 
 func ListOrgExternalIdentity(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
@@ -3090,8 +3090,8 @@ var getOrgExternalIdentityFilters = map[string]string{
 	"organization_invitation": "Description.OrganizationInvitation",
 	"saml_identity":           "Description.SamlIdentity",
 	"scim_identity":           "Description.ScimIdentity",
-	"user_detail":             "Description.User",
-	"user_login":              "Description.User.Login",
+	"user":                    "Description.User",
+	"user_login":              "Description.UserLogin",
 }
 
 func GetOrgExternalIdentity(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
@@ -6372,7 +6372,11 @@ func (p TeamRepositoryPaginator) NextPage(ctx context.Context) ([]TeamRepository
 	return values, nil
 }
 
-var listTeamRepositoryFilters = map[string]string{}
+var listTeamRepositoryFilters = map[string]string{
+	"permission":           "Description.Permission",
+	"repository_full_name": "Description.RepositoryFullName",
+	"team_id":              "Description.TeamID",
+}
 
 func ListTeamRepository(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
 	plugin.Logger(ctx).Trace("ListTeamRepository")
@@ -6434,7 +6438,11 @@ func ListTeamRepository(ctx context.Context, d *plugin.QueryData, _ *plugin.Hydr
 	return nil, nil
 }
 
-var getTeamRepositoryFilters = map[string]string{}
+var getTeamRepositoryFilters = map[string]string{
+	"permission":           "Description.Permission",
+	"repository_full_name": "Description.RepositoryFullName",
+	"team_id":              "Description.TeamID",
+}
 
 func GetTeamRepository(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
 	plugin.Logger(ctx).Trace("GetTeamRepository")
@@ -6572,9 +6580,19 @@ func (p TeamMemberPaginator) NextPage(ctx context.Context) ([]TeamMember, error)
 }
 
 var listTeamMemberFilters = map[string]string{
-	"login_id": "Description.LoginID",
-	"role":     "Description.Role",
-	"slug":     "Description.Slug",
+	"company":             "Description.Company",
+	"email":               "Description.Email",
+	"id":                  "Description.Id",
+	"interaction_ability": "Description.InteractionAbility",
+	"is_site_admin":       "Description.IsSiteAdmin",
+	"location":            "Description.Location",
+	"login":               "Description.Login",
+	"login_id":            "Description.LoginID",
+	"name":                "Description.Name",
+	"node_id":             "Description.NodeId",
+	"organization":        "Description.Organization",
+	"role":                "Description.Role",
+	"slug":                "Description.Slug",
 }
 
 func ListTeamMember(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
@@ -6638,9 +6656,19 @@ func ListTeamMember(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateD
 }
 
 var getTeamMemberFilters = map[string]string{
-	"login_id": "Description.LoginID",
-	"role":     "Description.Role",
-	"slug":     "Description.Slug",
+	"company":             "Description.Company",
+	"email":               "Description.Email",
+	"id":                  "Description.Id",
+	"interaction_ability": "Description.InteractionAbility",
+	"is_site_admin":       "Description.IsSiteAdmin",
+	"location":            "Description.Location",
+	"login":               "Description.Login",
+	"login_id":            "Description.LoginID",
+	"name":                "Description.Name",
+	"node_id":             "Description.NodeId",
+	"organization":        "Description.Organization",
+	"role":                "Description.Role",
+	"slug":                "Description.Slug",
 }
 
 func GetTeamMember(ctx context.Context, d *plugin.QueryData, _ *plugin.HydrateData) (interface{}, error) {
diff --git a/discovery/provider/model.go b/discovery/provider/model.go
@@ -801,7 +801,6 @@ type OrgExternalIdentityDescription struct {
 	steampipemodels.OrganizationExternalIdentity
 	Organization string
 	UserLogin    string
-	UserDetail   steampipemodels.BasicUser
 }
 
 type OrgMembersDescription struct {

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,6 @@ func GetOrganizationExternalIdentities(ctx context.Context, githubClient model.G`
`55`	`55`	`OrganizationExternalIdentity: externalIdentity,`
`56`	`56`	`Organization: org,`
`57`	`57`	`UserLogin: externalIdentity.User.Login,`
`58`		`- UserDetail: externalIdentity.User,`
`59`	`58`	`},`
`60`	`59`	`}`
`61`	`60`	`if stream != nil {`
Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,6 @@ type OrgExternalIdentityDescription struct {`
`801`	`801`	`steampipemodels.OrganizationExternalIdentity`
`802`	`802`	`Organization string`
`803`	`803`	`UserLogin string`
`804`		`- UserDetail steampipemodels.BasicUser`
`805`	`804`	`}`
`806`	`805`
`807`	`806`	`type OrgMembersDescription struct {`