feat: added organization to common columns

ArshiaBP · ArshiaBP · commit 39ceedd6205c · 2025-02-25T21:24:09.000+03:30
diff --git a/cloudql/github/common_column.go b/cloudql/github/common_column.go
@@ -13,6 +13,12 @@ import (
 
 func commonColumns(c []*plugin.Column) []*plugin.Column {
 	return append(c, []*plugin.Column{
+		{
+			Name:        "organization_name",
+			Type:        proto.ColumnType_STRING,
+			Transform:   transform.FromField("Description.Organization"),
+			Description: "organization name",
+		},
 		{
 			Name:        "platform_integration_id",
 			Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_actions_artifact.go b/cloudql/github/table_github_actions_artifact.go
@@ -33,12 +33,6 @@ func tableGitHubActionsArtifact() *plugin.Table {
 				Transform:   transform.FromField("Description.RepositoryName"),
 				Description: "repository name",
 			},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "name",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_actions_runner.go b/cloudql/github/table_github_actions_runner.go
@@ -33,12 +33,6 @@ func tableGitHubActionsRepositoryRunner() *plugin.Table {
 				Transform:   transform.FromField("Description.RepositoryName"),
 				Description: "repository name",
 			},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "id",
 				Type:        proto.ColumnType_INT,
diff --git a/cloudql/github/table_github_actions_secret.go b/cloudql/github/table_github_actions_secret.go
@@ -34,12 +34,6 @@ func tableGitHubActionsRepositorySecret() *plugin.Table {
 				Transform:   transform.FromField("Description.RepositoryName"),
 				Description: "repository name",
 			},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "name",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_actions_workflow_run.go b/cloudql/github/table_github_actions_workflow_run.go
@@ -27,12 +27,6 @@ func tableGitHubActionsRepositoryWorkflowRun() *plugin.Table {
 				Transform:   transform.FromField("Description.RepositoryFullName"),
 				Description: "repository full name",
 			},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "repository_name",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_artifact_dockerfile.go b/cloudql/github/table_github_artifact_dockerfile.go
@@ -25,12 +25,6 @@ func tableGitHubArtifactDockerFile() *plugin.Table {
 				Transform:   transform.FromField("Description.RepositoryFullName"),
 				Description: "repository full name",
 			},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "repository_name",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_branch.go b/cloudql/github/table_github_branch.go
@@ -22,12 +22,6 @@ func tableGitHubBranch() *plugin.Table {
 				Transform:   transform.FromField("Description.RepoFullName"),
 				Description: "Full name of the repository that contains the branch.",
 			},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "repository_name",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_branch_protection.go b/cloudql/github/table_github_branch_protection.go
@@ -27,12 +27,6 @@ func tableGitHubBranchProtection() *plugin.Table {
 				Transform:   transform.FromField("Description.RepoFullName"),
 				Description: "The full name of the repository (login/repo-name).",
 			},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "repository_name",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_commit.go b/cloudql/github/table_github_commit.go
@@ -27,12 +27,6 @@ func tableGitHubCommit() *plugin.Table {
 				Transform:   transform.FromField("Description.RepositoryFullName"),
 				Description: "repository full name",
 			},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "repository_name",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_container_package.go b/cloudql/github/table_github_container_package.go
@@ -23,12 +23,6 @@ func tableGitHubContainerPackage() *plugin.Table {
 				Type:        proto.ColumnType_INT,
 				Transform:   transform.FromField("Description.ID"),
 				Description: "Unique identifier for the package."},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "digest",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_issue.go b/cloudql/github/table_github_issue.go
@@ -26,12 +26,6 @@ func sharedIssueColumns() []*plugin.Column {
 			Type:        proto.ColumnType_INT,
 			Transform:   transform.FromField("Description.Number"),
 			Description: "The issue number."},
-		{
-			Name:        "organization",
-			Type:        proto.ColumnType_STRING,
-			Transform:   transform.FromField("Description.Organization"),
-			Description: "organization name",
-		},
 		{Name: "id",
 			Type:      proto.ColumnType_INT,
 			Transform: transform.FromField("Description.Id"),
diff --git a/cloudql/github/table_github_license.go b/cloudql/github/table_github_license.go
@@ -27,12 +27,6 @@ func tableGitHubLicense() *plugin.Table {
 				Description: "The Software Package Data Exchange (SPDX) id of the license.",
 				Type:        proto.ColumnType_STRING,
 				Transform:   transform.FromField("Description.SpdxId")},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization",
-			},
 			{
 				Name:        "name",
 				Description: "The name of the license.",
diff --git a/cloudql/github/table_github_maven_package.go b/cloudql/github/table_github_maven_package.go
@@ -4,7 +4,6 @@ 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"
 )
 
 func tableGitHubMavenPackage() *plugin.Table {
@@ -31,12 +30,6 @@ func tableGitHubMavenPackage() *plugin.Table {
 			// Nested structure columns
 			{Name: "owner", Type: proto.ColumnType_JSON, Description: "Owner details of the package."},
 			{Name: "repository", Type: proto.ColumnType_JSON, Description: "Repository details associated with the package."},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 		}),
 	}
 }
diff --git a/cloudql/github/table_github_npm_package.go b/cloudql/github/table_github_npm_package.go
@@ -4,7 +4,6 @@ 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"
 )
 
 func tableGitHubNPMPackage() *plugin.Table {
@@ -31,12 +30,6 @@ func tableGitHubNPMPackage() *plugin.Table {
 			// Nested structure columns
 			{Name: "owner", Type: proto.ColumnType_JSON, Description: "Owner details of the package."},
 			{Name: "repository", Type: proto.ColumnType_JSON, Description: "Repository details associated with the package."},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 		}),
 	}
 }
