feat: changed some resources fields

Author: ArshiaBP

cloudql/github/table_github_organization_collaborator.go

@@ -38,9 +38,14 @@ func gitHubOrganizationCollaborators() []*plugin.Column {
 
 		{
 			Name:        "user_login",
-			Type:        proto.ColumnType_JSON,
+			Type:        proto.ColumnType_STRING,
 			Description: "The login details of the collaborator.",
 			Transform:   transform.FromField("Description.UserLogin")},
+		{
+			Name:        "user_id",
+			Type:        proto.ColumnType_STRING,
+			Description: "The id of the collaborator.",
+			Transform:   transform.FromField("Description.UserID")},
 	}
 
 	return tableCols

cloudql/github/table_github_organization_external_identity.go

@@ -17,6 +17,8 @@ func gitHubOrganizationExternalIdentityColumns() []*plugin.Column {
 			Transform: transform.FromField("Description.UserLogin")},
 		{Name: "user", Type: proto.ColumnType_JSON, Description: "The GitHub user details.",
 			Transform: transform.FromField("Description.User")},
+		{Name: "user_id", Type: proto.ColumnType_INT, Description: "The GitHub user details.",
+			Transform: transform.FromField("Description.UserID")},
 		{Name: "saml_identity", Type: proto.ColumnType_JSON, Description: "The external SAML identity.",
 			Transform: transform.FromField("Description.SamlIdentity")},
 		{Name: "scim_identity", Type: proto.ColumnType_JSON, Description: "The external SCIM identity.",

cloudql/github/table_github_organization_role.go

@@ -31,28 +31,28 @@ func gitHubOrganizationRoleColumns() []*plugin.Column {
 			Transform:   transform.FromField("Description.Permissions")},
 		{
 			Name:        "organization",
-			Type:        proto.ColumnType_JSON,
-			Description: "permissions",
+			Type:        proto.ColumnType_STRING,
+			Description: "",
 			Transform:   transform.FromField("Description.Organization")},
 		{
 			Name:        "source",
-			Description: "permissions",
+			Description: "",
 			Type:        proto.ColumnType_STRING,
 			Transform:   transform.FromField("Description.Source")},
 		{
 			Name:        "base_role",
 			Type:        proto.ColumnType_STRING,
-			Description: "permissions",
+			Description: "",
 			Transform:   transform.FromField("Description.BaseRole")},
 		{
 			Name:        "created_at",
 			Type:        proto.ColumnType_TIMESTAMP,
-			Description: "permissions",
+			Description: "",
 			Transform:   transform.FromField("Description.CreatedAt")},
 		{
 			Name:        "updated_at",
 			Type:        proto.ColumnType_TIMESTAMP,
-			Description: "permissions",
+			Description: "",
 			Transform:   transform.FromField("Description.UpdatedAt")},
 	}
 

discovery/describers/organization_collaborators.go

@@ -12,8 +12,11 @@ import (
 )
 
 type CollaboratorEdge struct {
-	Permission githubv4.RepositoryPermission     `graphql:"permission @include(if:$includeOCPermission)" json:"permission"`
-	Node       steampipemodels.CollaboratorLogin `graphql:"node @include(if:$includeOCNode)" json:"node"`
+	Permission githubv4.RepositoryPermission `graphql:"permission @include(if:$includeOCPermission)" json:"permission"`
+	Node       struct {
+		Login githubv4.String `graphql:"login" json:"login"`
+		ID    githubv4.String `graphql:"id" json:"id"`
+	} `graphql:"node @include(if:$includeOCNode)" json:"node"`
 }
 
 func GetAllOrganizationsCollaborators(ctx context.Context, githubClient model.GitHubClient, organizationName string, stream *models.StreamSender) ([]models.Resource, error) {
@@ -76,7 +79,8 @@ func GetOrganizationCollaborators(ctx context.Context, githubClient model.GitHub
 						Affiliation:    "ALL",
 						RepositoryName: node.Name,
 						Permission:     collaborator.Permission,
-						UserLogin:      collaborator.Node,
+						UserLogin:      string(collaborator.Node.Login),
+						UserID:         string(collaborator.Node.ID),
 					},
 				}
 				if stream != nil {

discovery/describers/organization_external_identity.go

@@ -55,6 +55,7 @@ func GetOrganizationExternalIdentities(ctx context.Context, githubClient model.G
 					OrganizationExternalIdentity: externalIdentity,
 					Organization:                 org,
 					UserLogin:                    externalIdentity.User.Login,
+					UserID:                       externalIdentity.User.Id,
 				},
 			}
 			if stream != nil {

discovery/describers/organization_role.go

@@ -51,7 +51,7 @@ func ListOrganizationRoles(ctx context.Context,
 			ID:   strconv.Itoa(r.ID),
 			Name: r.Name,
 			Description: model.OrganizationRoleDescription{
-				Organization: r.Organization,
+				Organization: organizationName,
 				Name:         r.Name,
 				ID:           r.ID,
 				Source:       r.Source,

discovery/pkg/es/resources_clients.go

@@ -2571,6 +2571,7 @@ var listOrgCollaboratorsFilters = map[string]string{
 	"organization":    "Description.Organization",
 	"permission":      "Description.Permission",
 	"repository_name": "Description.RepositoryName",
+	"user_id":         "Description.UserID",
 	"user_login":      "Description.UserLogin",
 }
 
@@ -2639,6 +2640,7 @@ var getOrgCollaboratorsFilters = map[string]string{
 	"organization":    "Description.Organization",
 	"permission":      "Description.Permission",
 	"repository_name": "Description.RepositoryName",
+	"user_id":         "Description.UserID",
 	"user_login":      "Description.UserLogin",
 }
 
@@ -3021,6 +3023,7 @@ var listOrgExternalIdentityFilters = map[string]string{
 	"saml_identity":           "Description.SamlIdentity",
 	"scim_identity":           "Description.ScimIdentity",
 	"user":                    "Description.User",
+	"user_id":                 "Description.UserID",
 	"user_login":              "Description.UserLogin",
 }
 
@@ -3091,6 +3094,7 @@ var getOrgExternalIdentityFilters = map[string]string{
 	"saml_identity":           "Description.SamlIdentity",
 	"scim_identity":           "Description.ScimIdentity",
 	"user":                    "Description.User",
+	"user_id":                 "Description.UserID",
 	"user_login":              "Description.UserLogin",
 }
 

discovery/provider/model.go

@@ -765,7 +765,8 @@ type OrgCollaboratorsDescription struct {
 	Affiliation    string
 	RepositoryName githubv4.String
 	Permission     githubv4.RepositoryPermission
-	UserLogin      steampipemodels.CollaboratorLogin
+	UserLogin      string
+	UserID         string
 }
 
 type OrgAlertDependabotDescription struct {
@@ -801,6 +802,7 @@ type OrgExternalIdentityDescription struct {
 	steampipemodels.OrganizationExternalIdentity
 	Organization string
 	UserLogin    string
+	UserID       int
 }
 
 type OrgMembersDescription struct {
@@ -1854,7 +1856,7 @@ type OrganizationRoleDescription struct {
 	Name         string
 	Description  string
 	Permissions  []string
-	Organization interface{}
+	Organization string
 	Source       string
 	BaseRole     string
 	CreatedAt    time.Time