fix: add identifiers for organization and repository tables

artaasadi · artaasadi · commit 8a2c71f1badc · 2025-02-27T17:08:27.000+01:00
diff --git a/cloudql/github/table_github_organization_app.go b/cloudql/github/table_github_organization_app.go
@@ -23,7 +23,8 @@ func tableGitHubOrganizationApp() *plugin.Table {
 		Columns: commonColumns([]*plugin.Column{
 			{Name: "id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
 				Transform: transform.FromField("Description.ID")},
-
+			{Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+				Transform: transform.FromField("Description.OrganizationID")},
 			{Name: "client_id", Type: proto.ColumnType_STRING, Description: "The client ID of the app.",
 				Transform: transform.FromField("Description.ClientID")},
 
diff --git a/cloudql/github/table_github_organization_collaborator.go b/cloudql/github/table_github_organization_collaborator.go
@@ -14,6 +14,9 @@ import (
 
 func gitHubOrganizationCollaborators() []*plugin.Column {
 	tableCols := []*plugin.Column{
+		{
+			Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 		{
 			Name:        "affiliation",
 			Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_organization_dependabot_alert.go b/cloudql/github/table_github_organization_dependabot_alert.go
@@ -155,6 +155,9 @@ func gitHubDependabotAlertColumns() []*plugin.Column {
 			Description: "The time that the alert was no longer detected and was considered fixed.",
 			Transform:   transform.FromField("Description.FixedAt").NullIfZero().Transform(convertTimestamp),
 		},
+		{
+			Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 }
 
diff --git a/cloudql/github/table_github_organization_external_identity.go b/cloudql/github/table_github_organization_external_identity.go
@@ -21,6 +21,8 @@ func gitHubOrganizationExternalIdentityColumns() []*plugin.Column {
 			Transform: transform.FromField("Description.ScimIdentity")},
 		{Name: "organization_invitation", Type: proto.ColumnType_JSON, Description: "The invitation to the organization.",
 			Transform: transform.FromField("Description.OrganizationInvitation")},
+		{Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 }
 
diff --git a/cloudql/github/table_github_organization_member.go b/cloudql/github/table_github_organization_member.go
@@ -40,6 +40,8 @@ func gitHubOrganizationMemberColumns() []*plugin.Column {
 			Transform: transform.FromField("Description.WebsiteURL")},
 		{Name: "status", Type: proto.ColumnType_BOOL, Description: "",
 			Transform: transform.FromField("Description.Status")},
+		{Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 
 	return cols
diff --git a/cloudql/github/table_github_organization_role.go b/cloudql/github/table_github_organization_role.go
@@ -49,6 +49,9 @@ func gitHubOrganizationRoleColumns() []*plugin.Column {
 			Type:        proto.ColumnType_TIMESTAMP,
 			Description: "",
 			Transform:   transform.FromField("Description.UpdatedAt")},
+		{
+			Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 
 	return tableCols
diff --git a/cloudql/github/table_github_repository.go b/cloudql/github/table_github_repository.go
@@ -479,6 +479,9 @@ func sharedRepositoryColumns() []*plugin.Column {
 			Transform:   transform.FromField("Description.Metrics.Subscribers"),
 			Description: "Subscribers.",
 		},
+		{
+			Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 }
 
diff --git a/cloudql/github/table_github_repository_deployment.go b/cloudql/github/table_github_repository_deployment.go
@@ -70,6 +70,9 @@ func gitHubRepositoryDeploymentColumns() []*plugin.Column {
 		{Name: "updated_at", Type: proto.ColumnType_TIMESTAMP,
 			Transform:   transform.FromField("Description.UpdatedAt").NullIfZero().Transform(convertTimestamp),
 			Description: "Timestamp when the deployment was last updated."},
+		{
+			Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 }
 
diff --git a/cloudql/github/table_github_repository_environment.go b/cloudql/github/table_github_repository_environment.go
@@ -34,6 +34,9 @@ func gitHubRepositoryEnvironmentColumns() []*plugin.Column {
 			Transform:   transform.FromField("Description.RepositoryName"),
 			Description: "repository name",
 		},
+		{
+			Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 }
 
diff --git a/cloudql/github/table_github_repository_permission.go b/cloudql/github/table_github_repository_permission.go
@@ -63,6 +63,9 @@ func tableGitHubRepositoryPermission() *plugin.Table {
 				Transform:   transform.FromField("Description.RoleName"),
 				Description: "The full name of the repository (login/repo-name).",
 			},
+			{
+				Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+				Transform: transform.FromField("Description.OrganizationID")},
 		}),
 	}
 }
diff --git a/cloudql/github/table_github_repository_ruleset.go b/cloudql/github/table_github_repository_ruleset.go
@@ -73,6 +73,9 @@ func gitHubRulesetColumns() []*plugin.Column {
 			Type:        proto.ColumnType_JSON,
 			Transform:   transform.FromField("Description.Conditions"),
 			Description: "The conditions under which the ruleset applies."},
+		{
+			Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 }
 
diff --git a/cloudql/github/table_github_repository_sbom.go b/cloudql/github/table_github_repository_sbom.go
@@ -76,6 +76,9 @@ func tableGitHubRepositorySbom() *plugin.Table {
 				Type:        proto.ColumnType_JSON,
 				Description: "Array of packages in SPDX format.",
 				Transform:   transform.FromField("Description.Packages")},
+			{
+				Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+				Transform: transform.FromField("Description.OrganizationID")},
 		}),
 	}
 }
diff --git a/cloudql/github/table_github_repository_vulnerability_alert.go b/cloudql/github/table_github_repository_vulnerability_alert.go
@@ -89,5 +89,8 @@ func gitHubRepositoryVulnerabilityAlertColumns() []*plugin.Column {
 		{Name: "cvss_score", Type: proto.ColumnType_DOUBLE,
 			Transform:   transform.FromField("Description.CvssScore"),
 			Description: "The CVSS score of the advisory associated with the vulnerability alert."},
+		{
+			Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+			Transform: transform.FromField("Description.OrganizationID")},
 	}
 }
diff --git a/cloudql/github/table_github_repository_webhook.go b/cloudql/github/table_github_repository_webhook.go
@@ -103,6 +103,9 @@ func tableGithubRepositoryWebhook() *plugin.Table {
 				Transform:   transform.FromField("Description.LastResponse"),
 				Description: "The last response received from the webhook endpoint.",
 			},
+			{
+				Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",
+				Transform: transform.FromField("Description.OrganizationID")},
 		}),
 	}
 }