diff --git a/cloudql/github/table_github_nuget_package.go b/cloudql/github/table_github_nuget_package.go
@@ -4,7 +4,6 @@ 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"
 )
 
 func tableGitHubNugetPackage() *plugin.Table {
@@ -25,12 +24,6 @@ func tableGitHubNugetPackage() *plugin.Table {
 			{Name: "url", Type: proto.ColumnType_STRING, Description: "URL where the package can be accessed."},
 			{Name: "createdAt", Type: proto.ColumnType_TIMESTAMP, Description: "Timestamp when the package was created."},
 			{Name: "updatedAt", Type: proto.ColumnType_TIMESTAMP, Description: "Timestamp when the package was last updated."},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 		}),
 	}
 }
diff --git a/cloudql/github/table_github_organization.go b/cloudql/github/table_github_organization.go
@@ -9,12 +9,6 @@ import (
 
 func sharedOrganizationColumns() []*plugin.Column {
 	return []*plugin.Column{
-		{
-			Name:        "organization",
-			Type:        proto.ColumnType_STRING,
-			Transform:   transform.FromField("Description.Organization"),
-			Description: "organization name",
-		},
 		{
 			Name: "login", Type: proto.ColumnType_STRING,
 			Transform:   transform.FromField("Description.Login"),
diff --git a/cloudql/github/table_github_organization_collaborator.go b/cloudql/github/table_github_organization_collaborator.go
@@ -14,11 +14,6 @@ import (
 
 func gitHubOrganizationCollaborators() []*plugin.Column {
 	tableCols := []*plugin.Column{
-		{
-			Name:        "organization",
-			Type:        proto.ColumnType_STRING,
-			Description: "The organization the member is associated with.",
-			Transform:   transform.FromField("Description.Organization")},
 		{
 			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
@@ -165,16 +165,6 @@ func tableGitHubOrganizationDependabotAlert() *plugin.Table {
 		List: &plugin.ListConfig{
 			Hydrate: opengovernance.ListOrgAlertDependabot,
 		},
-		Columns: commonColumns(append(
-			gitHubDependabotAlertColumns(),
-			[]*plugin.Column{
-				{
-					Name:        "organization",
-					Type:        proto.ColumnType_STRING,
-					Description: "The login name of the organization.",
-					Transform:   transform.FromQual("organization"),
-				},
-			}...,
-		)),
+		Columns: commonColumns(gitHubDependabotAlertColumns()),
 	}
 }
diff --git a/cloudql/github/table_github_organization_external_identity.go b/cloudql/github/table_github_organization_external_identity.go
@@ -9,14 +9,10 @@ import (
 
 func gitHubOrganizationExternalIdentityColumns() []*plugin.Column {
 	return []*plugin.Column{
-		{Name: "organization", Type: proto.ColumnType_STRING, Description: "The organization the external identity is associated with.",
-			Transform: transform.FromField("Description.Organization")},
 		{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.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.",
diff --git a/cloudql/github/table_github_organization_member.go b/cloudql/github/table_github_organization_member.go
@@ -12,8 +12,6 @@ func gitHubOrganizationMemberColumns() []*plugin.Column {
 	cols := []*plugin.Column{
 		{Name: "has_two_factor_enabled", Type: proto.ColumnType_BOOL,
 			Transform: transform.FromField("Description.HasTwoFactorEnabled")},
-		{Name: "organization", Type: proto.ColumnType_STRING, Description: "The team organization",
-			Transform: transform.FromField("Description.Organization")},
 		{Name: "role", Type: proto.ColumnType_STRING, Description: "The team member's role (MEMBER, MAINTAINER).",
 			Transform: transform.FromField("Description.Role")},
 		{Name: "login_id", Type: proto.ColumnType_STRING, Description: "Unique identifier for the user login.",
diff --git a/cloudql/github/table_github_organization_role.go b/cloudql/github/table_github_organization_role.go
@@ -29,11 +29,6 @@ func gitHubOrganizationRoleColumns() []*plugin.Column {
 			Type:        proto.ColumnType_JSON,
 			Description: "permissions",
 			Transform:   transform.FromField("Description.Permissions")},
-		{
-			Name:        "organization",
-			Type:        proto.ColumnType_STRING,
-			Description: "",
-			Transform:   transform.FromField("Description.Organization")},
 		{
 			Name:        "source",
 			Description: "",
diff --git a/cloudql/github/table_github_organization_team.go b/cloudql/github/table_github_organization_team.go
@@ -9,8 +9,6 @@ import (
 
 func gitHubTeamColumns() []*plugin.Column {
 	return []*plugin.Column{
-		{Name: "organization", Type: proto.ColumnType_STRING, Description: "The organization the team is associated with.",
-			Transform: transform.FromField("Description.Organization")},
 		{Name: "slug",
 			Transform: transform.FromField("Description.Slug"),
 			Type:      proto.ColumnType_STRING, Description: "The team slug name."},
diff --git a/cloudql/github/table_github_pull_request.go b/cloudql/github/table_github_pull_request.go
@@ -13,12 +13,6 @@ func sharedPullRequestColumns() []*plugin.Column {
 		{Name: "repository_full_name", Type: proto.ColumnType_STRING,
 			Transform:   transform.FromField("Description.RepoFullName"),
 			Description: "The full name of the repository the pull request belongs to."},
-		{
-			Name:        "organization",
-			Type:        proto.ColumnType_STRING,
-			Transform:   transform.FromField("Description.Organization"),
-			Description: "organization name",
-		},
 		{
 			Name:        "repository_name",
 			Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_release.go b/cloudql/github/table_github_release.go
@@ -24,12 +24,6 @@ func tableGitHubRelease() *plugin.Table {
 			{Name: "repository_full_name", Type: proto.ColumnType_STRING,
 				Transform:   transform.FromField("Description.RepositoryFullName"),
 				Description: "Full name of the repository that contains the release."},
-			{
-				Name:        "organization",
-				Type:        proto.ColumnType_STRING,
-				Transform:   transform.FromField("Description.Organization"),
-				Description: "organization name",
-			},
 			{
 				Name:        "repository_name",
 				Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_repository.go b/cloudql/github/table_github_repository.go
@@ -148,18 +148,6 @@ func sharedRepositoryColumns() []*plugin.Column {
 			Transform:   transform.FromField("Description.Permissions"),
 			Description: "Permissions associated with the repository.",
 		},
-		{
-			Name:        "organization_name",
-			Type:        proto.ColumnType_STRING,
-			Transform:   transform.FromField("Description.Organization"),
-			Description: "organization name",
-		},
-		{
-			Name:        "organization",
-			Type:        proto.ColumnType_STRING,
-			Transform:   transform.FromField("Description.Organization"),
-			Description: "Organization details of the repository.",
-		},
 
 		{
 			Name:        "parent",
diff --git a/cloudql/github/table_github_repository_collaborator.go b/cloudql/github/table_github_repository_collaborator.go
@@ -20,12 +20,6 @@ func gitHubRepositoryCollaboratorColumns() []*plugin.Column {
 			Transform: transform.FromField("Description.Permission")},
 		{Name: "user_login", Type: proto.ColumnType_STRING, Description: "The login of the collaborator",
 			Transform: transform.FromField("Description.UserLogin")},
-		{
-			Name:        "organization",
-			Type:        proto.ColumnType_STRING,
-			Transform:   transform.FromField("Description.Organization"),
-			Description: "organization name",
-		},
 		{
 			Name:        "repository_name",
 			Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_repository_dependabot_alert.go b/cloudql/github/table_github_repository_dependabot_alert.go
@@ -29,12 +29,6 @@ func tableGitHubRepositoryDependabotAlert() *plugin.Table {
 					Transform:   transform.FromQual("Description.RepoFullName"),
 					Description: "The full name of the repository (login/repo-name).",
 				},
-				{
-					Name:        "organization",
-					Type:        proto.ColumnType_STRING,
-					Transform:   transform.FromField("Description.Organization"),
-					Description: "organization name",
-				},
 				{
 					Name:        "repository_name",
 					Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_repository_deployment.go b/cloudql/github/table_github_repository_deployment.go
@@ -13,12 +13,6 @@ func gitHubRepositoryDeploymentColumns() []*plugin.Column {
 		{Name: "repository_full_name", Type: proto.ColumnType_STRING,
 			Transform:   transform.FromField("Description.RepoFullName"),
 			Description: "The full name of the repository (login/repo-name)."},
-		{
-			Name:        "organization",
-			Type:        proto.ColumnType_STRING,
-			Transform:   transform.FromField("Description.Organization"),
-			Description: "organization name",
-		},
 		{
 			Name:        "repository_name",
 			Type:        proto.ColumnType_STRING,
diff --git a/cloudql/github/table_github_repository_environment.go b/cloudql/github/table_github_repository_environment.go
diff --git a/cloudql/github/table_github_repository_ruleset.go b/cloudql/github/table_github_repository_ruleset.go
diff --git a/cloudql/github/table_github_repository_sbom.go b/cloudql/github/table_github_repository_sbom.go
diff --git a/cloudql/github/table_github_repository_vulnerability_alert.go b/cloudql/github/table_github_repository_vulnerability_alert.go
diff --git a/cloudql/github/table_github_repository_webhook.go b/cloudql/github/table_github_repository_webhook.go
diff --git a/cloudql/github/table_github_tag.go b/cloudql/github/table_github_tag.go
diff --git a/cloudql/github/table_github_team_member.go b/cloudql/github/table_github_team_member.go
diff --git a/cloudql/github/table_github_user.go b/cloudql/github/table_github_user.go
diff --git a/cloudql/github/table_github_workflow.go b/cloudql/github/table_github_workflow.go
diff --git a/discovery/describers/organization_collaborators.go b/discovery/describers/organization_collaborators.go
diff --git a/discovery/describers/repository_collaborators.go b/discovery/describers/repository_collaborators.go
