Skip to content

Commit cba274b

Browse files
cq-botcq-bot
authored
fix(deps): Update module github.com/cloudquery/plugin-sdk to v0.4.0 (#1786)
This PR contains the following updates: | Package | Type | Update | Change | |---|---|---|---| | [github.com/cloudquery/plugin-sdk](https://togithub.com/cloudquery/plugin-sdk) | require | minor | `v0.2.9` -> `v0.4.0` | --- ### Release Notes <details> <summary>cloudquery/plugin-sdk</summary> ### [`v0.4.0`](https://togithub.com/cloudquery/plugin-sdk/blob/HEAD/CHANGELOG.md#v040---2021-09-02) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v0.3.0...v0.4.0) ##### 🚀 Added - Added support for partial fetching [#&#8203;60](https://togithub.com/cloudquery/cq-provider-sdk/pull/76) ### [`v0.3.0`](https://togithub.com/cloudquery/plugin-sdk/blob/HEAD/CHANGELOG.md#v030---2021-07-28) [Compare Source](https://togithub.com/cloudquery/plugin-sdk/compare/v0.2.9...v0.3.0) ##### 🚀 Added - Added a changelog :) - Added support for user defined Primary Keys in [#&#8203;41](https://togithub.com/cloudquery/cq-provider-sdk/pull/41) - Added support to disable delete of data [#&#8203;41](https://togithub.com/cloudquery/cq-provider-sdk/pull/41) - Added meta field, meta information on the resource, for example: when resource updated last. [#&#8203;41](https://togithub.com/cloudquery/cq-provider-sdk/pull/41) ##### ⚙️ Changed - Changed default insert in provider from Insert to Copy-From, this method improves insert performance [#&#8203;48](https://togithub.com/cloudquery/cq-provider-sdk/pull/48) - **Breaking Change**: default CloudQuery "id" from `id` to `cq_id` [#&#8203;41](https://togithub.com/cloudquery/cq-provider-sdk/pull/41) </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, click this checkbox. --- This PR has been generated by [Renovate Bot](https://togithub.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzMi4xODUuMyIsInVwZGF0ZWRJblZlciI6IjMyLjE4NS4zIn0=-->
1 parent aa7e91c commit cba274b

49 files changed

Lines changed: 242 additions & 249 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cli/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/cloudquery/cloudquery/cli
33
go 1.19
44

55
require (
6-
github.com/cloudquery/plugin-sdk v0.2.9
6+
github.com/cloudquery/plugin-sdk v0.4.0
77
github.com/getsentry/sentry-go v0.13.0
88
github.com/google/go-cmp v0.5.9
99
github.com/jackc/pgtype v1.12.0

‎cli/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMn
4848
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
4949
github.com/cloudquery/faker/v3 v3.7.7 h1:vODOmAXGhxAacVrUOjr4Jti2lFhXgkPjG6/L3C2REgQ=
5050
github.com/cloudquery/faker/v3 v3.7.7/go.mod h1:1b8WVG9Gh0T2hVo1a8dWeXfu0AhqSB6J/mmJaesqOeo=
51-
github.com/cloudquery/plugin-sdk v0.2.9 h1:qDQzwIiStgdG8yNVq0xOcNTdjEcmMNYBAsqf+SV/JLo=
52-
github.com/cloudquery/plugin-sdk v0.2.9/go.mod h1:W+i1oPjf6xngaxTTyMsSDrSXjN+MIgjs5b0o1K0fVvs=
51+
github.com/cloudquery/plugin-sdk v0.4.0 h1:OpiMlZN5IM/dZM9XVAwS9HXt95VjumH0AUDQkwS9R7I=
52+
github.com/cloudquery/plugin-sdk v0.4.0/go.mod h1:W+i1oPjf6xngaxTTyMsSDrSXjN+MIgjs5b0o1K0fVvs=
5353
github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
5454
github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
5555
github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=

‎plugins/source/gcp/codegen/base.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import (
88
type Resource struct {
99
// PackageName name is the packgename in the source plugin this resource is located
1010
PackageName string
11-
// DefaultColumns columns that will be appended to the main table
12-
DefaultColumns []codegen.ColumnDefinition
1311
// Sets PreResourceResolver
1412
PreResourceResolver string
1513
// Table is the table definition that will be used to generate the cloudquery table
@@ -81,7 +79,7 @@ type Resource struct {
8179
// SkipFields fields in go struct to skip when generating the table from the go struct
8280
SkipFields []string
8381
// Columns override, override generated columns
84-
OverrideColumns []codegen.ColumnDefinition
82+
ExtraColumns []codegen.ColumnDefinition
8583
}
8684

8785
var ProjectIdColumn = codegen.ColumnDefinition{

‎plugins/source/gcp/codegen/billing.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var billingResources = []*Resource{
1717
ListFunction: (&billing.CloudBillingClient{}).ListBillingAccounts,
1818
RegisterServer: pb.RegisterCloudBillingServer,
1919
UnimplementedServer: &pb.UnimplementedCloudBillingServer{},
20-
OverrideColumns: []codegen.ColumnDefinition{
20+
ExtraColumns: []codegen.ColumnDefinition{
2121
{
2222
Name: "name",
2323
Type: schema.TypeString,
@@ -34,7 +34,7 @@ var billingResources = []*Resource{
3434
ListFunction: (&billing.CloudCatalogClient{}).ListServices,
3535
RegisterServer: pb.RegisterCloudCatalogServer,
3636
UnimplementedServer: &pb.UnimplementedCloudCatalogServer{},
37-
OverrideColumns: []codegen.ColumnDefinition{
37+
ExtraColumns: []codegen.ColumnDefinition{
3838
{
3939
Name: "name",
4040
Type: schema.TypeString,

‎plugins/source/gcp/codegen/compute.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ func ComputeResources() []*Resource {
227227
}
228228
resource.MockImports = []string{"cloud.google.com/go/compute/apiv1"}
229229
resource.ProtobufImport = "google.golang.org/genproto/googleapis/cloud/compute/v1"
230-
if resource.OverrideColumns == nil {
231-
resource.OverrideColumns = []codegen.ColumnDefinition{
230+
if resource.ExtraColumns == nil {
231+
resource.ExtraColumns = []codegen.ColumnDefinition{
232232
{
233233
Name: "self_link",
234234
Type: schema.TypeString,

‎plugins/source/gcp/codegen/container.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ var containerResources = []*Resource{
1919
UnimplementedServer: &pb.UnimplementedClusterManagerServer{},
2020
SkipFetch: true,
2121
SkipMock: true,
22-
OverrideColumns: []codegen.ColumnDefinition{
22+
ExtraColumns: []codegen.ColumnDefinition{
2323
{
2424
Name: "self_link",
2525
Type: schema.TypeString,

‎plugins/source/gcp/codegen/dns.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ var dnsResources = []*Resource{
1313
Struct: &dns.Policy{},
1414
NewFunction: dns.NewService,
1515
ListFunction: (&dns.PoliciesService{}).List,
16-
OverrideColumns: []codegen.ColumnDefinition{
16+
ExtraColumns: []codegen.ColumnDefinition{
1717
{
1818
Name: "id",
1919
Type: schema.TypeInt,
@@ -27,7 +27,7 @@ var dnsResources = []*Resource{
2727
Struct: &dns.ManagedZone{},
2828
NewFunction: dns.NewManagedZoneOperationsService,
2929
ListFunction: (&dns.ManagedZonesService{}).List,
30-
OverrideColumns: []codegen.ColumnDefinition{
30+
ExtraColumns: []codegen.ColumnDefinition{
3131
{
3232
Name: "id",
3333
Type: schema.TypeInt,

‎plugins/source/gcp/codegen/domains.go‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package codegen
22

33
import (
44
domains "cloud.google.com/go/domains/apiv1beta1"
5-
"github.com/cloudquery/plugin-sdk/codegen"
6-
"github.com/cloudquery/plugin-sdk/schema"
75
pb "google.golang.org/genproto/googleapis/cloud/domains/v1beta1"
86
)
97

@@ -19,13 +17,6 @@ var domainsResources = []*Resource{
1917
UnimplementedServer: &pb.UnimplementedDomainsServer{},
2018
RequestStructFields: `Parent: fmt.Sprintf("projects/%s/locations/-", c.ProjectId),`,
2119
Imports: []string{"fmt"},
22-
OverrideColumns: []codegen.ColumnDefinition{
23-
{
24-
Name: "self_link",
25-
Type: schema.TypeString,
26-
Options: schema.ColumnCreationOptions{PrimaryKey: true},
27-
},
28-
},
2920
},
3021
}
3122

‎plugins/source/gcp/codegen/iam.go‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ var iamResources = []*Resource{
1313
Struct: &iam.Role{},
1414
NewFunction: iam.NewProjectsRolesService,
1515
ListFunction: (&iam.ProjectsRolesService{}).List,
16-
// ListFunction: ,
17-
OverrideColumns: []codegen.ColumnDefinition{
16+
ExtraColumns: []codegen.ColumnDefinition{
1817
{
1918
Name: "project_id",
2019
Type: schema.TypeString,
@@ -35,7 +34,7 @@ var iamResources = []*Resource{
3534
NewFunction: iam.NewProjectsServiceAccountsService,
3635
ListFunction: (&iam.ProjectsServiceAccountsService{}).List,
3736
OutputField: "Accounts",
38-
OverrideColumns: []codegen.ColumnDefinition{
37+
ExtraColumns: []codegen.ColumnDefinition{
3938
{
4039
Name: "unique_id",
4140
Type: schema.TypeString,

‎plugins/source/gcp/codegen/logging.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var loggingResources = []*Resource{
1717
RegisterServer: pb.RegisterMetricsServiceV2Server,
1818
ListFunction: (&pb.UnimplementedMetricsServiceV2Server{}).ListLogMetrics,
1919
UnimplementedServer: &pb.UnimplementedMetricsServiceV2Server{},
20-
OverrideColumns: []codegen.ColumnDefinition{
20+
ExtraColumns: []codegen.ColumnDefinition{
2121
{
2222
Name: "name",
2323
Type: schema.TypeString,
@@ -35,7 +35,7 @@ var loggingResources = []*Resource{
3535
RegisterServer: pb.RegisterConfigServiceV2Server,
3636
ListFunction: (&pb.UnimplementedConfigServiceV2Server{}).ListSinks,
3737
UnimplementedServer: &pb.UnimplementedConfigServiceV2Server{},
38-
OverrideColumns: []codegen.ColumnDefinition{
38+
ExtraColumns: []codegen.ColumnDefinition{
3939
{
4040
Name: "name",
4141
Type: schema.TypeString,

0 commit comments

Comments
 (0)