diff --git a/discovery/describers/organization_app.go b/discovery/describers/organization_app.go
@@ -45,6 +45,11 @@ func ListOrganizationApps(ctx context.Context,
 		return nil, fmt.Errorf("error decoding repos list: %w", err)
 	}
 
+	orgID, err := fetchOrganizationID(sdk, organizationName)
+	if err != nil {
+		return nil, fmt.Errorf("fetching org ID: %w", err)
+	}
+
 	for _, app := range appsResponse.Installations {
 		account := model.Account{
 			Login:             app.Account.Login,
@@ -95,6 +100,8 @@ func ListOrganizationApps(ctx context.Context,
 			ID:   strconv.Itoa(int(app.ID)),
 			Name: app.AppSlug,
 			Description: model.OrganizationAppDescription{
+				Organization:           organizationName,
+				OrganizationID:         orgID,
 				ID:                     app.ID,
 				ClientID:               app.ClientID,
 				Account:                account,
diff --git a/discovery/describers/organization_collaborators.go b/discovery/describers/organization_collaborators.go
@@ -58,6 +58,10 @@ func GetOrganizationCollaborators(ctx context.Context, githubClient model.GitHub
 		"affiliation": affiliation,
 	}
 	appendOrgCollaboratorColumnIncludes(&variables, orgCollaboratorsCols())
+	organization, err := GetOrganizationAdditionalData(ctx, githubClient.RestClient, org)
+	if err != nil {
+		return nil, err
+	}
 	var values []models.Resource
 	for {
 		err := client.Query(ctx, &query, variables)
@@ -76,6 +80,7 @@ func GetOrganizationCollaborators(ctx context.Context, githubClient model.GitHub
 					Name: repoFullName,
 					Description: model.OrgCollaboratorsDescription{
 						Organization:   org,
+						OrganizationID: organization.ID,
 						Affiliation:    "ALL",
 						RepositoryName: node.Name,
 						Permission:     collaborator.Permission,
diff --git a/discovery/describers/organization_dependabot_alert.go b/discovery/describers/organization_dependabot_alert.go
@@ -26,6 +26,10 @@ func GetOrganizationDependabotAlerts(ctx context.Context, githubClient model.Git
 	opt := &github.ListAlertsOptions{
 		ListCursorOptions: github.ListCursorOptions{First: maxPagesCount},
 	}
+	organization, err := GetOrganizationAdditionalData(ctx, githubClient.RestClient, org)
+	if err != nil {
+		return nil, err
+	}
 	var values []models.Resource
 	for {
 		alerts, resp, err := client.Dependabot.ListOrgAlerts(ctx, org, opt)
@@ -68,6 +72,7 @@ func GetOrganizationDependabotAlerts(ctx context.Context, githubClient model.Git
 					DismissedComment:            alert.GetDismissedComment(),
 					FixedAt:                     alert.GetFixedAt(),
 					Organization:                org,
+					OrganizationID:              organization.ID,
 				},
 			}
 			if stream != nil {
diff --git a/discovery/describers/organization_external_identity.go b/discovery/describers/organization_external_identity.go
@@ -41,6 +41,10 @@ func GetOrganizationExternalIdentities(ctx context.Context, githubClient model.G
 	}
 	appendOrganizationExternalIdentityColumnIncludes(&variables, orgExternalIdentitiesCols())
 	var values []models.Resource
+	organization, err := GetOrganizationAdditionalData(ctx, githubClient.RestClient, org)
+	if err != nil {
+		return nil, err
+	}
 	for {
 		err := client.Query(ctx, &query, variables)
 		if err != nil {
@@ -54,6 +58,7 @@ func GetOrganizationExternalIdentities(ctx context.Context, githubClient model.G
 				Description: model.OrgExternalIdentityDescription{
 					OrganizationExternalIdentity: externalIdentity,
 					Organization:                 org,
+					OrganizationID:               organization.ID,
 					UserLogin:                    externalIdentity.User.Login,
 					UserID:                       externalIdentity.User.Id,
 				},
diff --git a/discovery/describers/organization_member.go b/discovery/describers/organization_member.go
@@ -61,6 +61,10 @@ func GetOrganizationMembers(ctx context.Context, githubClient model.GitHubClient
 		"cursor":   (*githubv4.String)(nil),
 	}
 	appendUserColumnIncludes(&variables, orgMembersCols())
+	organization, err := GetOrganizationAdditionalData(ctx, githubClient.RestClient, org)
+	if err != nil {
+		return nil, err
+	}
 	var values []models.Resource
 	for {
 		err := client.Query(ctx, &query, variables)
@@ -91,6 +95,7 @@ func GetOrganizationMembers(ctx context.Context, githubClient model.GitHubClient
 					Name:                member.Node.Name,
 					NodeID:              member.Node.NodeId,
 					Organization:        org,
+					OrganizationID:      organization.ID,
 					Role:                member.Role,
 					HasTwoFactorEnabled: member.HasTwoFactorEnabled,
 					Status:              status,
diff --git a/discovery/describers/organization_role.go b/discovery/describers/organization_role.go
@@ -25,6 +25,11 @@ func ListOrganizationRoles(ctx context.Context,
 
 	var values []models.Resource
 
+	orgID, err := fetchOrganizationID(sdk, organizationName)
+	if err != nil {
+		return nil, fmt.Errorf("fetching org ID: %w", err)
+	}
+
 	endpoint := fmt.Sprintf("/orgs/%s/organization-roles", organizationName)
 	req := &resilientbridge.NormalizedRequest{
 		Method:   "GET",
@@ -51,15 +56,16 @@ func ListOrganizationRoles(ctx context.Context,
 			ID:   strconv.Itoa(r.ID),
 			Name: r.Name,
 			Description: model.OrganizationRoleDescription{
-				Organization: organizationName,
-				Name:         r.Name,
-				ID:           r.ID,
-				Source:       r.Source,
-				BaseRole:     r.BaseRole,
-				Permissions:  r.Permissions,
-				Description:  r.Description,
-				CreatedAt:    r.CreatedAt,
-				UpdatedAt:    r.UpdatedAt,
+				Organization:   organizationName,
+				OrganizationID: orgID,
+				Name:           r.Name,
+				ID:             r.ID,
+				Source:         r.Source,
+				BaseRole:       r.BaseRole,
+				Permissions:    r.Permissions,
+				Description:    r.Description,
+				CreatedAt:      r.CreatedAt,
+				UpdatedAt:      r.UpdatedAt,
 			},
 		}
 		if stream != nil {
diff --git a/discovery/describers/repository.go b/discovery/describers/repository.go
@@ -457,6 +457,7 @@ func util_transformToFinalRepoDetail(detail *model.RepoDetail, hooks []model.Rep
 	}
 	if finalOrg != nil {
 		finalDetail.Organization = finalOrg.Login
+		finalDetail.OrganizationID = finalOrg.ID
 	}
 
 	if repoRestDetail != nil {
diff --git a/discovery/describers/repository_deployment.go b/discovery/describers/repository_deployment.go
@@ -17,13 +17,17 @@ func GetAllRepositoriesDeployments(ctx context.Context, githubClient model.GitHu
 	if value := ctx.Value(paramKeyRepoName); value != nil {
 		repositoryName = value.(string)
 	}
+	organization, err := GetOrganizationAdditionalData(ctx, githubClient.RestClient, organizationName)
+	if err != nil {
+		return nil, err
+	}
 
 	if repositoryName != "" {
 		repo, err := getRepositoryDetails(ctx, githubClient.RestClient, organizationName, repositoryName)
 		if err != nil {
 			return nil, err
 		}
-		repoValues, err := GetRepositoryDeployments(ctx, githubClient, stream, organizationName, repositoryName, repo.GetID())
+		repoValues, err := GetRepositoryDeployments(ctx, githubClient, stream, organizationName, repositoryName, repo.GetID(), organization.GetID())
 		if err != nil {
 			return nil, err
 		}
@@ -36,7 +40,7 @@ func GetAllRepositoriesDeployments(ctx context.Context, githubClient model.GitHu
 	}
 	var values []models.Resource
 	for _, repo := range repositories {
-		repoValues, err := GetRepositoryDeployments(ctx, githubClient, stream, organizationName, repo.GetName(), repo.GetID())
+		repoValues, err := GetRepositoryDeployments(ctx, githubClient, stream, organizationName, repo.GetName(), repo.GetID(), organization.GetID())
 		if err != nil {
 			return nil, err
 		}
@@ -45,7 +49,7 @@ func GetAllRepositoriesDeployments(ctx context.Context, githubClient model.GitHu
 	return values, nil
 }
 
-func GetRepositoryDeployments(ctx context.Context, githubClient model.GitHubClient, stream *models.StreamSender, owner, repo string, repoId int64) ([]models.Resource, error) {
+func GetRepositoryDeployments(ctx context.Context, githubClient model.GitHubClient, stream *models.StreamSender, owner, repo string, repoId int64, orgId int64) ([]models.Resource, error) {
 	client := githubClient.GraphQLClient
 	var query struct {
 		RateLimit  steampipemodels.RateLimit
@@ -80,6 +84,7 @@ func GetRepositoryDeployments(ctx context.Context, githubClient model.GitHubClie
 					Deployment:     deployment,
 					RepoFullName:   repoFullName,
 					Organization:   owner,
+					OrganizationID: orgId,
 					RepositoryName: repo,
 				},
 			}
diff --git a/discovery/describers/repository_environment.go b/discovery/describers/repository_environment.go
@@ -17,13 +17,17 @@ func GetAllRepositoriesEnvironments(ctx context.Context, githubClient model.GitH
 	if value := ctx.Value(paramKeyRepoName); value != nil {
 		repositoryName = value.(string)
 	}
+	organization, err := GetOrganizationAdditionalData(ctx, githubClient.RestClient, organizationName)
+	if err != nil {
+		return nil, err
+	}
 
 	if repositoryName != "" {
 		repo, err := getRepositoryDetails(ctx, githubClient.RestClient, organizationName, repositoryName)
 		if err != nil {
 			return nil, err
 		}
-		repoValues, err := GetRepositoryEnvironments(ctx, githubClient, stream, organizationName, repositoryName, repo.GetID())
+		repoValues, err := GetRepositoryEnvironments(ctx, githubClient, stream, organizationName, repositoryName, repo.GetID(), organization.GetID())
 		if err != nil {
 			return nil, err
 		}
@@ -36,7 +40,7 @@ func GetAllRepositoriesEnvironments(ctx context.Context, githubClient model.GitH
 	}
 	var values []models.Resource
 	for _, repo := range repositories {
-		repoValues, err := GetRepositoryEnvironments(ctx, githubClient, stream, organizationName, repo.GetName(), repo.GetID())
+		repoValues, err := GetRepositoryEnvironments(ctx, githubClient, stream, organizationName, repo.GetName(), repo.GetID(), organization.GetID())
 		if err != nil {
 			return nil, err
 		}
@@ -45,7 +49,7 @@ func GetAllRepositoriesEnvironments(ctx context.Context, githubClient model.GitH
 	return values, nil
 }
 
-func GetRepositoryEnvironments(ctx context.Context, githubClient model.GitHubClient, stream *models.StreamSender, owner, repo string, repoId int64) ([]models.Resource, error) {
+func GetRepositoryEnvironments(ctx context.Context, githubClient model.GitHubClient, stream *models.StreamSender, owner, repo string, repoId, orgId int64) ([]models.Resource, error) {
 	client := githubClient.GraphQLClient
 	var query struct {
 		RateLimit  steampipemodels.RateLimit
@@ -80,6 +84,7 @@ func GetRepositoryEnvironments(ctx context.Context, githubClient model.GitHubCli
 					Environment:    environment,
 					RepoFullName:   repoFullName,
 					Organization:   owner,
+					OrganizationID: orgId,
 					RepositoryName: repo,
 				},
 			}
diff --git a/discovery/describers/repository_permission.go b/discovery/describers/repository_permission.go
@@ -49,6 +49,10 @@ func ListRepositoryPermissions(ctx context.Context, githubClient model.GitHubCli
 		}
 		allPrincipals = append(allPrincipals, principals...)
 	}
+	orgID, err := fetchOrganizationID(sdk, organizationName)
+	if err != nil {
+		return nil, fmt.Errorf("fetching org ID: %w", err)
+	}
 
 	for _, p := range allPrincipals {
 		value := models.Resource{
@@ -64,6 +68,7 @@ func ListRepositoryPermissions(ctx context.Context, githubClient model.GitHubCli
 				Permissions:        p.Permissions,
 				RoleName:           p.RoleName,
 				Organization:       organizationName,
+				OrganizationID:     orgID,
 			},
 		}
 
diff --git a/discovery/describers/repository_ruleset.go b/discovery/describers/repository_ruleset.go
diff --git a/discovery/describers/repository_sbom.go b/discovery/describers/repository_sbom.go
diff --git a/discovery/describers/repository_vulnerability_alert.go b/discovery/describers/repository_vulnerability_alert.go
diff --git a/discovery/describers/repository_webhook.go b/discovery/describers/repository_webhook.go
diff --git a/discovery/pkg/es/resources_clients.go b/discovery/pkg/es/resources_clients.go
diff --git a/discovery/provider/model.go b/discovery/provider/model.go

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@ import (`
`14`	`14`
`15`	`15`	`func gitHubOrganizationCollaborators() []*plugin.Column {`
`16`	`16`	`tableCols := []*plugin.Column{`
	`17`	`+ {`
	`18`	`+ Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`19`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`17`	`20`	`{`
`18`	`21`	`Name: "affiliation",`
`19`	`22`	`Type: proto.ColumnType_STRING,`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,9 @@ func gitHubDependabotAlertColumns() []*plugin.Column {`
`155`	`155`	`Description: "The time that the alert was no longer detected and was considered fixed.",`
`156`	`156`	`Transform: transform.FromField("Description.FixedAt").NullIfZero().Transform(convertTimestamp),`
`157`	`157`	`},`
	`158`	`+ {`
	`159`	`+ Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`160`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`158`	`161`	`}`
`159`	`162`	`}`
`160`	`163`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ func gitHubOrganizationExternalIdentityColumns() []*plugin.Column {`
`21`	`21`	`Transform: transform.FromField("Description.ScimIdentity")},`
`22`	`22`	`{Name: "organization_invitation", Type: proto.ColumnType_JSON, Description: "The invitation to the organization.",`
`23`	`23`	`Transform: transform.FromField("Description.OrganizationInvitation")},`
	`24`	`+ {Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`25`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`24`	`26`	`}`
`25`	`27`	`}`
`26`	`28`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ func gitHubOrganizationMemberColumns() []*plugin.Column {`
`40`	`40`	`Transform: transform.FromField("Description.WebsiteURL")},`
`41`	`41`	`{Name: "status", Type: proto.ColumnType_BOOL, Description: "",`
`42`	`42`	`Transform: transform.FromField("Description.Status")},`
	`43`	`+ {Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`44`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`43`	`45`	`}`
`44`	`46`
`45`	`47`	`return cols`
Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,9 @@ func gitHubOrganizationRoleColumns() []*plugin.Column {`
`49`	`49`	`Type: proto.ColumnType_TIMESTAMP,`
`50`	`50`	`Description: "",`
`51`	`51`	`Transform: transform.FromField("Description.UpdatedAt")},`
	`52`	`+ {`
	`53`	`+ Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`54`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`return tableCols`
Original file line number	Diff line number	Diff line change
`@@ -479,6 +479,9 @@ func sharedRepositoryColumns() []*plugin.Column {`
`479`	`479`	`Transform: transform.FromField("Description.Metrics.Subscribers"),`
`480`	`480`	`Description: "Subscribers.",`
`481`	`481`	`},`
	`482`	`+ {`
	`483`	`+ Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`484`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`482`	`485`	`}`
`483`	`486`	`}`
`484`	`487`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ func gitHubRepositoryDeploymentColumns() []*plugin.Column {`
`70`	`70`	`{Name: "updated_at", Type: proto.ColumnType_TIMESTAMP,`
`71`	`71`	`Transform: transform.FromField("Description.UpdatedAt").NullIfZero().Transform(convertTimestamp),`
`72`	`72`	`Description: "Timestamp when the deployment was last updated."},`
	`73`	`+ {`
	`74`	`+ Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`75`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`73`	`76`	`}`
`74`	`77`	`}`
`75`	`78`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,9 @@ func gitHubRepositoryEnvironmentColumns() []*plugin.Column {`
`34`	`34`	`Transform: transform.FromField("Description.RepositoryName"),`
`35`	`35`	`Description: "repository name",`
`36`	`36`	`},`
	`37`	`+ {`
	`38`	`+ Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`39`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`37`	`40`	`}`
`38`	`41`	`}`
`39`	`42`
Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ func tableGitHubRepositoryPermission() *plugin.Table {`
`63`	`63`	`Transform: transform.FromField("Description.RoleName"),`
`64`	`64`	`Description: "The full name of the repository (login/repo-name).",`
`65`	`65`	`},`
	`66`	`+ {`
	`67`	`+ Name: "organization_id", Type: proto.ColumnType_INT, Description: "The unique identifier of the app.",`
	`68`	`+ Transform: transform.FromField("Description.OrganizationID")},`
`66`	`69`	`}),`
`67`	`70`	`}`
`68`	`71`	`}`