Skip to content

fix(snyk)!: Add organization_id to primary keys #9658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kodiakhq merged 1 commit into from
Apr 4, 2023
Merged

fix(snyk)!: Add organization_id to primary keys #9658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
add organization_id to table PKs
  • Loading branch information
@candiduslynx
candiduslynx committed Apr 4, 2023
commit 00ba0ddd892c64de4367bb0909273cfc9815d4d9
13 changes: 13 additions & 0 deletions plugins/source/snyk/client/columns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package client

import "github.com/cloudquery/plugin-sdk/schema"

var OrganizationID = schema.Column{
Name: "organization_id",
Type: schema.TypeString,
Resolver: ResolveOrganizationID,
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
NotNull: true,
},
}
13 changes: 2 additions & 11 deletions plugins/source/snyk/resources/services/dependency/dependencies.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,7 @@ func Dependencies() *schema.Table {
Description: `https://pkg.go.dev/github.com/pavel-snyk/snyk-sdk-go/snyk#Dependency`,
Resolver: fetchDependencies,
Multiplex: client.ByOrganization,
Transform: transformers.TransformWithStruct(&snyk.Dependency{}),
Columns: []schema.Column{
{
Name: "id",
Type: schema.TypeString,
Resolver: schema.PathResolver("ID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: transformers.TransformWithStruct(&snyk.Dependency{}, transformers.WithPrimaryKeys("ID")),
Columns: schema.ColumnList{client.OrganizationID},
}
}
16 changes: 2 additions & 14 deletions plugins/source/snyk/resources/services/integration/integrations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,14 @@ func Integrations() *schema.Table {
Resolver: fetchIntegrations,
PreResourceResolver: getIntegration,
Multiplex: client.ByOrganization,
Transform: transformers.TransformWithStruct(&snyk.Integration{}),
Transform: transformers.TransformWithStruct(&snyk.Integration{}, transformers.WithPrimaryKeys("ID")),
Columns: []schema.Column{
{
Name: "organization_id",
Type: schema.TypeString,
Resolver: client.ResolveOrganizationID,
},
client.OrganizationID,
{
Name: "settings",
Type: schema.TypeJSON,
Resolver: getIntegrationSettings,
},
{
Name: "id",
Type: schema.TypeString,
Resolver: schema.PathResolver("ID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
}
}
12 changes: 1 addition & 11 deletions plugins/source/snyk/resources/services/organization/organizations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,6 @@ func Organizations() *schema.Table {
Description: `https://pkg.go.dev/github.com/pavel-snyk/snyk-sdk-go/snyk#Organization`,
Resolver: fetchOrganizations,
Multiplex: client.SingleOrganization,
Transform: transformers.TransformWithStruct(&snyk.Organization{}),
Columns: []schema.Column{
{
Name: "id",
Type: schema.TypeString,
Resolver: schema.PathResolver("ID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: transformers.TransformWithStruct(&snyk.Organization{}, transformers.WithPrimaryKeys("ID")),
}
}
18 changes: 2 additions & 16 deletions plugins/source/snyk/resources/services/project/projects.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,21 +13,7 @@ func Projects() *schema.Table {
Description: `https://pkg.go.dev/github.com/pavel-snyk/snyk-sdk-go/snyk#Project`,
Resolver: fetchProjects,
Multiplex: client.ByOrganization,
Transform: transformers.TransformWithStruct(&snyk.Project{}),
Columns: []schema.Column{
{
Name: "organization_id",
Type: schema.TypeString,
Resolver: client.ResolveOrganizationID,
},
{
Name: "id",
Type: schema.TypeString,
Resolver: schema.PathResolver("ID"),
CreationOptions: schema.ColumnCreationOptions{
PrimaryKey: true,
},
},
},
Transform: transformers.TransformWithStruct(&snyk.Project{}, transformers.WithPrimaryKeys("ID")),
Columns: schema.ColumnList{client.OrganizationID},
}
}
3 changes: 2 additions & 1 deletion website/tables/snyk/snyk_dependencies.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This table shows data for Snyk Dependencies.

https://pkg.go.dev/github.com/pavel-snyk/snyk-sdk-go/snyk#Dependency

The primary key for this table is **id**.
The composite primary key for this table is (**organization_id**, **id**).

## Columns

Expand All @@ -14,6 +14,7 @@ The primary key for this table is **id**.
|_cq_sync_time|Timestamp|
|_cq_id|UUID|
|_cq_parent_id|UUID|
|organization_id (PK)|String|
|id (PK)|String|
|name|String|
|type|String|
Expand Down
6 changes: 3 additions & 3 deletions website/tables/snyk/snyk_integrations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This table shows data for Snyk Integrations.

https://pkg.go.dev/github.com/pavel-snyk/snyk-sdk-go/snyk#Integration

The primary key for this table is **id**.
The composite primary key for this table is (**organization_id**, **id**).

## Columns

Expand All @@ -14,8 +14,8 @@ The primary key for this table is **id**.
|_cq_sync_time|Timestamp|
|_cq_id|UUID|
|_cq_parent_id|UUID|
|organization_id|String|
|organization_id (PK)|String|
|settings|JSON|
|id (PK)|String|
|credentials|JSON|
|id (PK)|String|
|type|String|
2 changes: 1 addition & 1 deletion website/tables/snyk/snyk_organizations.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ The primary key for this table is **id**.
|_cq_sync_time|Timestamp|
|_cq_id|UUID|
|_cq_parent_id|UUID|
|id (PK)|String|
|group|JSON|
|id (PK)|String|
|name|String|
|slug|String|
|url|String|
4 changes: 2 additions & 2 deletions website/tables/snyk/snyk_projects.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ This table shows data for Snyk Projects.

https://pkg.go.dev/github.com/pavel-snyk/snyk-sdk-go/snyk#Project

The primary key for this table is **id**.
The composite primary key for this table is (**organization_id**, **id**).

## Columns

Expand All @@ -14,7 +14,7 @@ The primary key for this table is **id**.
|_cq_sync_time|Timestamp|
|_cq_id|UUID|
|_cq_parent_id|UUID|
|organization_id|String|
|organization_id (PK)|String|
|id (PK)|String|
|name|String|
|origin|String|