fix: add external_id and external_provider_id to organization_external_identity

Author: artaasadi

cloudql/github/table_github_organization_external_identity.go

@@ -11,6 +11,10 @@ func gitHubOrganizationExternalIdentityColumns() []*plugin.Column {
 	return []*plugin.Column{
 		{Name: "guid", Type: proto.ColumnType_STRING, Description: "Guid identifier for the external identity.",
 			Transform: transform.FromField("Description.Guid")},
+		{Name: "external_id", Type: proto.ColumnType_STRING, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.ExternalID")},
+		{Name: "external_provider_id", Type: proto.ColumnType_STRING, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.ExternalProviderID")},
 		{Name: "user_login", Type: proto.ColumnType_STRING, Description: "The GitHub user login.",
 			Transform: transform.FromField("Description.UserLogin")},
 		{Name: "user_id", Type: proto.ColumnType_INT, Description: "The GitHub user details.",

discovery/describers/organization_external_identity.go

@@ -52,12 +52,25 @@ func GetOrganizationExternalIdentities(ctx context.Context, githubClient model.G
 		}
 		for _, externalIdentity := range query.Organization.SamlIdentityProvider.ExternalIdentities.Nodes {
 			id := fmt.Sprintf("%s/%s", org, externalIdentity.User.Login)
+			var externalID string
+			var externalProviderID string
+
+			for _, att := range externalIdentity.SamlIdentity.Attributes {
+				if att.Name == "http://schemas.microsoft.com/identity/claims/objectidentifier" {
+					externalID = att.Value
+				}
+				if att.Name == "http://schemas.microsoft.com/identity/claims/tenantid" {
+					externalProviderID = att.Value
+				}
+			}
 			value := models.Resource{
 				ID:   id,
 				Name: org,
 				Description: model.OrgExternalIdentityDescription{
 					OrganizationExternalIdentity: externalIdentity,
 					Organization:                 org,
+					ExternalID:                   externalID,
+					ExternalProviderID:           externalProviderID,
 					OrganizationID:               organization.ID,
 					UserLogin:                    externalIdentity.User.Login,
 					UserID:                       externalIdentity.User.Id,

discovery/pkg/es/resources_clients.go

@@ -2999,6 +2999,8 @@ func (p OrgExternalIdentityPaginator) NextPage(ctx context.Context) ([]OrgExtern
 }
 
 var listOrgExternalIdentityFilters = map[string]string{
+	"external_id":             "Description.ExternalID",
+	"external_provider_id":    "Description.ExternalProviderID",
 	"guid":                    "Description.Guid",
 	"organization_id":         "Description.OrganizationID",
 	"organization_invitation": "Description.OrganizationInvitation",
@@ -3069,6 +3071,8 @@ func ListOrgExternalIdentity(ctx context.Context, d *plugin.QueryData, _ *plugin
 }
 
 var getOrgExternalIdentityFilters = map[string]string{
+	"external_id":             "Description.ExternalID",
+	"external_provider_id":    "Description.ExternalProviderID",
 	"guid":                    "Description.Guid",
 	"organization_id":         "Description.OrganizationID",
 	"organization_invitation": "Description.OrganizationInvitation",

discovery/provider/model.go

@@ -802,10 +802,12 @@ type OrgAlertDependabotDescription struct {
 
 type OrgExternalIdentityDescription struct {
 	steampipemodels.OrganizationExternalIdentity
-	Organization   string
-	OrganizationID *int64
-	UserLogin      string
-	UserID         int
+	ExternalID         string
+	ExternalProviderID string
+	Organization       string
+	OrganizationID     *int64
+	UserLogin          string
+	UserID             int
 }
 
 type OrgMembersDescription struct {